diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
index 298912e7d5..82f6ebd8b5 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -27,6 +27,9 @@ namespace Content.Client.Access.UI
         private string? _lastJobTitle;
         private string? _lastJobProto;
 
+        // The job that will be picked if the ID doesn't have a job on the station.
+        private static ProtoId<JobPrototype> _defaultJob = "Passenger";
+
         public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager,
             List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
@@ -65,7 +68,6 @@ namespace Content.Client.Access.UI
             }
 
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
-
             _accessButtons.Populate(accessLevels, prototypeManager);
             AccessLevelControlContainer.AddChild(_accessButtons);
 
@@ -172,11 +174,15 @@ namespace Content.Client.Access.UI
                                        new List<ProtoId<AccessLevelPrototype>>());
 
             var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
-            if (jobIndex >= 0)
+            // If the job index is < 0 that means they don't have a job registered in the station records.
+            // For example, a new ID from a box would have no job index.
+            if (jobIndex < 0)
             {
-                JobPresetOptionButton.SelectId(jobIndex);
+                jobIndex = _jobPrototypeIds.IndexOf(_defaultJob);
             }
 
+            JobPresetOptionButton.SelectId(jobIndex);
+
             _lastFullName = state.TargetIdFullName;
             _lastJobTitle = state.TargetIdJobTitle;
             _lastJobProto = state.TargetIdJobPrototype;
diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
index dc263d6055..588d62e560 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
@@ -147,7 +147,7 @@ public sealed partial class BanPanel : DefaultWindow
         var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
         foreach (var proto in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
         {
-            CreateRoleGroup(proto.ID, proto.Roles, proto.Color);
+            CreateRoleGroup(proto.ID, proto.Roles.Select(p =>  p.Id), proto.Color);
         }
 
         CreateRoleGroup("Antagonist", prototypeManager.EnumeratePrototypes<AntagPrototype>().Select(p => p.ID), Color.Red);
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
index f8d06f758f..999eba4d29 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
@@ -16,14 +16,17 @@ namespace Content.Client.Administration.UI.Bwoink
 
             Bwoink.ChannelSelector.OnSelectionChanged += sel =>
             {
-                if (sel is not null)
+                if (sel is null)
                 {
-                    Title = $"{sel.CharacterName} / {sel.Username}";
+                    Title = Loc.GetString("bwoink-none-selected");
+                    return;
+                }
 
-                    if (sel.OverallPlaytime != null)
-                    {
-                        Title += $" | {Loc.GetString("generic-playtime-title")}: {sel.PlaytimeString}";
-                    }
+                Title = $"{sel.CharacterName} / {sel.Username}";
+
+                if (sel.OverallPlaytime != null)
+                {
+                    Title += $" | {Loc.GetString("generic-playtime-title")}: {sel.PlaytimeString}";
                 }
             };
 
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index fdf935d7c0..12522d552d 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Administration.UI.CustomControls
         private List<PlayerInfo> _playerList = new();
         private readonly List<PlayerInfo> _sortedPlayerList = new();
 
-        public event Action<PlayerInfo>? OnSelectionChanged;
+        public event Action<PlayerInfo?>? OnSelectionChanged;
         public IReadOnlyList<PlayerInfo> PlayerInfo => _playerList;
 
         public Func<PlayerInfo, string, string>? OverrideText;
@@ -41,12 +41,19 @@ namespace Content.Client.Administration.UI.CustomControls
             PlayerListContainer.ItemPressed += PlayerListItemPressed;
             PlayerListContainer.ItemKeyBindDown += PlayerListItemKeyBindDown;
             PlayerListContainer.GenerateItem += GenerateButton;
+            PlayerListContainer.NoItemSelected += PlayerListNoItemSelected;
             PopulateList(_adminSystem.PlayerList);
             FilterLineEdit.OnTextChanged += _ => FilterList();
             _adminSystem.PlayerListChanged += PopulateList;
             BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)};
         }
 
+        private void PlayerListNoItemSelected()
+        {
+            _selectedPlayer = null;
+            OnSelectionChanged?.Invoke(null);
+        }
+
         private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data)
         {
             if (args == null || data is not PlayerListData {Info: var selectedPlayer})
diff --git a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
index eede3a6217..d60094ad89 100644
--- a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
+++ b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
@@ -25,7 +25,7 @@ public sealed class ExplosionDebugOverlay : Overlay
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace | OverlaySpace.ScreenSpace;
 
-    public Matrix3 SpaceMatrix;
+    public Matrix3x2 SpaceMatrix;
     public MapId Map;
 
     private readonly Font _font;
@@ -78,7 +78,8 @@ public sealed class ExplosionDebugOverlay : Overlay
         if (SpaceTiles == null)
             return;
 
-        gridBounds = Matrix3.Invert(SpaceMatrix).TransformBox(args.WorldBounds);
+        Matrix3x2.Invert(SpaceMatrix, out var invSpace);
+        gridBounds = invSpace.TransformBox(args.WorldBounds);
 
         DrawText(handle, gridBounds, SpaceMatrix, SpaceTiles, SpaceTileSize);
     }
@@ -86,7 +87,7 @@ public sealed class ExplosionDebugOverlay : Overlay
     private void DrawText(
         DrawingHandleScreen handle,
         Box2 gridBounds,
-        Matrix3 transform,
+        Matrix3x2 transform,
         Dictionary<int, List<Vector2i>> tileSets,
         ushort tileSize)
     {
@@ -103,7 +104,7 @@ public sealed class ExplosionDebugOverlay : Overlay
                 if (!gridBounds.Contains(centre))
                     continue;
 
-                var worldCenter = transform.Transform(centre);
+                var worldCenter = Vector2.Transform(centre, transform);
 
                 var screenCenter = _eyeManager.WorldToScreen(worldCenter);
 
@@ -119,7 +120,7 @@ public sealed class ExplosionDebugOverlay : Overlay
         if (tileSets.TryGetValue(0, out var set))
         {
             var epicenter = set.First();
-            var worldCenter = transform.Transform((epicenter + Vector2Helpers.Half) * tileSize);
+            var worldCenter = Vector2.Transform((epicenter + Vector2Helpers.Half) * tileSize, transform);
             var screenCenter = _eyeManager.WorldToScreen(worldCenter) + new Vector2(-24, -24);
             var text = $"{Intensity[0]:F2}\nΣ={TotalIntensity:F1}\nΔ={Slope:F1}";
             handle.DrawString(_font, screenCenter, text);
@@ -148,11 +149,12 @@ public sealed class ExplosionDebugOverlay : Overlay
         if (SpaceTiles == null)
             return;
 
-        gridBounds = Matrix3.Invert(SpaceMatrix).TransformBox(args.WorldBounds).Enlarged(2);
+        Matrix3x2.Invert(SpaceMatrix, out var invSpace);
+        gridBounds = invSpace.TransformBox(args.WorldBounds).Enlarged(2);
         handle.SetTransform(SpaceMatrix);
 
         DrawTiles(handle, gridBounds, SpaceTiles, SpaceTileSize);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawTiles(
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
index 3071bf8358..25a96df1d3 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
@@ -1,21 +1,19 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:pt="clr-namespace:Content.Client.Administration.UI.Tabs.PlayerTab"
-         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+         xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Name="PlayerCount" HorizontalExpand="True" SizeFlagsStretchRatio="0.50"
-                   Text="{Loc Player Count}" />
-            <Button Name="ShowDisconnectedButton" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"
-                    Text="{Loc player-tab-show-disconnected}" ToggleMode="True"/>
-            <Button Name="OverlayButton" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"
-                    Text="{Loc player-tab-overlay}" ToggleMode="True"/>
+            <Label Name="PlayerCount" HorizontalExpand="True" Text="{Loc Player Count}" />
+            <LineEdit Name="SearchLineEdit" HorizontalExpand="True"
+                      PlaceHolder="{Loc player-tab-filter-line-edit-placeholder}" />
+            <Button Name="ShowDisconnectedButton" HorizontalExpand="True"
+                    Text="{Loc player-tab-show-disconnected}" ToggleMode="True" />
+            <Button Name="OverlayButton" HorizontalExpand="True" Text="{Loc player-tab-overlay}" ToggleMode="True" />
         </BoxContainer>
-        <Control MinSize="0 5" />
-        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
-            <BoxContainer Orientation="Vertical" Name="PlayerList">
-                <pt:PlayerTabHeader Name="ListHeader" />
-                <cc:HSeparator />
-            </BoxContainer>
-        </ScrollContainer>
+        <Control MinSize="0 5"/>
+        <pt:PlayerTabHeader Name="ListHeader"/>
+        <cc:HSeparator/>
+        <co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True"/>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
index 33a1d2361f..a8bfaddecf 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.Administration.Systems;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -28,15 +29,14 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
         private bool _ascending = true;
         private bool _showDisconnected;
 
-        public event Action<PlayerTabEntry, GUIBoundKeyEventArgs>? OnEntryKeyBindDown;
+        public event Action<GUIBoundKeyEventArgs, ListData>? OnEntryKeyBindDown;
 
         public PlayerTab()
         {
             IoCManager.InjectDependencies(this);
-            _adminSystem = _entManager.System<AdminSystem>();
             RobustXamlLoader.Load(this);
-            RefreshPlayerList(_adminSystem.PlayerList);
 
+            _adminSystem = _entManager.System<AdminSystem>();
             _adminSystem.PlayerListChanged += RefreshPlayerList;
             _adminSystem.OverlayEnabled += OverlayEnabled;
             _adminSystem.OverlayDisabled += OverlayDisabled;
@@ -46,8 +46,17 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
 
             ListHeader.BackgroundColorPanel.PanelOverride = new StyleBoxFlat(_altColor);
             ListHeader.OnHeaderClicked += HeaderClicked;
+
+            SearchList.SearchBar = SearchLineEdit;
+            SearchList.GenerateItem += GenerateButton;
+            SearchList.DataFilterCondition += DataFilterCondition;
+            SearchList.ItemKeyBindDown += (args, data) => OnEntryKeyBindDown?.Invoke(args, data);
+
+            RefreshPlayerList(_adminSystem.PlayerList);
         }
 
+        #region Antag Overlay
+
         private void OverlayEnabled()
         {
             OverlayButton.Pressed = true;
@@ -70,6 +79,8 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
             }
         }
 
+        #endregion
+
         private void ShowDisconnectedPressed(ButtonEventArgs args)
         {
             _showDisconnected = args.Button.Pressed;
@@ -92,14 +103,10 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
             }
         }
 
+        #region ListContainer
+
         private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
         {
-            foreach (var child in PlayerList.Children.ToArray())
-            {
-                if (child is PlayerTabEntry)
-                    child.Dispose();
-            }
-
             _players = players;
             PlayerCount.Text = $"Players: {_playerMan.PlayerCount}";
 
@@ -108,29 +115,66 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
 
             UpdateHeaderSymbols();
 
-            var useAltColor = false;
-            foreach (var player in sortedPlayers)
-            {
-                if (!_showDisconnected && !player.Connected)
-                    continue;
-
-                var entry = new PlayerTabEntry(player.Username,
-                    player.CharacterName,
-                    player.IdentityName,
-                    player.StartingJob,
-                    player.Antag ? "YES" : "NO",
-                    new StyleBoxFlat(useAltColor ? _altColor : _defaultColor),
-                    player.Connected,
-                    player.PlaytimeString);
-                entry.PlayerEntity = player.NetEntity;
-                entry.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(entry, args);
-                entry.ToolTip = Loc.GetString("player-tab-entry-tooltip");
-                PlayerList.AddChild(entry);
-
-                useAltColor ^= true;
-            }
+            SearchList.PopulateList(sortedPlayers.Select(info => new PlayerListData(info,
+                    $"{info.Username} {info.CharacterName} {info.IdentityName} {info.StartingJob}"))
+                .ToList());
         }
 
+        private void GenerateButton(ListData data, ListContainerButton button)
+        {
+            if (data is not PlayerListData { Info: var player})
+                return;
+
+            var entry = new PlayerTabEntry(player, new StyleBoxFlat(button.Index % 2 == 0 ? _altColor : _defaultColor));
+            button.AddChild(entry);
+            button.ToolTip = $"{player.Username}, {player.CharacterName}, {player.IdentityName}, {player.StartingJob}";
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="filter"/> is contained in <paramref name="listData"/>.FilteringString.
+        /// If all characters are lowercase, the comparison ignores case.
+        /// If there is an uppercase character, the comparison is case sensitive.
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <param name="listData"></param>
+        /// <returns>Whether <paramref name="filter"/> is contained in <paramref name="listData"/>.FilteringString.</returns>
+        private bool DataFilterCondition(string filter, ListData listData)
+        {
+            if (listData is not PlayerListData {Info: var info, FilteringString: var playerString})
+                return false;
+
+            if (!_showDisconnected && !info.Connected)
+                return false;
+
+            if (IsAllLower(filter))
+            {
+                if (!playerString.Contains(filter, StringComparison.CurrentCultureIgnoreCase))
+                    return false;
+            }
+            else
+            {
+                if (!playerString.Contains(filter))
+                    return false;
+            }
+
+            return true;
+        }
+
+        private bool IsAllLower(string input)
+        {
+            foreach (var c in input)
+            {
+                if (char.IsLetter(c) && !char.IsLower(c))
+                    return false;
+            }
+
+            return true;
+        }
+
+        #endregion
+
+        #region Header
+
         private void UpdateHeaderSymbols()
         {
             ListHeader.ResetHeaderText();
@@ -174,5 +218,9 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
 
             RefreshPlayerList(_adminSystem.PlayerList);
         }
+
+        #endregion
     }
+
+    public record PlayerListData(PlayerInfo Info, string FilteringString) : ListData;
 }
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
index 8ac90305ca..e1371ec6f7 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
@@ -1,6 +1,6 @@
-<ContainerButton xmlns="https://spacestation14.io"
-                 xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls">
-    <PanelContainer Name="BackgroundColorPanel"/>
+<PanelContainer xmlns="https://spacestation14.io"
+                xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+                Name="BackgroundColorPanel">
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True"
                   SeparationOverride="4">
@@ -15,17 +15,18 @@
                ClipText="True"/>
         <customControls:VSeparator/>
         <Label Name="JobLabel"
-               SizeFlagsStretchRatio="3"
+               SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"/>
         <customControls:VSeparator/>
         <Label Name="AntagonistLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"/>
+        <customControls:VSeparator/>
         <Label Name="OverallPlaytimeLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"/>
     </BoxContainer>
-</ContainerButton>
+</PanelContainer>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
index 80a68f4cd2..89c5808afc 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
@@ -1,4 +1,5 @@
-using Robust.Client.AutoGenerated;
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -6,23 +7,24 @@ using Robust.Client.UserInterface.XAML;
 namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 
 [GenerateTypedNameReferences]
-public sealed partial class PlayerTabEntry : ContainerButton
+public sealed partial class PlayerTabEntry : PanelContainer
 {
     public NetEntity? PlayerEntity;
 
-    public PlayerTabEntry(string username, string character, string identity, string job, string antagonist, StyleBox styleBox, bool connected, string overallPlaytime)
+    public PlayerTabEntry(PlayerInfo player, StyleBoxFlat styleBoxFlat)
     {
         RobustXamlLoader.Load(this);
 
-        UsernameLabel.Text = username;
-        if (!connected)
+        UsernameLabel.Text = player.Username;
+        if (!player.Connected)
             UsernameLabel.StyleClasses.Add("Disabled");
-        JobLabel.Text = job;
-        CharacterLabel.Text = character;
-        if (identity != character)
-            CharacterLabel.Text += $" [{identity}]";
-        AntagonistLabel.Text = antagonist;
-        BackgroundColorPanel.PanelOverride = styleBox;
-        OverallPlaytimeLabel.Text = overallPlaytime;
+        JobLabel.Text = player.StartingJob;
+        CharacterLabel.Text = player.CharacterName;
+        if (player.IdentityName != player.CharacterName)
+            CharacterLabel.Text += $" [{player.IdentityName}]";
+        AntagonistLabel.Text = Loc.GetString(player.Antag ? "player-tab-is-antag-yes" : "player-tab-is-antag-no");
+        BackgroundColorPanel.PanelOverride = styleBoxFlat;
+        OverallPlaytimeLabel.Text = player.PlaytimeString;
+        PlayerEntity = player.NetEntity;
     }
 }
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
index 2fd3f31b90..05007b0fea 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
@@ -19,23 +19,25 @@
                MouseFilter="Pass"/>
         <cc:VSeparator/>
         <Label Name="JobLabel"
-               SizeFlagsStretchRatio="3"
+               SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-job}"
                MouseFilter="Pass"/>
         <cc:VSeparator/>
         <Label Name="AntagonistLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-antagonist}"
                MouseFilter="Pass"/>
+        <cc:VSeparator/>
         <Label Name="PlaytimeLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-playtime}"
-               MouseFilter="Pass"/>
+               MouseFilter="Pass"
+               ToolTip="{Loc player-tab-entry-tooltip}"/>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
index 6dfbc326ec..c85dbd2051 100644
--- a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
+++ b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
@@ -66,7 +66,7 @@ public sealed class AtmosDebugOverlay : Overlay
             DrawData(msg, handle);
         }
 
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawData(DebugMessage msg,
diff --git a/Content.Client/Atmos/Overlays/GasTileOverlay.cs b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
index f4dc274a4e..17027525e5 100644
--- a/Content.Client/Atmos/Overlays/GasTileOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
@@ -190,7 +190,7 @@ namespace Content.Client.Atmos.Overlays
 
                     var (_, _, worldMatrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
                     state.drawHandle.SetTransform(worldMatrix);
-                    var floatBounds = invMatrix.TransformBox(in state.WorldBounds).Enlarged(grid.TileSize);
+                    var floatBounds = invMatrix.TransformBox(state.WorldBounds).Enlarged(grid.TileSize);
                     var localBounds = new Box2i(
                         (int) MathF.Floor(floatBounds.Left),
                         (int) MathF.Floor(floatBounds.Bottom),
@@ -249,7 +249,7 @@ namespace Content.Client.Atmos.Overlays
                 });
 
             drawHandle.UseShader(null);
-            drawHandle.SetTransform(Matrix3.Identity);
+            drawHandle.SetTransform(Matrix3x2.Identity);
         }
 
         private void DrawMapOverlay(
diff --git a/Content.Client/Chasm/ChasmFallingVisualsSystem.cs b/Content.Client/Chasm/ChasmFallingVisualsSystem.cs
index 4b04aa9dd7..ddcd509cb3 100644
--- a/Content.Client/Chasm/ChasmFallingVisualsSystem.cs
+++ b/Content.Client/Chasm/ChasmFallingVisualsSystem.cs
@@ -24,8 +24,11 @@ public sealed class ChasmFallingVisualsSystem : EntitySystem
 
     private void OnComponentInit(EntityUid uid, ChasmFallingComponent component, ComponentInit args)
     {
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
+        if (!TryComp<SpriteComponent>(uid, out var sprite) ||
+            TerminatingOrDeleted(uid))
+        {
             return;
+        }
 
         component.OriginalScale = sprite.Scale;
 
diff --git a/Content.Client/Chat/UI/EmotesMenu.xaml.cs b/Content.Client/Chat/UI/EmotesMenu.xaml.cs
index a26d319920..3340755343 100644
--- a/Content.Client/Chat/UI/EmotesMenu.xaml.cs
+++ b/Content.Client/Chat/UI/EmotesMenu.xaml.cs
@@ -1,7 +1,8 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Speech;
+using Content.Shared.Whitelist;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
@@ -19,6 +20,7 @@ public sealed partial class EmotesMenu : RadialMenu
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
     private readonly SpriteSystem _spriteSystem;
+    private readonly EntityWhitelistSystem _whitelistSystem;
 
     public event Action<ProtoId<EmotePrototype>>? OnPlayEmote;
 
@@ -28,6 +30,7 @@ public sealed partial class EmotesMenu : RadialMenu
         RobustXamlLoader.Load(this);
 
         _spriteSystem = _entManager.System<SpriteSystem>();
+        _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
 
         var main = FindControl<RadialContainer>("Main");
 
@@ -37,8 +40,8 @@ public sealed partial class EmotesMenu : RadialMenu
             var player = _playerManager.LocalSession?.AttachedEntity;
             if (emote.Category == EmoteCategory.Invalid ||
                 emote.ChatTriggers.Count == 0 ||
-                !(player.HasValue && (emote.Whitelist?.IsValid(player.Value, _entManager) ?? true)) ||
-                (emote.Blacklist?.IsValid(player.Value, _entManager) ?? false))
+                !(player.HasValue && _whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) ||
+                _whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value))
                 continue;
 
             if (!emote.Available &&
diff --git a/Content.Client/Clickable/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs
index cfbd1a99d6..6f75df4683 100644
--- a/Content.Client/Clickable/ClickableComponent.cs
+++ b/Content.Client/Clickable/ClickableComponent.cs
@@ -38,9 +38,9 @@ namespace Content.Client.Clickable
             renderOrder = sprite.RenderOrder;
             var (spritePos, spriteRot) = transform.GetWorldPositionRotation(xformQuery);
             var spriteBB = sprite.CalculateRotatedBoundingBox(spritePos, spriteRot, eye.Rotation);
-            bottom = Matrix3.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom;
+            bottom = Matrix3Helpers.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom;
 
-            var invSpriteMatrix = Matrix3.Invert(sprite.GetLocalMatrix());
+            Matrix3x2.Invert(sprite.GetLocalMatrix(), out var invSpriteMatrix);
 
             // This should have been the rotation of the sprite relative to the screen, but this is not the case with no-rot or directional sprites.
             var relativeRotation = (spriteRot + eye.Rotation).Reduced().FlipPositive();
@@ -48,8 +48,8 @@ namespace Content.Client.Clickable
             Angle cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero;
 
             // First we get `localPos`, the clicked location in the sprite-coordinate frame.
-            var entityXform = Matrix3.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
-            var localPos = invSpriteMatrix.Transform(entityXform.Transform(worldPos));
+            var entityXform = Matrix3Helpers.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
+            var localPos = Vector2.Transform(Vector2.Transform(worldPos, entityXform), invSpriteMatrix);
 
             // Check explicitly defined click-able bounds
             if (CheckDirBound(sprite, relativeRotation, localPos))
@@ -79,8 +79,8 @@ namespace Content.Client.Clickable
 
                 // convert to layer-local coordinates
                 layer.GetLayerDrawMatrix(dir, out var matrix);
-                var inverseMatrix = Matrix3.Invert(matrix);
-                var layerLocal = inverseMatrix.Transform(localPos);
+                Matrix3x2.Invert(matrix, out var inverseMatrix);
+                var layerLocal = Vector2.Transform(localPos, inverseMatrix);
 
                 // Convert to image coordinates
                 var layerImagePos = (Vector2i) (layerLocal * EyeManager.PixelsPerMeter * new Vector2(1, -1) + rsiState.Size / 2f);
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index c96501fa65..3e22186c16 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Shared.Construction.Prototypes;
 using Content.Shared.Tag;
+using Content.Shared.Whitelist;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Placement;
@@ -23,6 +24,7 @@ namespace Content.Client.Construction.UI
     /// </summary>
     internal sealed class ConstructionMenuPresenter : IDisposable
     {
+        [Dependency] private readonly EntityManager _entManager = default!;
         [Dependency] private readonly IEntitySystemManager _systemManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IPlacementManager _placementManager = default!;
@@ -30,6 +32,7 @@ namespace Content.Client.Construction.UI
         [Dependency] private readonly IPlayerManager _playerManager = default!;
 
         private readonly IConstructionMenuView _constructionView;
+        private readonly EntityWhitelistSystem _whitelistSystem;
 
         private ConstructionSystem? _constructionSystem;
         private ConstructionPrototype? _selected;
@@ -78,6 +81,7 @@ namespace Content.Client.Construction.UI
             // This is a lot easier than a factory
             IoCManager.InjectDependencies(this);
             _constructionView = new ConstructionMenu();
+            _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
 
             // This is required so that if we load after the system is initialized, we can bind to it immediately
             if (_systemManager.TryGetEntitySystem<ConstructionSystem>(out var constructionSystem))
@@ -160,7 +164,7 @@ namespace Content.Client.Construction.UI
 
                 if (_playerManager.LocalSession == null
                 || _playerManager.LocalEntity == null
-                || (recipe.EntityWhitelist != null && !recipe.EntityWhitelist.IsValid(_playerManager.LocalEntity.Value)))
+                || _whitelistSystem.IsWhitelistFail(recipe.EntityWhitelist, _playerManager.LocalEntity.Value))
                     continue;
 
                 if (!string.IsNullOrEmpty(search))
diff --git a/Content.Client/Decals/Overlays/DecalOverlay.cs b/Content.Client/Decals/Overlays/DecalOverlay.cs
index d9904ae80b..0de3301e58 100644
--- a/Content.Client/Decals/Overlays/DecalOverlay.cs
+++ b/Content.Client/Decals/Overlays/DecalOverlay.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Decals;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -113,7 +114,7 @@ namespace Content.Client.Decals.Overlays
                     handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
             }
 
-            handle.SetTransform(Matrix3.Identity);
+            handle.SetTransform(Matrix3x2.Identity);
         }
     }
 }
diff --git a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
index be277448ed..845bd7c03d 100644
--- a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
+++ b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
@@ -51,7 +51,7 @@ public sealed class DecalPlacementOverlay : Overlay
         var handle = args.WorldHandle;
         handle.SetTransform(worldMatrix);
 
-        var localPos = invMatrix.Transform(mousePos.Position);
+        var localPos = Vector2.Transform(mousePos.Position, invMatrix);
 
         if (snap)
         {
@@ -63,6 +63,6 @@ public sealed class DecalPlacementOverlay : Overlay
         var box = new Box2Rotated(aabb, rotation, localPos);
 
         handle.DrawTextureRect(_sprite.Frame0(decal.Sprite), box, color);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs
index 45981159f0..dfbbf10891 100644
--- a/Content.Client/DoAfter/DoAfterOverlay.cs
+++ b/Content.Client/DoAfter/DoAfterOverlay.cs
@@ -56,8 +56,8 @@ public sealed class DoAfterOverlay : Overlay
 
         // If you use the display UI scale then need to set max(1f, displayscale) because 0 is valid.
         const float scale = 1f;
-        var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
-        var rotationMatrix = Matrix3.CreateRotation(-rotation);
+        var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(scale, scale));
+        var rotationMatrix = Matrix3Helpers.CreateRotation(-rotation);
 
         var curTime = _timing.CurTime;
 
@@ -91,9 +91,9 @@ public sealed class DoAfterOverlay : Overlay
                 ? curTime - _meta.GetPauseTime(uid, meta)
                 : curTime;
 
-            var worldMatrix = Matrix3.CreateTranslation(worldPosition);
-            Matrix3.Multiply(scaleMatrix, worldMatrix, out var scaledWorld);
-            Matrix3.Multiply(rotationMatrix, scaledWorld, out var matty);
+            var worldMatrix = Matrix3Helpers.CreateTranslation(worldPosition);
+            var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
+            var matty = Matrix3x2.Multiply(rotationMatrix, scaledWorld);
             handle.SetTransform(matty);
 
             var offset = 0f;
@@ -151,7 +151,7 @@ public sealed class DoAfterOverlay : Overlay
         }
 
         handle.UseShader(null);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     public Color GetProgressColor(float progress, float alpha = 1f)
diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
index e62b0dfa66..fb48c91010 100644
--- a/Content.Client/Drugs/RainbowOverlay.cs
+++ b/Content.Client/Drugs/RainbowOverlay.cs
@@ -1,7 +1,9 @@
+using Content.Shared.CCVar;
 using Content.Shared.Drugs;
 using Content.Shared.StatusEffect;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -10,6 +12,7 @@ namespace Content.Client.Drugs;
 
 public sealed class RainbowOverlay : Overlay
 {
+    [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -75,6 +78,10 @@ public sealed class RainbowOverlay : Overlay
 
     protected override void Draw(in OverlayDrawArgs args)
     {
+        // TODO disable only the motion part or ike's idea (single static frame of the overlay)
+        if (_config.GetCVar(CCVars.ReducedMotion))
+            return;
+
         if (ScreenTexture == null)
             return;
 
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 5ce03c153e..452b091ea6 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -153,7 +153,6 @@ namespace Content.Client.Entry
             _parallaxManager.LoadDefaultParallax();
 
             _overlayManager.AddOverlay(new SingularityOverlay());
-            _overlayManager.AddOverlay(new FlashOverlay());
             _overlayManager.AddOverlay(new RadiationPulseOverlay());
             _chatManager.Initialize();
             _clientPreferencesManager.Initialize();
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 125ec62e49..b476971a13 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -239,9 +239,7 @@ namespace Content.Client.Examine
 
             if (knowTarget)
             {
-                // TODO: FormattedMessage.RemoveMarkupPermissive
-                // var itemName = FormattedMessage.RemoveMarkupPermissive(Identity.Name(target, EntityManager, player));
-                var itemName = FormattedMessage.FromMarkupPermissive(Identity.Name(target, EntityManager, player)).ToString();
+                var itemName = FormattedMessage.EscapeText(Identity.Name(target, EntityManager, player));
                 var labelMessage = FormattedMessage.FromMarkupPermissive($"[bold]{itemName}[/bold]");
                 var label = new RichTextLabel();
                 label.SetMessage(labelMessage);
@@ -250,7 +248,7 @@ namespace Content.Client.Examine
             else
             {
                 var label = new RichTextLabel();
-                label.SetMessage(FormattedMessage.FromMarkup("[bold]???[/bold]"));
+                label.SetMessage(FormattedMessage.FromMarkupOrThrow("[bold]???[/bold]"));
                 hBox.AddChild(label);
             }
 
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index 2d8c15f1b9..8cf7447a5d 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -48,7 +48,7 @@ public sealed class ExplosionOverlay : Overlay
             DrawExplosion(drawHandle, args.WorldBounds, visuals, index, xforms, textures);
         }
 
-        drawHandle.SetTransform(Matrix3.Identity);
+        drawHandle.SetTransform(Matrix3x2.Identity);
         drawHandle.UseShader(null);
     }
 
@@ -78,7 +78,8 @@ public sealed class ExplosionOverlay : Overlay
         if (visuals.SpaceTiles == null)
             return;
 
-        gridBounds = Matrix3.Invert(visuals.SpaceMatrix).TransformBox(worldBounds).Enlarged(2);
+        Matrix3x2.Invert(visuals.SpaceMatrix, out var invSpace);
+        gridBounds = invSpace.TransformBox(worldBounds).Enlarged(2);
         drawHandle.SetTransform(visuals.SpaceMatrix);
 
         DrawTiles(drawHandle, gridBounds, index, visuals.SpaceTiles, visuals, visuals.SpaceTileSize, textures);
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
index fe9c888227..9ea00275e8 100644
--- a/Content.Client/Flash/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -1,12 +1,11 @@
-using System.Numerics;
+using Content.Shared.Flash;
+using Content.Shared.Flash.Components;
+using Content.Shared.StatusEffect;
 using Content.Client.Viewport;
 using Robust.Client.Graphics;
 using Robust.Client.State;
 using Robust.Client.Player;
 using Robust.Shared.Enums;
-using Robust.Shared.Graphics;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using SixLabors.ImageSharp.PixelFormats;
@@ -17,66 +16,87 @@ namespace Content.Client.Flash
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClyde _displayManager = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IGameTiming _timing = default!;
+
+       private readonly StatusEffectsSystem _statusSys;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
         private readonly ShaderInstance _shader;
-        private double _startTime = -1;
-        private double _lastsFor = 1;
-        private Texture? _screenshotTexture;
+        public float PercentComplete = 0.0f;
+        public Texture? ScreenshotTexture;
 
         public FlashOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _prototypeManager.Index<ShaderPrototype>("FlashedEffect").Instance().Duplicate();
+            _shader = _prototypeManager.Index<ShaderPrototype>("FlashedEffect").InstanceUnique();
+            _statusSys = _entityManager.System<StatusEffectsSystem>();
         }
 
-        public void ReceiveFlash(double duration)
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            var playerEntity = _playerManager.LocalEntity;
+
+            if (playerEntity == null)
+                return;
+
+            if (!_entityManager.HasComponent<FlashedComponent>(playerEntity)
+                || !_entityManager.TryGetComponent<StatusEffectsComponent>(playerEntity, out var status))
+                return;
+
+            if (!_statusSys.TryGetTime(playerEntity.Value, SharedFlashSystem.FlashedKey, out var time, status))
+                return;
+
+            var curTime = _timing.CurTime;
+            var lastsFor = (float) (time.Value.Item2 - time.Value.Item1).TotalSeconds;
+            var timeDone = (float) (curTime - time.Value.Item1).TotalSeconds;
+
+            PercentComplete = timeDone / lastsFor;
+        }
+
+        public void ReceiveFlash()
         {
             if (_stateManager.CurrentState is IMainViewportState state)
             {
+                // take a screenshot
+                // note that the callback takes a while and ScreenshotTexture will be null the first few Draws
                 state.Viewport.Viewport.Screenshot(image =>
                 {
                     var rgba32Image = image.CloneAs<Rgba32>(SixLabors.ImageSharp.Configuration.Default);
-                    _screenshotTexture = _displayManager.LoadTextureFromImage(rgba32Image);
+                    ScreenshotTexture = _displayManager.LoadTextureFromImage(rgba32Image);
                 });
             }
+        }
 
-            _startTime = _gameTiming.CurTime.TotalSeconds;
-            _lastsFor = duration;
+        protected override bool BeforeDraw(in OverlayDrawArgs args)
+        {
+            if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
+                return false;
+            if (args.Viewport.Eye != eyeComp.Eye)
+                return false;
+
+            return PercentComplete < 1.0f;
         }
 
         protected override void Draw(in OverlayDrawArgs args)
         {
-            if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
-                return;
-
-            if (args.Viewport.Eye != eyeComp.Eye)
-                return;
-
-            var percentComplete = (float) ((_gameTiming.CurTime.TotalSeconds - _startTime) / _lastsFor);
-            if (percentComplete >= 1.0f)
+            if (ScreenshotTexture == null)
                 return;
 
             var worldHandle = args.WorldHandle;
+            _shader.SetParameter("percentComplete", PercentComplete);
             worldHandle.UseShader(_shader);
-            _shader.SetParameter("percentComplete", percentComplete);
-
-            if (_screenshotTexture != null)
-            {
-                worldHandle.DrawTextureRectRegion(_screenshotTexture, args.WorldBounds);
-            }
-
+            worldHandle.DrawTextureRectRegion(ScreenshotTexture, args.WorldBounds);
             worldHandle.UseShader(null);
         }
 
         protected override void DisposeBehavior()
         {
             base.DisposeBehavior();
-            _screenshotTexture = null;
+            ScreenshotTexture = null;
+            PercentComplete = 1.0f;
         }
     }
 }
diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs
index ad8f8b0b82..9a0579f6aa 100644
--- a/Content.Client/Flash/FlashSystem.cs
+++ b/Content.Client/Flash/FlashSystem.cs
@@ -1,62 +1,67 @@
 using Content.Shared.Flash;
+using Content.Shared.Flash.Components;
+using Content.Shared.StatusEffect;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
-using Robust.Shared.GameStates;
-using Robust.Shared.Timing;
+using Robust.Shared.Player;
 
-namespace Content.Client.Flash
+namespace Content.Client.Flash;
+
+public sealed class FlashSystem : SharedFlashSystem
 {
-    public sealed class FlashSystem : SharedFlashSystem
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+    private FlashOverlay _overlay = default!;
+
+    public override void Initialize()
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IOverlayManager _overlayManager = default!;
+        base.Initialize();
 
-        public override void Initialize()
+        SubscribeLocalEvent<FlashedComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<FlashedComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<FlashedComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<FlashedComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+        SubscribeLocalEvent<FlashedComponent, StatusEffectAddedEvent>(OnStatusAdded);
+
+        _overlay = new();
+    }
+
+    private void OnPlayerAttached(EntityUid uid, FlashedComponent component, LocalPlayerAttachedEvent args)
+    {
+        _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, FlashedComponent component, LocalPlayerDetachedEvent args)
+    {
+        _overlay.PercentComplete = 1.0f;
+        _overlay.ScreenshotTexture = null;
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnInit(EntityUid uid, FlashedComponent component, ComponentInit args)
+    {
+        if (_player.LocalEntity == uid)
         {
-            base.Initialize();
-
-            SubscribeLocalEvent<FlashableComponent, ComponentHandleState>(OnFlashableHandleState);
+            _overlayMan.AddOverlay(_overlay);
         }
+    }
 
-        private void OnFlashableHandleState(EntityUid uid, FlashableComponent component, ref ComponentHandleState args)
+    private void OnShutdown(EntityUid uid, FlashedComponent component, ComponentShutdown args)
+    {
+        if (_player.LocalEntity == uid)
         {
-            if (args.Current is not FlashableComponentState state)
-                return;
+            _overlay.PercentComplete = 1.0f;
+            _overlay.ScreenshotTexture = null;
+            _overlayMan.RemoveOverlay(_overlay);
+        }
+    }
 
-            // Yes, this code is awful. I'm just porting it to an entity system so don't blame me.
-            if (_playerManager.LocalEntity != uid)
-            {
-                return;
-            }
-
-            if (state.Time == default)
-            {
-                return;
-            }
-
-            // Few things here:
-            // 1. If a shorter duration flash is applied then don't do anything
-            // 2. If the client-side time is later than when the flash should've ended don't do anything
-            var currentTime = _gameTiming.CurTime.TotalSeconds;
-            var newEndTime = state.Time.TotalSeconds + state.Duration;
-            var currentEndTime = component.LastFlash.TotalSeconds + component.Duration;
-
-            if (currentEndTime > newEndTime)
-            {
-                return;
-            }
-
-            if (currentTime > newEndTime)
-            {
-                return;
-            }
-
-            component.LastFlash = state.Time;
-            component.Duration = state.Duration;
-
-            var overlay = _overlayManager.GetOverlay<FlashOverlay>();
-            overlay.ReceiveFlash(component.Duration);
+    private void OnStatusAdded(EntityUid uid, FlashedComponent component, StatusEffectAddedEvent args)
+    {
+        if (_player.LocalEntity == uid && args.Key == FlashedKey)
+        {
+            _overlay.ReceiveFlash();
         }
     }
 }
diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs
index ac6661cfdd..a8c1d35510 100644
--- a/Content.Client/Fluids/PuddleOverlay.cs
+++ b/Content.Client/Fluids/PuddleOverlay.cs
@@ -1,4 +1,5 @@
-using Content.Shared.FixedPoint;
+using System.Numerics;
+using Content.Shared.FixedPoint;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
@@ -73,7 +74,7 @@ public sealed class PuddleOverlay : Overlay
             }
         }
 
-        drawHandle.SetTransform(Matrix3.Identity);
+        drawHandle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawScreen(in OverlayDrawArgs args)
@@ -99,7 +100,7 @@ public sealed class PuddleOverlay : Overlay
                 if (!gridBounds.Contains(centre))
                     continue;
 
-                var screenCenter = _eyeManager.WorldToScreen(matrix.Transform(centre));
+                var screenCenter = _eyeManager.WorldToScreen(Vector2.Transform(centre, matrix));
 
                 drawHandle.DrawString(_font, screenCenter, debugOverlayData.CurrentVolume.ToString(), Color.White);
             }
diff --git a/Content.Client/Guidebook/GuidebookSystem.cs b/Content.Client/Guidebook/GuidebookSystem.cs
index 39cb561bf8..a0532294d6 100644
--- a/Content.Client/Guidebook/GuidebookSystem.cs
+++ b/Content.Client/Guidebook/GuidebookSystem.cs
@@ -167,7 +167,7 @@ public sealed class GuidebookSystem : EntitySystem
 
     public void FakeClientActivateInWorld(EntityUid activated)
     {
-        var activateMsg = new ActivateInWorldEvent(GetGuidebookUser(), activated);
+        var activateMsg = new ActivateInWorldEvent(GetGuidebookUser(), activated, true);
         RaiseLocalEvent(activated, activateMsg);
     }
 
diff --git a/Content.Client/Guidebook/Richtext/Box.cs b/Content.Client/Guidebook/Richtext/Box.cs
index ecf6cb21f7..6e18ad9c57 100644
--- a/Content.Client/Guidebook/Richtext/Box.cs
+++ b/Content.Client/Guidebook/Richtext/Box.cs
@@ -11,6 +11,9 @@ public sealed class Box : BoxContainer, IDocumentTag
         HorizontalExpand = true;
         control = this;
 
+        if (args.TryGetValue("Margin", out var margin))
+            Margin = new Thickness(float.Parse(margin));
+
         if (args.TryGetValue("Orientation", out var orientation))
             Orientation = Enum.Parse<LayoutOrientation>(orientation);
         else
diff --git a/Content.Client/Guidebook/Richtext/ColorBox.cs b/Content.Client/Guidebook/Richtext/ColorBox.cs
new file mode 100644
index 0000000000..84de300d6e
--- /dev/null
+++ b/Content.Client/Guidebook/Richtext/ColorBox.cs
@@ -0,0 +1,49 @@
+using System.Diagnostics.CodeAnalysis;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Guidebook.Richtext;
+
+[UsedImplicitly]
+public sealed class ColorBox : PanelContainer, IDocumentTag
+{
+    public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
+    {
+        HorizontalExpand = true;
+        VerticalExpand = true;
+        control = this;
+
+        if (args.TryGetValue("Margin", out var margin))
+            Margin = new Thickness(float.Parse(margin));
+
+        if (args.TryGetValue("HorizontalAlignment", out var halign))
+            HorizontalAlignment = Enum.Parse<HAlignment>(halign);
+        else
+            HorizontalAlignment = HAlignment.Stretch;
+
+        if (args.TryGetValue("VerticalAlignment", out var valign))
+            VerticalAlignment = Enum.Parse<VAlignment>(valign);
+        else
+            VerticalAlignment = VAlignment.Stretch;
+
+        var styleBox =  new StyleBoxFlat();
+        if (args.TryGetValue("Color", out var color))
+            styleBox.BackgroundColor = Color.FromHex(color);
+
+        if (args.TryGetValue("OutlineThickness", out var outlineThickness))
+            styleBox.BorderThickness = new Thickness(float.Parse(outlineThickness));
+        else
+            styleBox.BorderThickness = new Thickness(1);
+
+        if (args.TryGetValue("OutlineColor", out var outlineColor))
+            styleBox.BorderColor = Color.FromHex(outlineColor);
+        else
+            styleBox.BorderColor = Color.White;
+
+        PanelOverride = styleBox;
+
+        return true;
+    }
+}
diff --git a/Content.Client/Guidebook/Richtext/Table.cs b/Content.Client/Guidebook/Richtext/Table.cs
new file mode 100644
index 0000000000..b6923c3698
--- /dev/null
+++ b/Content.Client/Guidebook/Richtext/Table.cs
@@ -0,0 +1,27 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Client.UserInterface.Controls;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Guidebook.Richtext;
+
+[UsedImplicitly]
+public sealed class Table : TableContainer, IDocumentTag
+{
+    public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
+    {
+        HorizontalExpand = true;
+        control = this;
+
+        if (!args.TryGetValue("Columns", out var columns) || !int.TryParse(columns, out var columnsCount))
+        {
+            Logger.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
+            control = null;
+            return false;
+        }
+
+        Columns = columnsCount;
+
+        return true;
+    }
+}
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 33f38688ed..7e50eb1c68 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -21,7 +21,6 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
 using static Content.Client.Inventory.ClientInventorySystem;
 using static Robust.Client.UserInterface.Control;
 
@@ -53,9 +52,13 @@ namespace Content.Client.Inventory
             _inv = EntMan.System<InventorySystem>();
             _cuffable = EntMan.System<SharedCuffableSystem>();
 
+            // TODO update name when identity changes
             var title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan)));
             _strippingMenu = new StrippingMenu(title, this);
             _strippingMenu.OnClose += Close;
+
+            // TODO use global entity
+            // BUIs are opened and closed while applying comp sates, so spawning entities here is probably not the best idea.
             _virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace);
         }
 
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index ae9196c110..f6a3eed962 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -22,7 +22,6 @@ using Robust.Client.UserInterface.Controllers;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Lobby;
@@ -70,12 +69,9 @@ public sealed class LobbyUIController : UIController, IOnStateEntered<LobbyState
             _profileEditor?.RefreshFlavorText();
         });
 
-        _configurationManager.OnValueChanged(CCVars.GameRoleTimers, args =>
-        {
-            _profileEditor?.RefreshAntags();
-            _profileEditor?.RefreshJobs();
-            _profileEditor?.RefreshLoadouts();
-        });
+        _configurationManager.OnValueChanged(CCVars.GameRoleTimers, _ => RefreshProfileEditor());
+
+        _configurationManager.OnValueChanged(CCVars.GameRoleWhitelist, _ => RefreshProfileEditor());
     }
 
     private LobbyCharacterPreviewPanel? GetLobbyPreview()
@@ -193,6 +189,13 @@ public sealed class LobbyUIController : UIController, IOnStateEntered<LobbyState
         PreviewPanel.SetSummaryText(humanoid.Summary);
     }
 
+    private void RefreshProfileEditor()
+    {
+        _profileEditor?.RefreshAntags();
+        _profileEditor?.RefreshJobs();
+        _profileEditor?.RefreshLoadouts();
+    }
+
     private void SaveProfile()
     {
         DebugTools.Assert(EditedProfile != null);
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index dee6cf8d09..ec180bc524 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -720,8 +720,17 @@ namespace Content.Client.Lobby.UI
             _jobPriorities.Clear();
             var firstCategory = true;
 
-            var departments = _prototypeManager.EnumeratePrototypes<DepartmentPrototype>().ToArray();
-            Array.Sort(departments, DepartmentUIComparer.Instance);
+            // Get all displayed departments
+            var departments = new List<DepartmentPrototype>();
+            foreach (var department in _prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
+            {
+                if (department.EditorHidden)
+                    continue;
+
+                departments.Add(department);
+            }
+
+            departments.Sort(DepartmentUIComparer.Instance);
 
             var items = new[]
             {
@@ -775,7 +784,7 @@ namespace Content.Client.Lobby.UI
                     JobList.AddChild(category);
                 }
 
-                var jobs = department.Roles.Select(jobId => _prototypeManager.Index<JobPrototype>(jobId))
+                var jobs = department.Roles.Select(jobId => _prototypeManager.Index(jobId))
                     .Where(job => job.SetPreference)
                     .ToArray();
 
@@ -822,13 +831,15 @@ namespace Content.Client.Lobby.UI
                             if (jobId == job.ID)
                             {
                                 other.Select(selectedPrio);
+                                continue;
                             }
-                            else if (selectedJobPrio == JobPriority.High && (JobPriority) other.Selected == JobPriority.High)
-                            {
-                                // Lower any other high priorities to medium.
-                                other.Select((int) JobPriority.Medium);
-                                Profile = Profile?.WithJobPriority(jobId, JobPriority.Medium);
-                            }
+
+                            if (selectedJobPrio != JobPriority.High || (JobPriority) other.Selected != JobPriority.High)
+                                continue;
+
+                            // Lower any other high priorities to medium.
+                            other.Select((int)JobPriority.Medium);
+                            Profile = Profile?.WithJobPriority(jobId, JobPriority.Medium);
                         }
 
                         // TODO: Only reload on high change (either to or from).
@@ -933,6 +944,11 @@ namespace Content.Client.Lobby.UI
                 SetDirty();
                 ReloadPreview();
             };
+
+            if (Profile is null)
+                return;
+
+            UpdateJobPriorities();
         }
 
         private void OnFlavorTextChange(string content)
diff --git a/Content.Client/Maps/GridDraggingSystem.cs b/Content.Client/Maps/GridDraggingSystem.cs
index e82786847e..5e9250f0ce 100644
--- a/Content.Client/Maps/GridDraggingSystem.cs
+++ b/Content.Client/Maps/GridDraggingSystem.cs
@@ -101,7 +101,7 @@ public sealed class GridDraggingSystem : SharedGridDraggingSystem
             if (!_mapManager.TryFindGridAt(mousePos, out var gridUid, out var grid))
                 return;
 
-            StartDragging(gridUid, Transform(gridUid).InvWorldMatrix.Transform(mousePos.Position));
+            StartDragging(gridUid, Vector2.Transform(mousePos.Position, Transform(gridUid).InvWorldMatrix));
         }
 
         if (!TryComp(_dragging, out TransformComponent? xform))
@@ -116,7 +116,7 @@ public sealed class GridDraggingSystem : SharedGridDraggingSystem
             return;
         }
 
-        var localToWorld = xform.WorldMatrix.Transform(_localPosition);
+        var localToWorld = Vector2.Transform(_localPosition, xform.WorldMatrix);
 
         if (localToWorld.EqualsApprox(mousePos.Position, 0.01f)) return;
 
diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index 709601a57b..d3ae509152 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -223,7 +223,7 @@ namespace Content.Client.NPC
 
                         foreach (var crumb in chunk.Value)
                         {
-                            var crumbMapPos = worldMatrix.Transform(_system.GetCoordinate(chunk.Key, crumb.Coordinates));
+                            var crumbMapPos = Vector2.Transform(_system.GetCoordinate(chunk.Key, crumb.Coordinates), worldMatrix);
                             var distance = (crumbMapPos - mouseWorldPos.Position).Length();
 
                             if (distance < nearestDistance)
@@ -292,7 +292,7 @@ namespace Content.Client.NPC
 
                 foreach (var poly in tile)
                 {
-                    if (poly.Box.Contains(invGridMatrix.Transform(mouseWorldPos.Position)))
+                    if (poly.Box.Contains(Vector2.Transform(mouseWorldPos.Position, invGridMatrix)))
                     {
                         nearest = poly;
                         break;
@@ -488,7 +488,7 @@ namespace Content.Client.NPC
                                         if (neighborMap.MapId != args.MapId)
                                             continue;
 
-                                        neighborPos = invMatrix.Transform(neighborMap.Position);
+                                        neighborPos = Vector2.Transform(neighborMap.Position, invMatrix);
                                     }
                                     else
                                     {
@@ -576,7 +576,7 @@ namespace Content.Client.NPC
                 }
             }
 
-            worldHandle.SetTransform(Matrix3.Identity);
+            worldHandle.SetTransform(Matrix3x2.Identity);
         }
     }
 }
diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
index 691bcb41db..4e8a4a10ca 100644
--- a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
+++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
@@ -199,7 +199,7 @@ namespace Content.Client.NodeContainer
             }
 
 
-            handle.SetTransform(Matrix3.Identity);
+            handle.SetTransform(Matrix3x2.Identity);
             _gridIndex.Clear();
         }
 
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 2b2ff14a22..758bb562f9 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -42,8 +42,8 @@ public sealed class EntityHealthBarOverlay : Overlay
         var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
 
         const float scale = 1f;
-        var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
-        var rotationMatrix = Matrix3.CreateRotation(-rotation);
+        var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(scale, scale));
+        var rotationMatrix = Matrix3Helpers.CreateRotation(-rotation);
 
         var query = _entManager.AllEntityQueryEnumerator<MobThresholdsComponent, MobStateComponent, DamageableComponent, SpriteComponent>();
         while (query.MoveNext(out var uid,
@@ -83,10 +83,10 @@ public sealed class EntityHealthBarOverlay : Overlay
                 continue;
 
             var worldPosition = _transform.GetWorldPosition(xform);
-            var worldMatrix = Matrix3.CreateTranslation(worldPosition);
+            var worldMatrix = Matrix3Helpers.CreateTranslation(worldPosition);
 
-            Matrix3.Multiply(scaleMatrix, worldMatrix, out var scaledWorld);
-            Matrix3.Multiply(rotationMatrix, scaledWorld, out var matty);
+            var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
+            var matty = Matrix3x2.Multiply(rotationMatrix, scaledWorld);
 
             handle.SetTransform(matty);
 
@@ -115,7 +115,7 @@ public sealed class EntityHealthBarOverlay : Overlay
             handle.DrawRect(pixelDarken, Black.WithAlpha(128));
         }
 
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     /// <summary>
diff --git a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
index 9581fec37b..d29564caa9 100644
--- a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
+++ b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
@@ -7,7 +7,7 @@ namespace Content.Client.Overlays;
 
 public sealed partial class StencilOverlay
 {
-    private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeComponent rangeComp, Matrix3 invMatrix)
+    private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeComponent rangeComp, Matrix3x2 invMatrix)
     {
         var worldHandle = args.WorldHandle;
         var renderScale = args.Viewport.RenderScale.X;
@@ -16,7 +16,7 @@ public sealed partial class StencilOverlay
         var length = zoom.X;
         var bufferRange = MathF.Min(10f, rangeComp.Range);
 
-        var pixelCenter = invMatrix.Transform(rangeComp.Origin);
+        var pixelCenter = Vector2.Transform(rangeComp.Origin, invMatrix);
         // Something something offset?
         var vertical = args.Viewport.Size.Y;
 
@@ -44,7 +44,7 @@ public sealed partial class StencilOverlay
             worldHandle.DrawRect(localAABB, Color.White);
         }, Color.Transparent);
 
-        worldHandle.SetTransform(Matrix3.Identity);
+        worldHandle.SetTransform(Matrix3x2.Identity);
         worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilMask").Instance());
         worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
         var curTime = _timing.RealTime;
diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs
index 31bc88af45..29ed157a79 100644
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -10,7 +10,7 @@ public sealed partial class StencilOverlay
 {
     private List<Entity<MapGridComponent>> _grids = new();
 
-    private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto, float alpha, Matrix3 invMatrix)
+    private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto, float alpha, Matrix3x2 invMatrix)
     {
         var worldHandle = args.WorldHandle;
         var mapId = args.MapId;
@@ -32,7 +32,7 @@ public sealed partial class StencilOverlay
             foreach (var grid in _grids)
             {
                 var matrix = _transform.GetWorldMatrix(grid, xformQuery);
-                Matrix3.Multiply(in matrix, in invMatrix, out var matty);
+                var matty =  Matrix3x2.Multiply(matrix, invMatrix);
                 worldHandle.SetTransform(matty);
 
                 foreach (var tile in grid.Comp.GetTilesIntersecting(worldAABB))
@@ -52,7 +52,7 @@ public sealed partial class StencilOverlay
 
         }, Color.Transparent);
 
-        worldHandle.SetTransform(Matrix3.Identity);
+        worldHandle.SetTransform(Matrix3x2.Identity);
         worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilMask").Instance());
         worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
         var curTime = _timing.RealTime;
@@ -62,7 +62,7 @@ public sealed partial class StencilOverlay
         worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilDraw").Instance());
         _parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, Vector2.Zero, modulate: (weatherProto.Color ?? Color.White).WithAlpha(alpha));
 
-        worldHandle.SetTransform(Matrix3.Identity);
+        worldHandle.SetTransform(Matrix3x2.Identity);
         worldHandle.UseShader(null);
     }
 }
diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs
index e475dca759..78b1c4d2b1 100644
--- a/Content.Client/Overlays/StencilOverlay.cs
+++ b/Content.Client/Overlays/StencilOverlay.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Client.Parallax;
 using Content.Client.Weather;
 using Content.Shared.Salvage;
@@ -72,6 +73,6 @@ public sealed partial class StencilOverlay : Overlay
         }
 
         args.WorldHandle.UseShader(null);
-        args.WorldHandle.SetTransform(Matrix3.Identity);
+        args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/Paper/UI/StampLabel.xaml.cs b/Content.Client/Paper/UI/StampLabel.xaml.cs
index 6a8eb5f98f..be6d52baea 100644
--- a/Content.Client/Paper/UI/StampLabel.xaml.cs
+++ b/Content.Client/Paper/UI/StampLabel.xaml.cs
@@ -50,7 +50,7 @@ public sealed partial class StampLabel : Label
         base.Draw(handle);
 
         // Restore a sane transform+shader
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
         handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Paper/UI/StampWidget.xaml.cs b/Content.Client/Paper/UI/StampWidget.xaml.cs
index a04508aeba..487e0732b4 100644
--- a/Content.Client/Paper/UI/StampWidget.xaml.cs
+++ b/Content.Client/Paper/UI/StampWidget.xaml.cs
@@ -53,7 +53,7 @@ public sealed partial class StampWidget : PanelContainer
         base.Draw(handle);
 
         // Restore a sane transform+shader
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
         handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Pinpointer/UI/NavMapControl.cs b/Content.Client/Pinpointer/UI/NavMapControl.cs
index f4d2f8e2fb..3c99a18818 100644
--- a/Content.Client/Pinpointer/UI/NavMapControl.cs
+++ b/Content.Client/Pinpointer/UI/NavMapControl.cs
@@ -218,7 +218,7 @@ public partial class NavMapControl : MapGridControl
 
             // Convert to a world position
             var unscaledPosition = (localPosition - MidPointVector) / MinimapScale;
-            var worldPosition = _transformSystem.GetWorldMatrix(_xform).Transform(new Vector2(unscaledPosition.X, -unscaledPosition.Y) + offset);
+            var worldPosition = Vector2.Transform(new Vector2(unscaledPosition.X, -unscaledPosition.Y) + offset, _transformSystem.GetWorldMatrix(_xform));
 
             // Find closest tracked entity in range
             var closestEntity = NetEntity.Invalid;
@@ -401,7 +401,7 @@ public partial class NavMapControl : MapGridControl
 
                 if (mapPos.MapId != MapId.Nullspace)
                 {
-                    var position = _transformSystem.GetInvWorldMatrix(_xform).Transform(mapPos.Position) - offset;
+                    var position = Vector2.Transform(mapPos.Position, _transformSystem.GetInvWorldMatrix(_xform)) - offset;
                     position = ScalePosition(new Vector2(position.X, -position.Y));
 
                     handle.DrawCircle(position, float.Sqrt(MinimapScale) * 2f, value.Color);
@@ -422,7 +422,7 @@ public partial class NavMapControl : MapGridControl
 
             if (mapPos.MapId != MapId.Nullspace)
             {
-                var position = _transformSystem.GetInvWorldMatrix(_xform).Transform(mapPos.Position) - offset;
+                var position = Vector2.Transform(mapPos.Position, _transformSystem.GetInvWorldMatrix(_xform)) - offset;
                 position = ScalePosition(new Vector2(position.X, -position.Y));
 
                 var scalingCoefficient = MinmapScaleModifier * float.Sqrt(MinimapScale);
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index 8193f79569..cb155cadbf 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.CCVar;
 using Content.Shared.Players;
+using Content.Shared.Players.JobWhitelist;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Roles;
 using Robust.Client;
@@ -24,6 +25,7 @@ public sealed class JobRequirementsManager : ISharedPlaytimeManager
 
     private readonly Dictionary<string, TimeSpan> _roles = new();
     private readonly List<string> _roleBans = new();
+    private readonly List<string> _jobWhitelists = new();
 
     private ISawmill _sawmill = default!;
 
@@ -36,6 +38,7 @@ public sealed class JobRequirementsManager : ISharedPlaytimeManager
         // Yeah the client manager handles role bans and playtime but the server ones are separate DEAL.
         _net.RegisterNetMessage<MsgRoleBans>(RxRoleBans);
         _net.RegisterNetMessage<MsgPlayTime>(RxPlayTime);
+        _net.RegisterNetMessage<MsgJobWhitelist>(RxJobWhitelist);
 
         _client.RunLevelChanged += ClientOnRunLevelChanged;
     }
@@ -79,6 +82,13 @@ public sealed class JobRequirementsManager : ISharedPlaytimeManager
         Updated?.Invoke();
     }
 
+    private void RxJobWhitelist(MsgJobWhitelist message)
+    {
+        _jobWhitelists.Clear();
+        _jobWhitelists.AddRange(message.Whitelist);
+        Updated?.Invoke();
+    }
+
     public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         reason = null;
@@ -89,6 +99,9 @@ public sealed class JobRequirementsManager : ISharedPlaytimeManager
             return false;
         }
 
+        if (!CheckWhitelist(job, out reason))
+            return false;
+
         var player = _playerManager.LocalSession;
         if (player == null)
             return true;
@@ -116,6 +129,21 @@ public sealed class JobRequirementsManager : ISharedPlaytimeManager
         return reason == null;
     }
 
+    public bool CheckWhitelist(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        reason = default;
+        if (!_cfg.GetCVar(CCVars.GameRoleWhitelist))
+            return true;
+
+        if (job.Whitelisted && !_jobWhitelists.Contains(job.ID))
+        {
+            reason = FormattedMessage.FromUnformatted(Loc.GetString("role-not-whitelisted"));
+            return false;
+        }
+
+        return true;
+    }
+
     public TimeSpan FetchOverallPlaytime()
     {
         return _roles.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index fb6bb3bf56..77eeb611f5 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Examine;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
@@ -55,7 +56,7 @@ public sealed class PopupOverlay : Overlay
         if (args.ViewportControl == null)
             return;
 
-        args.DrawingHandle.SetTransform(Matrix3.Identity);
+        args.DrawingHandle.SetTransform(Matrix3x2.Identity);
         args.DrawingHandle.UseShader(_shader);
         var scale = _configManager.GetCVar(CVars.DisplayUIScale);
 
@@ -90,7 +91,7 @@ public sealed class PopupOverlay : Overlay
                     e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager))
                 continue;
 
-            var pos = matrix.Transform(mapPos.Position);
+            var pos = Vector2.Transform(mapPos.Position, matrix);
             _controller.DrawPopup(popup, worldHandle, pos, scale);
         }
     }
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
index 25a586a75d..1427df0515 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
@@ -102,7 +102,8 @@ public sealed partial class PowerMonitoringWindow
         button.ToolTip = Loc.GetString(name);
 
         // Update power value
-        button.PowerValue.Text = Loc.GetString("power-monitoring-window-value", ("value", entry.PowerValue));
+        // Don't use SI prefixes, just give the number in W, so that it is readily apparent which consumer is using a lot of power.
+        button.PowerValue.Text = Loc.GetString("power-monitoring-window-button-value", ("value", Math.Round(entry.PowerValue).ToString("N0")));
     }
 
     private void UpdateEntrySourcesOrLoads(BoxContainer masterContainer, BoxContainer currentContainer, PowerMonitoringConsoleEntry[]? entries, SpriteSpecifier.Texture icon)
@@ -480,6 +481,7 @@ public sealed class PowerMonitoringButton : Button
         PowerValue = new Label()
         {
             HorizontalAlignment = HAlignment.Right,
+            Align = Label.AlignMode.Right,
             SetWidth = 72f,
             Margin = new Thickness(10, 0, 0, 0),
             ClipText = true,
diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
index 7086fd0541..d5154a87be 100644
--- a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
+++ b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Shuttles.Events;
 using Content.Shared.Shuttles.Systems;
 using Robust.Client.Graphics;
@@ -75,6 +76,6 @@ public sealed class EmergencyShuttleOverlay : Overlay
 
         args.WorldHandle.SetTransform(xform.WorldMatrix);
         args.WorldHandle.DrawRect(Position.Value, Color.Red.WithAlpha(100));
-        args.WorldHandle.SetTransform(Matrix3.Identity);
+        args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index 8774c1dfb5..b50d8fa6b2 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.Components;
 using Robust.Client.AutoGenerated;
@@ -115,7 +116,7 @@ public partial class BaseShuttleControl : MapGridControl
         }
     }
 
-    protected void DrawGrid(DrawingHandleScreen handle, Matrix3 matrix, Entity<MapGridComponent> grid, Color color, float alpha = 0.01f)
+    protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 matrix, Entity<MapGridComponent> grid, Color color, float alpha = 0.01f)
     {
         var rator = Maps.GetAllTilesEnumerator(grid.Owner, grid.Comp);
         var minimapScale = MinimapScale;
@@ -289,7 +290,7 @@ public partial class BaseShuttleControl : MapGridControl
 
         public float MinimapScale;
         public Vector2 MidPoint;
-        public Matrix3 Matrix;
+        public Matrix3x2 Matrix;
 
         public List<Vector2> Vertices;
         public Vector2[] ScaledVertices;
@@ -297,7 +298,7 @@ public partial class BaseShuttleControl : MapGridControl
         public void Execute(int index)
         {
             var vert = Vertices[index];
-            var adjustedVert = Matrix.Transform(vert);
+            var adjustedVert = Vector2.Transform(vert, Matrix);
             adjustedVert = adjustedVert with { Y = -adjustedVert.Y };
 
             var scaledVert = ScalePosition(adjustedVert, MinimapScale, MidPoint);
diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml.cs b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
index b7b757ea48..91d95aaa04 100644
--- a/Content.Client/Shuttles/UI/NavScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Shuttles.BUIStates;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -68,7 +69,7 @@ public sealed partial class NavScreen : BoxContainer
         }
 
         var (_, worldRot, worldMatrix) = _xformSystem.GetWorldPositionRotationMatrix(gridXform);
-        var worldPos = worldMatrix.Transform(gridBody.LocalCenter);
+        var worldPos = Vector2.Transform(gridBody.LocalCenter, worldMatrix);
 
         // Get the positive reduced angle.
         var displayRot = -worldRot.Reduced();
diff --git a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
index f03c440295..31f0eecad7 100644
--- a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
@@ -108,10 +108,10 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
         var gridNent = EntManager.GetNetEntity(GridEntity);
         var mapPos = _xformSystem.ToMapCoordinates(_coordinates.Value);
         var ourGridMatrix = _xformSystem.GetWorldMatrix(gridXform.Owner);
-        var dockMatrix = Matrix3.CreateTransform(_coordinates.Value.Position, Angle.Zero);
-        Matrix3.Multiply(dockMatrix, ourGridMatrix, out var offsetMatrix);
+        var dockMatrix = Matrix3Helpers.CreateTransform(_coordinates.Value.Position, Angle.Zero);
+        var worldFromDock = Matrix3x2.Multiply(dockMatrix, ourGridMatrix);
 
-        offsetMatrix = offsetMatrix.Invert();
+        Matrix3x2.Invert(worldFromDock, out var offsetMatrix);
 
         // Draw nearby grids
         var controlBounds = PixelSizeBox;
@@ -137,7 +137,7 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
                 continue;
 
             var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
-            Matrix3.Multiply(in gridMatrix, in offsetMatrix, out var matty);
+            var matty = Matrix3x2.Multiply(gridMatrix, offsetMatrix);
             var color = _shuttles.GetIFFColor(grid.Owner, grid.Owner == GridEntity, component: iffComp);
 
             DrawGrid(handle, matty, grid, color);
@@ -151,23 +151,23 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
                 if (ViewedDock == dock.Entity)
                     continue;
 
-                var position = matty.Transform(dock.Coordinates.Position);
+                var position = Vector2.Transform(dock.Coordinates.Position, matty);
 
-                var otherDockRotation = Matrix3.CreateRotation(dock.Angle);
+                var otherDockRotation = Matrix3Helpers.CreateRotation(dock.Angle);
                 var scaledPos = ScalePosition(position with {Y = -position.Y});
 
                 if (!controlBounds.Contains(scaledPos.Floored()))
                     continue;
 
                 // Draw the dock's collision
-                var collisionBL = matty.Transform(dock.Coordinates.Position +
-                                                  otherDockRotation.Transform(new Vector2(-0.2f, -0.7f)));
-                var collisionBR = matty.Transform(dock.Coordinates.Position +
-                                                  otherDockRotation.Transform(new Vector2(0.2f, -0.7f)));
-                var collisionTR = matty.Transform(dock.Coordinates.Position +
-                                                  otherDockRotation.Transform(new Vector2(0.2f, -0.5f)));
-                var collisionTL = matty.Transform(dock.Coordinates.Position +
-                                                  otherDockRotation.Transform(new Vector2(-0.2f, -0.5f)));
+                var collisionBL = Vector2.Transform(dock.Coordinates.Position +
+                                                  Vector2.Transform(new Vector2(-0.2f, -0.7f), otherDockRotation), matty);
+                var collisionBR = Vector2.Transform(dock.Coordinates.Position +
+                                                  Vector2.Transform(new Vector2(0.2f, -0.7f), otherDockRotation), matty);
+                var collisionTR = Vector2.Transform(dock.Coordinates.Position +
+                                                  Vector2.Transform(new Vector2(0.2f, -0.5f), otherDockRotation), matty);
+                var collisionTL = Vector2.Transform(dock.Coordinates.Position +
+                                                  Vector2.Transform(new Vector2(-0.2f, -0.5f), otherDockRotation), matty);
 
                 var verts = new[]
                 {
@@ -195,10 +195,10 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
                 handle.DrawPrimitives(DrawPrimitiveTopology.LineList, verts, otherDockConnection);
 
                 // Draw the dock itself
-                var dockBL = matty.Transform(dock.Coordinates.Position + new Vector2(-0.5f, -0.5f));
-                var dockBR = matty.Transform(dock.Coordinates.Position + new Vector2(0.5f, -0.5f));
-                var dockTR = matty.Transform(dock.Coordinates.Position + new Vector2(0.5f, 0.5f));
-                var dockTL = matty.Transform(dock.Coordinates.Position + new Vector2(-0.5f, 0.5f));
+                var dockBL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, -0.5f), matty);
+                var dockBR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, -0.5f), matty);
+                var dockTR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, 0.5f), matty);
+                var dockTL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, 0.5f), matty);
 
                 verts = new[]
                 {
@@ -308,14 +308,14 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
         // Draw the dock's collision
         var invertedPosition = Vector2.Zero;
         invertedPosition.Y = -invertedPosition.Y;
-        var rotation = Matrix3.CreateRotation(-_angle.Value + MathF.PI);
+        var rotation = Matrix3Helpers.CreateRotation(-_angle.Value + MathF.PI);
         var ourDockConnection = new UIBox2(
-            ScalePosition(rotation.Transform(new Vector2(-0.2f, -0.7f))),
-            ScalePosition(rotation.Transform(new Vector2(0.2f, -0.5f))));
+            ScalePosition(Vector2.Transform(new Vector2(-0.2f, -0.7f), rotation)),
+            ScalePosition(Vector2.Transform(new Vector2(0.2f, -0.5f), rotation)));
 
         var ourDock = new UIBox2(
-            ScalePosition(rotation.Transform(new Vector2(-0.5f, 0.5f))),
-            ScalePosition(rotation.Transform(new Vector2(0.5f, -0.5f))));
+            ScalePosition(Vector2.Transform(new Vector2(-0.5f, 0.5f), rotation)),
+            ScalePosition(Vector2.Transform(new Vector2(0.5f, -0.5f), rotation)));
 
         var dockColor = Color.Magenta;
         var connectionColor = Color.Pink;
diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
index 2f35a8dffd..8bd4a338cb 100644
--- a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
@@ -114,7 +114,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
                 var beaconsOnly = EntManager.TryGetComponent(mapUid, out FTLDestinationComponent? destComp) &&
                                   destComp.BeaconsOnly;
 
-                var mapTransform = Matrix3.CreateInverseTransform(Offset, Angle.Zero);
+                var mapTransform = Matrix3Helpers.CreateInverseTransform(Offset, Angle.Zero);
 
                 if (beaconsOnly && TryGetBeacon(_beacons, mapTransform, args.RelativePixelPosition, PixelRect, out var foundBeacon, out _))
                 {
@@ -203,7 +203,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
     /// </summary>
     /// <param name="mapObjects"></param>
     /// <returns></returns>
-    private List<IMapObject> GetViewportMapObjects(Matrix3 matty, List<IMapObject> mapObjects)
+    private List<IMapObject> GetViewportMapObjects(Matrix3x2 matty, List<IMapObject> mapObjects)
     {
         var results = new List<IMapObject>();
         var enlargement = new Vector2i((int) (16 * UIScale), (int) (16 * UIScale));
@@ -217,7 +217,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
 
             var mapCoords = _shuttles.GetMapCoordinates(mapObj);
 
-            var relativePos = matty.Transform(mapCoords.Position);
+            var relativePos = Vector2.Transform(mapCoords.Position, matty);
             relativePos = relativePos with { Y = -relativePos.Y };
             var uiPosition = ScalePosition(relativePos);
 
@@ -250,7 +250,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
         DrawParallax(handle);
 
         var viewedMapUid = _mapManager.GetMapEntityId(ViewingMap);
-        var matty = Matrix3.CreateInverseTransform(Offset, Angle.Zero);
+        var matty = Matrix3Helpers.CreateInverseTransform(Offset, Angle.Zero);
         var realTime = _timing.RealTime;
         var viewBox = new Box2(Offset - WorldRangeVector, Offset + WorldRangeVector);
         var viewportObjects = GetViewportMapObjects(matty, mapObjects);
@@ -267,7 +267,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
                 var (gridPos, gridRot) = _xformSystem.GetWorldPositionRotation(shuttleXform);
                 gridPos = Maps.GetGridPosition((gridUid, gridPhysics), gridPos, gridRot);
 
-                var gridRelativePos = matty.Transform(gridPos);
+                var gridRelativePos = Vector2.Transform(gridPos, matty);
                 gridRelativePos = gridRelativePos with { Y = -gridRelativePos.Y };
                 var gridUiPos = ScalePosition(gridRelativePos);
 
@@ -296,7 +296,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
                 continue;
             }
 
-            var adjustedPos = matty.Transform(mapCoords.Position);
+            var adjustedPos = Vector2.Transform(mapCoords.Position, matty);
             var localPos = ScalePosition(adjustedPos with { Y = -adjustedPos.Y});
             handle.DrawCircle(localPos, exclusion.Range * MinimapScale, exclusionColor.WithAlpha(0.05f));
             handle.DrawCircle(localPos, exclusion.Range * MinimapScale, exclusionColor, filled: false);
@@ -319,7 +319,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
 
             foreach (var (beaconName, coords, mapO) in GetBeacons(viewportObjects, matty, controlLocalBounds))
             {
-                var localPos = matty.Transform(coords.Position);
+                var localPos = Vector2.Transform(coords.Position, matty);
                 localPos = localPos with { Y = -localPos.Y };
                 var beaconUiPos = ScalePosition(localPos);
                 var mapObject = GetMapObject(localPos, Angle.Zero, scale: 0.75f, scalePosition: true);
@@ -360,7 +360,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
             var (gridPos, gridRot) = _xformSystem.GetWorldPositionRotation(grid.Owner);
             gridPos = Maps.GetGridPosition((grid, gridPhysics), gridPos, gridRot);
 
-            var gridRelativePos = matty.Transform(gridPos);
+            var gridRelativePos = Vector2.Transform(gridPos, matty);
             gridRelativePos = gridRelativePos with { Y = -gridRelativePos.Y };
             var gridUiPos = ScalePosition(gridRelativePos);
 
@@ -439,7 +439,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
 
                     var color = ftlFree ? Color.LimeGreen : Color.Magenta;
 
-                    var gridRelativePos = matty.Transform(gridPos);
+                    var gridRelativePos = Vector2.Transform(gridPos, matty);
                     gridRelativePos = gridRelativePos with { Y = -gridRelativePos.Y };
                     var gridUiPos = ScalePosition(gridRelativePos);
 
@@ -512,7 +512,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
     /// <summary>
     /// Returns the beacons that intersect the viewport.
     /// </summary>
-    private IEnumerable<(string Beacon, MapCoordinates Coordinates, IMapObject MapObject)> GetBeacons(List<IMapObject> mapObjs, Matrix3 mapTransform, UIBox2i area)
+    private IEnumerable<(string Beacon, MapCoordinates Coordinates, IMapObject MapObject)> GetBeacons(List<IMapObject> mapObjs, Matrix3x2 mapTransform, UIBox2i area)
     {
         foreach (var mapO in mapObjs)
         {
@@ -520,7 +520,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
                 continue;
 
             var beaconCoords = EntManager.GetCoordinates(beacon.Coordinates).ToMap(EntManager, _xformSystem);
-            var position = mapTransform.Transform(beaconCoords.Position);
+            var position = Vector2.Transform(beaconCoords.Position, mapTransform);
             var localPos = ScalePosition(position with {Y = -position.Y});
 
             // If beacon not on screen then ignore it.
@@ -557,7 +557,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
         return mapObj;
     }
 
-    private bool TryGetBeacon(IEnumerable<IMapObject> mapObjects, Matrix3 mapTransform, Vector2 mousePos, UIBox2i area, out ShuttleBeaconObject foundBeacon, out Vector2 foundLocalPos)
+    private bool TryGetBeacon(IEnumerable<IMapObject> mapObjects, Matrix3x2 mapTransform, Vector2 mousePos, UIBox2i area, out ShuttleBeaconObject foundBeacon, out Vector2 foundLocalPos)
     {
         // In pixels
         const float BeaconSnapRange = 32f;
@@ -579,7 +579,7 @@ public sealed partial class ShuttleMapControl : BaseShuttleControl
             if (!_shuttles.CanFTLBeacon(beaconObj.Coordinates))
                 continue;
 
-            var position = mapTransform.Transform(beaconCoords.Position);
+            var position = Vector2.Transform(beaconCoords.Position, mapTransform);
             var localPos = ScalePosition(position with {Y = -position.Y});
 
             // If beacon not on screen then ignore it.
diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
index 00ee6890b2..0b8720add2 100644
--- a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -137,10 +137,10 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
 
         var mapPos = _transform.ToMapCoordinates(_coordinates.Value);
         var offset = _coordinates.Value.Position;
-        var posMatrix = Matrix3.CreateTransform(offset, _rotation.Value);
+        var posMatrix = Matrix3Helpers.CreateTransform(offset, _rotation.Value);
         var (_, ourEntRot, ourEntMatrix) = _transform.GetWorldPositionRotationMatrix(_coordinates.Value.EntityId);
-        Matrix3.Multiply(posMatrix, ourEntMatrix, out var ourWorldMatrix);
-        var ourWorldMatrixInvert = ourWorldMatrix.Invert();
+        var ourWorldMatrix = Matrix3x2.Multiply(posMatrix, ourEntMatrix);
+        Matrix3x2.Invert(ourWorldMatrix, out var ourWorldMatrixInvert);
 
         // Draw our grid in detail
         var ourGridId = xform.GridUid;
@@ -148,7 +148,7 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
             fixturesQuery.HasComponent(ourGridId.Value))
         {
             var ourGridMatrix = _transform.GetWorldMatrix(ourGridId.Value);
-            Matrix3.Multiply(in ourGridMatrix, in ourWorldMatrixInvert, out var matrix);
+            var matrix = Matrix3x2.Multiply(ourGridMatrix, ourWorldMatrixInvert);
             var color = _shuttles.GetIFFColor(ourGridId.Value, self: true);
 
             DrawGrid(handle, matrix, (ourGridId.Value, ourGrid), color);
@@ -194,7 +194,7 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
                 continue;
 
             var gridMatrix = _transform.GetWorldMatrix(gUid);
-            Matrix3.Multiply(in gridMatrix, in ourWorldMatrixInvert, out var matty);
+            var matty = Matrix3x2.Multiply(gridMatrix, ourWorldMatrixInvert);
             var color = _shuttles.GetIFFColor(grid, self: false, iff);
 
             // Others default:
@@ -207,7 +207,7 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
             {
                 var gridBounds = grid.Comp.LocalAABB;
 
-                var gridCentre = matty.Transform(gridBody.LocalCenter);
+                var gridCentre = Vector2.Transform(gridBody.LocalCenter, matty);
                 gridCentre.Y = -gridCentre.Y;
                 var distance = gridCentre.Length();
                 var labelText = Loc.GetString("shuttle-console-iff-label", ("name", labelName),
@@ -242,7 +242,7 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
         }
     }
 
-    private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3 matrix)
+    private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3x2 matrix)
     {
         if (!ShowDocks)
             return;
@@ -255,7 +255,7 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
             foreach (var state in docks)
             {
                 var position = state.Coordinates.Position;
-                var uiPosition = matrix.Transform(position);
+                var uiPosition = Vector2.Transform(position, matrix);
 
                 if (uiPosition.Length() > (WorldRange * 2f) - DockScale)
                     continue;
@@ -264,10 +264,10 @@ public sealed partial class ShuttleNavControl : BaseShuttleControl
 
                 var verts = new[]
                 {
-                    matrix.Transform(position + new Vector2(-DockScale, -DockScale)),
-                    matrix.Transform(position + new Vector2(DockScale, -DockScale)),
-                    matrix.Transform(position + new Vector2(DockScale, DockScale)),
-                    matrix.Transform(position + new Vector2(-DockScale, DockScale)),
+                    Vector2.Transform(position + new Vector2(-DockScale, -DockScale), matrix),
+                    Vector2.Transform(position + new Vector2(DockScale, -DockScale), matrix),
+                    Vector2.Transform(position + new Vector2(DockScale, DockScale), matrix),
+                    Vector2.Transform(position + new Vector2(-DockScale, DockScale), matrix),
                 };
 
                 for (var i = 0; i < verts.Length; i++)
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index 56107cbc02..f1473bda7a 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -39,8 +39,8 @@ public sealed class StatusIconOverlay : Overlay
         var eyeRot = args.Viewport.Eye?.Rotation ?? default;
 
         var xformQuery = _entity.GetEntityQuery<TransformComponent>();
-        var scaleMatrix = Matrix3.CreateScale(new Vector2(1, 1));
-        var rotationMatrix = Matrix3.CreateRotation(-eyeRot);
+        var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(1, 1));
+        var rotationMatrix = Matrix3Helpers.CreateRotation(-eyeRot);
 
         var query = _entity.AllEntityQueryEnumerator<StatusIconComponent, SpriteComponent, TransformComponent, MetaDataComponent>();
         while (query.MoveNext(out var uid, out var comp, out var sprite, out var xform, out var meta))
@@ -59,9 +59,9 @@ public sealed class StatusIconOverlay : Overlay
             if (icons.Count == 0)
                 continue;
 
-            var worldMatrix = Matrix3.CreateTranslation(worldPos);
-            Matrix3.Multiply(scaleMatrix, worldMatrix, out var scaledWorld);
-            Matrix3.Multiply(rotationMatrix, scaledWorld, out var matty);
+            var worldMatrix = Matrix3Helpers.CreateTranslation(worldPos);
+            var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
+            var matty = Matrix3x2.Multiply(rotationMatrix, scaledWorld);
             handle.SetTransform(matty);
 
             var countL = 0;
diff --git a/Content.Client/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs
index 8bf0dcd981..b80a855f98 100644
--- a/Content.Client/Storage/Systems/StorageSystem.cs
+++ b/Content.Client/Storage/Systems/StorageSystem.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Linq;
+using System.Numerics;
 using Content.Client.Animations;
 using Content.Shared.Hands;
 using Content.Shared.Storage;
@@ -149,7 +150,7 @@ public sealed class StorageSystem : SharedStorageSystem
         }
 
         var finalMapPos = finalCoords.ToMapPos(EntityManager, TransformSystem);
-        var finalPos = TransformSystem.GetInvWorldMatrix(initialCoords.EntityId).Transform(finalMapPos);
+        var finalPos = Vector2.Transform(finalMapPos, TransformSystem.GetInvWorldMatrix(initialCoords.EntityId));
 
         _entityPickupAnimation.AnimateEntityPickup(item, initialCoords, finalPos, initialAngle);
     }
diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
index 88ad0e3de8..0010aedd96 100644
--- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs
+++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Store;
 using JetBrains.Annotations;
 using System.Linq;
+using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Store.Ui;
@@ -13,9 +14,6 @@ public sealed class StoreBoundUserInterface : BoundUserInterface
     [ViewVariables]
     private StoreMenu? _menu;
 
-    [ViewVariables]
-    private string _windowName = Loc.GetString("store-ui-default-title");
-
     [ViewVariables]
     private string _search = string.Empty;
 
@@ -28,7 +26,9 @@ public sealed class StoreBoundUserInterface : BoundUserInterface
 
     protected override void Open()
     {
-        _menu = new StoreMenu(_windowName);
+        _menu = new StoreMenu();
+        if (EntMan.TryGetComponent<StoreComponent>(Owner, out var store))
+            _menu.Title = Loc.GetString(store.Name);
 
         _menu.OpenCentered();
         _menu.OnClose += Close;
@@ -64,25 +64,15 @@ public sealed class StoreBoundUserInterface : BoundUserInterface
     {
         base.UpdateState(state);
 
-        if (_menu == null)
-            return;
-
         switch (state)
         {
             case StoreUpdateState msg:
                 _listings = msg.Listings;
 
-                _menu.UpdateBalance(msg.Balance);
+                _menu?.UpdateBalance(msg.Balance);
                 UpdateListingsWithSearchFilter();
-                _menu.SetFooterVisibility(msg.ShowFooter);
-                _menu.UpdateRefund(msg.AllowRefund);
-                break;
-            case StoreInitializeState msg:
-                _windowName = msg.Name;
-                if (_menu != null && _menu.Window != null)
-                {
-                    _menu.Window.Title = msg.Name;
-                }
+                _menu?.SetFooterVisibility(msg.ShowFooter);
+                _menu?.UpdateRefund(msg.AllowRefund);
                 break;
         }
     }
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs
index b7a2c285fe..388b31291c 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml.cs
+++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -32,7 +32,7 @@ public sealed partial class StoreMenu : DefaultWindow
 
     private List<ListingData> _cachedListings = new();
 
-    public StoreMenu(string name)
+    public StoreMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
@@ -40,9 +40,6 @@ public sealed partial class StoreMenu : DefaultWindow
         WithdrawButton.OnButtonDown += OnWithdrawButtonDown;
         RefundButton.OnButtonDown += OnRefundButtonDown;
         SearchBar.OnTextChanged += _ => SearchTextUpdated?.Invoke(this, SearchBar.Text);
-
-        if (Window != null)
-            Window.Title = name;
     }
 
     public void UpdateBalance(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> balance)
diff --git a/Content.Client/UserInterface/Controls/DirectionIcon.cs b/Content.Client/UserInterface/Controls/DirectionIcon.cs
index a6cc428091..c8fd63b43c 100644
--- a/Content.Client/UserInterface/Controls/DirectionIcon.cs
+++ b/Content.Client/UserInterface/Controls/DirectionIcon.cs
@@ -65,7 +65,7 @@ public sealed class DirectionIcon : TextureRect
         if (_rotation != null)
         {
             var offset = (-_rotation.Value).RotateVec(Size * UIScale / 2) - Size * UIScale / 2;
-            handle.SetTransform(Matrix3.CreateTransform(GlobalPixelPosition - offset, -_rotation.Value));
+            handle.SetTransform(Matrix3Helpers.CreateTransform(GlobalPixelPosition - offset, -_rotation.Value));
         }
 
         base.Draw(handle);
diff --git a/Content.Client/UserInterface/Controls/ListContainer.cs b/Content.Client/UserInterface/Controls/ListContainer.cs
index 05ae0a4bb1..e1b3b948f0 100644
--- a/Content.Client/UserInterface/Controls/ListContainer.cs
+++ b/Content.Client/UserInterface/Controls/ListContainer.cs
@@ -8,7 +8,8 @@ using Robust.Shared.Map;
 
 namespace Content.Client.UserInterface.Controls;
 
-public sealed class ListContainer : Control
+[Virtual]
+public class ListContainer : Control
 {
     public const string StylePropertySeparation = "separation";
     public const string StyleClassListContainerButton = "list-container-button";
@@ -21,9 +22,26 @@ public sealed class ListContainer : Control
         set => _buttonGroup = value ? new ButtonGroup() : null;
     }
     public bool Toggle { get; set; }
+
+    /// <summary>
+    /// Called when creating a button on the UI.
+    /// The provided <see cref="ListContainerButton"/> is the generated button that Controls should be parented to.
+    /// </summary>
     public Action<ListData, ListContainerButton>? GenerateItem;
-    public Action<BaseButton.ButtonEventArgs?, ListData?>? ItemPressed;
-    public Action<GUIBoundKeyEventArgs, ListData?>? ItemKeyBindDown;
+
+    /// <inheritdoc cref="BaseButton.OnPressed"/>
+    public Action<BaseButton.ButtonEventArgs, ListData>? ItemPressed;
+
+    /// <summary>
+    /// Invoked when a KeyBind is pressed on a ListContainerButton.
+    /// </summary>
+    public Action<GUIBoundKeyEventArgs, ListData>? ItemKeyBindDown;
+
+    /// <summary>
+    /// Invoked when the selected item does not exist in the new data when PopulateList is called.
+    /// </summary>
+    public Action? NoItemSelected;
+
     public IReadOnlyList<ListData> Data => _data;
 
     private const int DefaultSeparation = 3;
@@ -72,11 +90,11 @@ public sealed class ListContainer : Control
         _vScrollBar.OnValueChanged += ScrollValueChanged;
     }
 
-    public void PopulateList(IReadOnlyList<ListData> data)
+    public virtual void PopulateList(IReadOnlyList<ListData> data)
     {
         if ((_itemHeight == 0 || _data is {Count: 0}) && data.Count > 0)
         {
-            ListContainerButton control = new(data[0]);
+            ListContainerButton control = new(data[0], 0);
             GenerateItem?.Invoke(data[0], control);
             control.Measure(Vector2Helpers.Infinity);
             _itemHeight = control.DesiredSize.Y;
@@ -97,7 +115,7 @@ public sealed class ListContainer : Control
         if (_selected != null && !data.Contains(_selected))
         {
             _selected = null;
-            ItemPressed?.Invoke(null, null);
+            NoItemSelected?.Invoke();
         }
     }
 
@@ -116,7 +134,7 @@ public sealed class ListContainer : Control
         if (_buttons.TryGetValue(data, out var button) && Toggle)
             button.Pressed = true;
         _selected = data;
-        button ??= new ListContainerButton(data);
+        button ??= new ListContainerButton(data, _data.IndexOf(data));
         OnItemPressed(new BaseButton.ButtonEventArgs(button,
             new GUIBoundKeyEventArgs(EngineKeyFunctions.UIClick, BoundKeyState.Up,
                 new ScreenCoordinates(0, 0, WindowId.Main), true, Vector2.Zero, Vector2.Zero)));
@@ -260,7 +278,7 @@ public sealed class ListContainer : Control
                         toRemove.Remove(data);
                     else
                     {
-                        button = new ListContainerButton(data);
+                        button = new ListContainerButton(data, i);
                         button.OnPressed += OnItemPressed;
                         button.OnKeyBindDown += args => OnItemKeyBindDown(button, args);
                         button.ToggleMode = Toggle;
@@ -360,11 +378,14 @@ public sealed class ListContainer : Control
 public sealed class ListContainerButton : ContainerButton, IEntityControl
 {
     public readonly ListData Data;
+
+    public readonly int Index;
     // public PanelContainer Background;
 
-    public ListContainerButton(ListData data)
+    public ListContainerButton(ListData data, int index)
     {
         Data = data;
+        Index = index;
         // AddChild(Background = new PanelContainer
         // {
         //     HorizontalExpand = true,
diff --git a/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
index f6b0929f3b..a10155f3e8 100644
--- a/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
+++ b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
@@ -169,7 +169,7 @@ public partial class MapGridControl : LayoutContainer
         var inversePos = (value - MidPointVector) / MinimapScale;
 
         inversePos = inversePos with { Y = -inversePos.Y };
-        inversePos = Matrix3.CreateTransform(Offset, Angle.Zero).Transform(inversePos);
+        inversePos = Vector2.Transform(inversePos, Matrix3Helpers.CreateTransform(Offset, Angle.Zero));
         return inversePos;
     }
 
diff --git a/Content.Client/UserInterface/Controls/SearchListContainer.cs b/Content.Client/UserInterface/Controls/SearchListContainer.cs
new file mode 100644
index 0000000000..603d7f184c
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/SearchListContainer.cs
@@ -0,0 +1,68 @@
+using System.Linq;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.UserInterface.Controls;
+
+public sealed class SearchListContainer : ListContainer
+{
+    private LineEdit? _searchBar;
+    private List<ListData> _unfilteredData = new();
+
+    /// <summary>
+    /// The <see cref="LineEdit"/> that is used to filter the list data.
+    /// </summary>
+    public LineEdit? SearchBar
+    {
+        get => _searchBar;
+        set
+        {
+            if (_searchBar is not null)
+                _searchBar.OnTextChanged -= FilterList;
+
+            _searchBar = value;
+
+            if (_searchBar is null)
+                return;
+
+            _searchBar.OnTextChanged += FilterList;
+        }
+    }
+
+    /// <summary>
+    /// Runs over the ListData to determine if it should pass the filter.
+    /// </summary>
+    public Func<string, ListData, bool>? DataFilterCondition = null;
+
+    public override void PopulateList(IReadOnlyList<ListData> data)
+    {
+        _unfilteredData = data.ToList();
+        FilterList();
+    }
+
+    private void FilterList(LineEdit.LineEditEventArgs obj)
+    {
+        FilterList();
+    }
+
+    private void FilterList()
+    {
+        var filterText = SearchBar?.Text;
+
+        if (DataFilterCondition is null || string.IsNullOrEmpty(filterText))
+        {
+            base.PopulateList(_unfilteredData);
+            return;
+        }
+
+        var filteredData = new List<ListData>();
+        foreach (var data in _unfilteredData)
+        {
+            if (!DataFilterCondition(filterText, data))
+                continue;
+
+            filteredData.Add(data);
+        }
+
+        base.PopulateList(filteredData);
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/TableContainer.cs b/Content.Client/UserInterface/Controls/TableContainer.cs
new file mode 100644
index 0000000000..3e8d476001
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/TableContainer.cs
@@ -0,0 +1,285 @@
+using System.Numerics;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.UserInterface.Controls;
+
+// This control is not part of engine because I quickly wrote it in 2 hours at 2 AM and don't want to deal with
+// API stabilization and/or figuring out relation to GridContainer.
+// Grid layout is a complicated problem and I don't want to commit another half-baked thing into the engine.
+// It's probably sufficient for its use case (RichTextLabel tables for rules/guidebook).
+// Despite that, it's still better comment the shit half of you write on a regular basis.
+//
+// EMO: thank you PJB i was going to kill myself.
+
+/// <summary>
+/// Displays children in a tabular grid. Unlike <see cref="GridContainer"/>,
+/// properly handles layout constraints so putting word-wrapping <see cref="RichTextLabel"/> in it should work.
+/// </summary>
+/// <remarks>
+/// All children are automatically laid out in <see cref="Columns"/> columns.
+/// The first control is in the top left, laid out per row from there.
+/// </remarks>
+[Virtual]
+public class TableContainer : Container
+{
+    private int _columns = 1;
+
+    /// <summary>
+    /// The absolute minimum width a column can be forced to.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// If a column *asks* for less width than this (small contents), it can still be smaller.
+    /// But if it asks for more it cannot go below this width.
+    /// </para>
+    /// </remarks>
+    public float MinForcedColumnWidth { get; set; } = 50;
+
+    // Scratch space used while calculating layout, cached to avoid regular allocations during layout pass.
+    private ColumnData[] _columnDataCache = [];
+    private RowData[] _rowDataCache = [];
+
+    /// <summary>
+    /// How many columns should be displayed.
+    /// </summary>
+    public int Columns
+    {
+        get => _columns;
+        set
+        {
+            ArgumentOutOfRangeException.ThrowIfLessThan(value, 1, nameof(value));
+
+            _columns = value;
+        }
+    }
+
+    protected override Vector2 MeasureOverride(Vector2 availableSize)
+    {
+        ResetCachedArrays();
+
+        // Do a first pass measuring all child controls as if they're given infinite space.
+        // This gives us a maximum width the columns want, which we use to proportion them later.
+        var columnIdx = 0;
+        foreach (var child in Children)
+        {
+            ref var column = ref _columnDataCache[columnIdx];
+
+            child.Measure(new Vector2(float.PositiveInfinity, float.PositiveInfinity));
+            column.MaxWidth = Math.Max(column.MaxWidth, child.DesiredSize.X);
+
+            columnIdx += 1;
+            if (columnIdx == _columns)
+                columnIdx = 0;
+        }
+
+        // Calculate Slack and MinWidth for all columns. Also calculate sums for all columns.
+        var totalMinWidth = 0f;
+        var totalMaxWidth = 0f;
+        var totalSlack = 0f;
+
+        for (var c = 0; c < _columns; c++)
+        {
+            ref var column = ref _columnDataCache[c];
+            column.MinWidth = Math.Min(column.MaxWidth, MinForcedColumnWidth);
+            column.Slack = column.MaxWidth - column.MinWidth;
+
+            totalMinWidth += column.MinWidth;
+            totalMaxWidth += column.MaxWidth;
+            totalSlack += column.Slack;
+        }
+
+        if (totalMaxWidth <= availableSize.X)
+        {
+            // We want less horizontal space than we're given. Huh, that's convenient.
+            // Just set assigned width to be however much they asked for.
+            // We could probably skip the second measure pass in this scenario,
+            // but that's just an optimization, so I don't care right now.
+            //
+            // There's probably a very clever way to make this behavior work with the else block of logic,
+            // just by fiddling with the math.
+            // I'm dumb, it's 4:30 AM. Yeah, I *started* at 2 AM.
+            for (var c = 0; c < _columns; c++)
+            {
+                ref var column = ref _columnDataCache[c];
+
+                column.AssignedWidth = column.MaxWidth;
+            }
+        }
+        else
+        {
+            // We don't have enough horizontal space,
+            // at least without causing *some* sort of word wrapping (assuming text contents).
+            //
+            // Assign horizontal space proportional to the wanted maximum size of the columns.
+            var assignableWidth =  Math.Max(0, availableSize.X - totalMinWidth);
+            for (var c = 0; c < _columns; c++)
+            {
+                ref var column = ref _columnDataCache[c];
+
+                var slackRatio = column.Slack / totalSlack;
+                column.AssignedWidth = column.MinWidth + slackRatio * assignableWidth;
+            }
+        }
+
+        // Go over controls for a second measuring pass, this time giving them their assigned measure width.
+        // This will give us a height to slot into per-row data.
+        // We still measure assuming infinite vertical space.
+        // This control can't properly handle being constrained on the Y axis.
+        columnIdx = 0;
+        var rowIdx = 0;
+        foreach (var child in Children)
+        {
+            ref var column = ref _columnDataCache[columnIdx];
+            ref var row = ref _rowDataCache[rowIdx];
+
+            child.Measure(new Vector2(column.AssignedWidth, float.PositiveInfinity));
+            row.MeasuredHeight = Math.Max(row.MeasuredHeight, child.DesiredSize.Y);
+
+            columnIdx += 1;
+            if (columnIdx == _columns)
+            {
+                columnIdx = 0;
+                rowIdx += 1;
+            }
+        }
+
+        // Sum up height of all rows to get final measured table height.
+        var totalHeight = 0f;
+        for (var r = 0; r < _rowDataCache.Length; r++)
+        {
+            ref var row = ref _rowDataCache[r];
+            totalHeight += row.MeasuredHeight;
+        }
+
+        return new Vector2(Math.Min(availableSize.X, totalMaxWidth), totalHeight);
+    }
+
+    protected override Vector2 ArrangeOverride(Vector2 finalSize)
+    {
+        // TODO: Expand to fit given vertical space.
+
+        // Calculate MinWidth and Slack sums again from column data.
+        // We could've cached these from measure but whatever.
+        var totalMinWidth = 0f;
+        var totalSlack = 0f;
+
+        for (var c = 0; c < _columns; c++)
+        {
+            ref var column = ref _columnDataCache[c];
+            totalMinWidth += column.MinWidth;
+            totalSlack += column.Slack;
+        }
+
+        // Calculate new width based on final given size, also assign horizontal positions of all columns.
+        var assignableWidth = Math.Max(0, finalSize.X - totalMinWidth);
+        var xPos = 0f;
+        for (var c = 0; c < _columns; c++)
+        {
+            ref var column = ref _columnDataCache[c];
+
+            var slackRatio = column.Slack / totalSlack;
+            column.ArrangedWidth = column.MinWidth + slackRatio * assignableWidth;
+            column.ArrangedX = xPos;
+
+            xPos += column.ArrangedWidth;
+        }
+
+        // Do actual arrangement row-by-row.
+        var arrangeY = 0f;
+        for (var r = 0; r < _rowDataCache.Length; r++)
+        {
+            ref var row = ref _rowDataCache[r];
+
+            for (var c = 0; c < _columns; c++)
+            {
+                ref var column = ref _columnDataCache[c];
+                var index = c + r * _columns;
+
+                if (index >= ChildCount) // Quit early if we don't actually fill out the row.
+                    break;
+                var child = GetChild(c + r * _columns);
+
+                child.Arrange(UIBox2.FromDimensions(column.ArrangedX, arrangeY, column.ArrangedWidth, row.MeasuredHeight));
+            }
+
+            arrangeY += row.MeasuredHeight;
+        }
+
+        return finalSize with { Y = arrangeY };
+    }
+
+    /// <summary>
+    /// Ensure cached array space is allocated to correct size and is reset to a clean slate.
+    /// </summary>
+    private void ResetCachedArrays()
+    {
+        // 1-argument Array.Clear() is not currently available in sandbox (added in .NET 6).
+
+        if (_columnDataCache.Length != _columns)
+            _columnDataCache = new ColumnData[_columns];
+
+        Array.Clear(_columnDataCache, 0, _columnDataCache.Length);
+
+        var rowCount = ChildCount / _columns;
+        if (ChildCount % _columns != 0)
+            rowCount += 1;
+
+        if (rowCount != _rowDataCache.Length)
+            _rowDataCache = new RowData[rowCount];
+
+        Array.Clear(_rowDataCache, 0, _rowDataCache.Length);
+    }
+
+    /// <summary>
+    /// Per-column data used during layout.
+    /// </summary>
+    private struct ColumnData
+    {
+        // Measure data.
+
+        /// <summary>
+        /// The maximum width any control in this column wants, if given infinite space.
+        /// Maximum of all controls on the column.
+        /// </summary>
+        public float MaxWidth;
+
+        /// <summary>
+        /// The minimum width this column may be given.
+        /// This is either <see cref="MaxWidth"/> or <see cref="TableContainer.MinForcedColumnWidth"/>.
+        /// </summary>
+        public float MinWidth;
+
+        /// <summary>
+        /// Difference between max and min width; how much this column can expand from its minimum.
+        /// </summary>
+        public float Slack;
+
+        /// <summary>
+        /// How much horizontal space this column was assigned at measure time.
+        /// </summary>
+        public float AssignedWidth;
+
+        // Arrange data.
+
+        /// <summary>
+        /// How much horizontal space this column was assigned at arrange time.
+        /// </summary>
+        public float ArrangedWidth;
+
+        /// <summary>
+        /// The horizontal position this column was assigned at arrange time.
+        /// </summary>
+        public float ArrangedX;
+    }
+
+    private struct RowData
+    {
+        // Measure data.
+
+        /// <summary>
+        /// How much height the tallest control on this row was measured at,
+        /// measuring for infinite vertical space but assigned column width.
+        /// </summary>
+        public float MeasuredHeight;
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
index cccd9201a2..a7397aff38 100644
--- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
+++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
@@ -177,12 +177,15 @@ public sealed class AdminUIController : UIController,
         }
     }
 
-    private void PlayerTabEntryKeyBindDown(PlayerTabEntry entry, GUIBoundKeyEventArgs args)
+    private void PlayerTabEntryKeyBindDown(GUIBoundKeyEventArgs args, ListData? data)
     {
-        if (entry.PlayerEntity == null)
+        if (data is not PlayerListData {Info: var info})
             return;
 
-        var entity = entry.PlayerEntity.Value;
+        if (info.NetEntity == null)
+            return;
+
+        var entity = info.NetEntity.Value;
         var function = args.Function;
 
         if (function == EngineKeyFunctions.UIClick)
diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs
index c3fc8c8356..e9c3f90641 100644
--- a/Content.Client/Verbs/UI/VerbMenuUIController.cs
+++ b/Content.Client/Verbs/UI/VerbMenuUIController.cs
@@ -8,6 +8,7 @@ using Content.Shared.Verbs;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Collections;
 using Robust.Shared.Input;
 using Robust.Shared.Utility;
 
@@ -115,6 +116,13 @@ namespace Content.Client.Verbs.UI
         private void FillVerbPopup(ContextMenuPopup popup)
         {
             HashSet<string> listedCategories = new();
+            var extras = new ValueList<string>(ExtraCategories.Count);
+
+            foreach (var cat in ExtraCategories)
+            {
+                extras.Add(cat.Text);
+            }
+
             foreach (var verb in CurrentVerbs)
             {
                 if (verb.Category == null)
@@ -122,17 +130,15 @@ namespace Content.Client.Verbs.UI
                     var element = new VerbMenuElement(verb);
                     _context.AddElement(popup, element);
                 }
-                else if (listedCategories.Add(verb.Category.Text))
+                // Add the category if it's not an extra (this is to avoid shuffling if we're filling from server verbs response).
+                else if (!extras.Contains(verb.Category.Text) && listedCategories.Add(verb.Category.Text))
                     AddVerbCategory(verb.Category, popup);
             }
 
-            if (ExtraCategories != null)
+            foreach (var category in ExtraCategories)
             {
-                foreach (var category in ExtraCategories)
-                {
-                    if (listedCategories.Add(category.Text))
-                        AddVerbCategory(category, popup);
-                }
+                if (listedCategories.Add(category.Text))
+                    AddVerbCategory(category, popup);
             }
 
             popup.InvalidateMeasure();
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 2e6c5f5809..5f1f49e5fd 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -123,7 +123,6 @@ namespace Content.Client.Verbs
             if ((visibility & MenuVisibility.Invisible) == 0)
             {
                 var spriteQuery = GetEntityQuery<SpriteComponent>();
-                var tagQuery = GetEntityQuery<TagComponent>();
 
                 for (var i = entities.Count - 1; i >= 0; i--)
                 {
@@ -131,7 +130,7 @@ namespace Content.Client.Verbs
 
                     if (!spriteQuery.TryGetComponent(entity, out var spriteComponent) ||
                         !spriteComponent.Visible ||
-                        _tagSystem.HasTag(entity, "HideContextMenu", tagQuery))
+                        _tagSystem.HasTag(entity, "HideContextMenu"))
                     {
                         entities.RemoveSwap(i);
                     }
diff --git a/Content.Client/Viewport/ScalingViewport.cs b/Content.Client/Viewport/ScalingViewport.cs
index 1fa8f17161..ccd9636d77 100644
--- a/Content.Client/Viewport/ScalingViewport.cs
+++ b/Content.Client/Viewport/ScalingViewport.cs
@@ -277,8 +277,8 @@ namespace Content.Client.Viewport
 
             EnsureViewportCreated();
 
-            var matrix = Matrix3.Invert(GetLocalToScreenMatrix());
-            coords = matrix.Transform(coords);
+            Matrix3x2.Invert(GetLocalToScreenMatrix(), out var matrix);
+            coords = Vector2.Transform(coords, matrix);
 
             return _viewport!.LocalToWorld(coords);
         }
@@ -291,8 +291,8 @@ namespace Content.Client.Viewport
 
             EnsureViewportCreated();
 
-            var matrix = Matrix3.Invert(GetLocalToScreenMatrix());
-            coords = matrix.Transform(coords);
+            Matrix3x2.Invert(GetLocalToScreenMatrix(), out var matrix);
+            coords = Vector2.Transform(coords, matrix);
 
             var ev = new PixelToMapEvent(coords, this, _viewport!);
             _entityManager.EventBus.RaiseEvent(EventSource.Local, ref ev);
@@ -311,16 +311,16 @@ namespace Content.Client.Viewport
 
             var matrix = GetLocalToScreenMatrix();
 
-            return matrix.Transform(vpLocal);
+            return Vector2.Transform(vpLocal, matrix);
         }
 
-        public Matrix3 GetWorldToScreenMatrix()
+        public Matrix3x2 GetWorldToScreenMatrix()
         {
             EnsureViewportCreated();
             return _viewport!.GetWorldToLocalMatrix() * GetLocalToScreenMatrix();
         }
 
-        public Matrix3 GetLocalToScreenMatrix()
+        public Matrix3x2 GetLocalToScreenMatrix()
         {
             EnsureViewportCreated();
 
@@ -329,9 +329,9 @@ namespace Content.Client.Viewport
 
             if (scaleFactor.X == 0 || scaleFactor.Y == 0)
                 // Basically a nonsense scenario, at least make sure to return something that can be inverted.
-                return Matrix3.Identity;
+                return Matrix3x2.Identity;
 
-            return Matrix3.CreateTransform(GlobalPixelPosition + drawBox.TopLeft, 0, scaleFactor);
+            return Matrix3Helpers.CreateTransform(GlobalPixelPosition + drawBox.TopLeft, 0, scaleFactor);
         }
 
         private void EnsureViewportCreated()
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
index 445859666d..82c99d681f 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
@@ -87,7 +87,7 @@ public sealed partial class MeleeWeaponSystem
             case WeaponArcAnimation.None:
                 var (mapPos, mapRot) = TransformSystem.GetWorldPositionRotation(userXform);
                 var worldPos = mapPos + (mapRot - userXform.LocalRotation).RotateVec(localPos);
-                var newLocalPos = TransformSystem.GetInvWorldMatrix(xform.ParentUid).Transform(worldPos);
+                var newLocalPos = Vector2.Transform(worldPos, TransformSystem.GetInvWorldMatrix(xform.ParentUid));
                 TransformSystem.SetLocalPositionNoLerp(animationUid, newLocalPos, xform);
                 if (arcComponent.Fadeout)
                     _animation.Play(animationUid, GetFadeAnimation(sprite, 0f, 0.15f), FadeAnimationKey);
diff --git a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
index 8aea5d7ee6..e6cb596b94 100644
--- a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
+++ b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.Resources;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -53,7 +53,7 @@ public abstract class BaseBulletRenderer : Control
     {
         // Scale rendering in this control by UIScale.
         var currentTransform = handle.GetTransform();
-        handle.SetTransform(Matrix3.CreateScale(new Vector2(UIScale)) * currentTransform);
+        handle.SetTransform(Matrix3Helpers.CreateScale(new Vector2(UIScale)) * currentTransform);
 
         var countPerRow = CountPerRow(Size.X);
 
diff --git a/Content.IntegrationTests/Pair/TestPair.Cvars.cs b/Content.IntegrationTests/Pair/TestPair.Cvars.cs
new file mode 100644
index 0000000000..81df31fc9a
--- /dev/null
+++ b/Content.IntegrationTests/Pair/TestPair.Cvars.cs
@@ -0,0 +1,69 @@
+#nullable enable
+using System.Collections.Generic;
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Pair;
+
+public sealed partial class TestPair
+{
+    private readonly Dictionary<string, object> _modifiedClientCvars = new();
+    private readonly Dictionary<string, object> _modifiedServerCvars = new();
+
+    private void OnServerCvarChanged(CVarChangeInfo args)
+    {
+        _modifiedServerCvars.TryAdd(args.Name, args.OldValue);
+    }
+
+    private void OnClientCvarChanged(CVarChangeInfo args)
+    {
+        _modifiedClientCvars.TryAdd(args.Name, args.OldValue);
+    }
+
+    internal void ClearModifiedCvars()
+    {
+        _modifiedClientCvars.Clear();
+        _modifiedServerCvars.Clear();
+    }
+
+    /// <summary>
+    /// Reverts any cvars that were modified during a test back to their original values.
+    /// </summary>
+    public async Task RevertModifiedCvars()
+    {
+        await Server.WaitPost(() =>
+        {
+            foreach (var (name, value) in _modifiedServerCvars)
+            {
+                if (Server.CfgMan.GetCVar(name).Equals(value))
+                    continue;
+                Server.Log.Info($"Resetting cvar {name} to {value}");
+                Server.CfgMan.SetCVar(name, value);
+            }
+
+            // I just love order dependent cvars
+            if (_modifiedServerCvars.TryGetValue(CCVars.PanicBunkerEnabled.Name, out var panik))
+                Server.CfgMan.SetCVar(CCVars.PanicBunkerEnabled.Name, panik);
+
+        });
+
+        await Client.WaitPost(() =>
+        {
+            foreach (var (name, value) in _modifiedClientCvars)
+            {
+                if (Client.CfgMan.GetCVar(name).Equals(value))
+                    continue;
+
+                var flags = Client.CfgMan.GetCVarFlags(name);
+                if (flags.HasFlag(CVar.REPLICATED) && flags.HasFlag(CVar.SERVER))
+                    continue;
+
+                Client.Log.Info($"Resetting cvar {name} to {value}");
+                Client.CfgMan.SetCVar(name, value);
+            }
+        });
+
+        ClearModifiedCvars();
+    }
+}
diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index c0f4b3b745..8d1e425553 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -40,6 +40,8 @@ public sealed partial class TestPair : IAsyncDisposable
             TestMap = null;
         }
 
+        await RevertModifiedCvars();
+
         var usageTime = Watch.Elapsed;
         Watch.Restart();
         await _testOut.WriteLineAsync($"{nameof(CleanReturnAsync)}: Test borrowed pair {Id} for {usageTime.TotalMilliseconds} ms");
@@ -132,6 +134,7 @@ public sealed partial class TestPair : IAsyncDisposable
         if (gameTicker.RunLevel != GameRunLevel.PreRoundLobby)
         {
             await testOut.WriteLineAsync($"Recycling: {Watch.Elapsed.TotalMilliseconds} ms: Restarting round.");
+            Server.CfgMan.SetCVar(CCVars.GameDummyTicker, false);
             Assert.That(gameTicker.DummyTicker, Is.False);
             Server.CfgMan.SetCVar(CCVars.GameLobbyEnabled, true);
             await Server.WaitPost(() => gameTicker.RestartRound());
diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index 916a94c9c4..7ee5dbd55c 100644
--- a/Content.IntegrationTests/Pair/TestPair.cs
+++ b/Content.IntegrationTests/Pair/TestPair.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using Content.Server.GameTicking;
 using Content.Shared.Players;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
@@ -58,6 +59,9 @@ public sealed partial class TestPair
         (Server, ServerLogHandler) = await PoolManager.GenerateServer(settings, testOut);
         ActivateContext(testOut);
 
+        Client.CfgMan.OnCVarValueChanged += OnClientCvarChanged;
+        Server.CfgMan.OnCVarValueChanged += OnServerCvarChanged;
+
         if (!settings.NoLoadTestPrototypes)
             await LoadPrototypes(testPrototypes!);
 
diff --git a/Content.IntegrationTests/PoolManager.Cvars.cs b/Content.IntegrationTests/PoolManager.Cvars.cs
index aa6b4dffdc..5acd9d502c 100644
--- a/Content.IntegrationTests/PoolManager.Cvars.cs
+++ b/Content.IntegrationTests/PoolManager.Cvars.cs
@@ -21,6 +21,7 @@ public static partial class PoolManager
         (CCVars.NPCMaxUpdates.Name,           "999999"),
         (CVars.ThreadParallelCount.Name,      "1"),
         (CCVars.GameRoleTimers.Name,          "false"),
+        (CCVars.GameRoleWhitelist.Name,       "false"),
         (CCVars.GridFill.Name,                "false"),
         (CCVars.PreloadGrids.Name,            "false"),
         (CCVars.ArrivalsShuttles.Name,        "false"),
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index 3b49ffcf84..21c93ea8ae 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -270,6 +270,8 @@ public static partial class PoolManager
             $"{nameof(GetServerClientPair)}: Retrieving pair {pair.Id} from pool took {poolRetrieveTime.TotalMilliseconds} ms");
         await testOut.WriteLineAsync(
             $"{nameof(GetServerClientPair)}: Returning pair {pair.Id}");
+
+        pair.ClearModifiedCvars();
         pair.Settings = poolSettings;
         pair.TestHistory.Add(currentTestName);
         pair.Watch.Restart();
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index 7c700d9fb8..57ac63b124 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -29,6 +29,7 @@ namespace Content.IntegrationTests.Tests.Buckle
   components:
   - type: Buckle
   - type: Hands
+  - type: ComplexInteraction
   - type: InputMover
   - type: Body
     prototype: Human
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 54af64122b..926374cf05 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -19,6 +19,8 @@ namespace Content.IntegrationTests.Tests
     [TestOf(typeof(EntityUid))]
     public sealed class EntityTest
     {
+        private static readonly ProtoId<EntityCategoryPrototype> SpawnerCategory = "Spawner";
+
         [Test]
         public async Task SpawnAndDeleteAllEntitiesOnDifferentMaps()
         {
@@ -234,14 +236,6 @@ namespace Content.IntegrationTests.Tests
                 "StationEvent",
                 "TimedDespawn",
 
-                // Spawner entities
-                "DragonRift",
-                "RandomHumanoidSpawner",
-                "RandomSpawner",
-                "ConditionalSpawner",
-                "GhostRoleMobSpawner",
-                "NukeOperativeSpawner",
-                "TimedSpawner",
                 // makes an announcement on mapInit.
                 "AnnounceOnSpawn",
             };
@@ -253,6 +247,7 @@ namespace Content.IntegrationTests.Tests
                 .Where(p => !p.Abstract)
                 .Where(p => !pair.IsTestPrototype(p))
                 .Where(p => !excluded.Any(p.Components.ContainsKey))
+                .Where(p => p.Categories.All(x => x.ID != SpawnerCategory))
                 .Select(p => p.ID)
                 .ToList();
 
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
index c6a8e618cc..0ac6b68a3e 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -24,6 +24,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
   components:
   - type: Cuffable
   - type: Hands
+  - type: ComplexInteraction
   - type: Body
     prototype: Human
 
diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
index 3a77834b72..ea19a30005 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -50,7 +50,6 @@ public sealed class NukeOpsTest
         var invSys = server.System<InventorySystem>();
         var factionSys = server.System<NpcFactionSystem>();
 
-        Assert.That(server.CfgMan.GetCVar(CCVars.GridFill), Is.False);
         server.CfgMan.SetCVar(CCVars.GridFill, true);
 
         // Initially in the lobby
@@ -200,7 +199,6 @@ public sealed class NukeOpsTest
         }
 
         ticker.SetGamePreset((GamePresetPrototype?)null);
-        server.CfgMan.SetCVar(CCVars.GridFill, false);
         await pair.SetAntagPref("NukeopsCommander", false);
         await pair.CleanReturnAsync();
     }
diff --git a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
index 4415eddf37..2b844d34f0 100644
--- a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
+++ b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
@@ -4,6 +4,7 @@ using Content.Server.Interaction;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Item;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -64,6 +65,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
             {
                 user = sEntities.SpawnEntity(null, coords);
                 sEntities.EnsureComponent<HandsComponent>(user);
+                sEntities.EnsureComponent<ComplexInteractionComponent>(user);
                 handSys.AddHand(user, "hand", HandLocation.Left);
                 target = sEntities.SpawnEntity(null, coords);
                 item = sEntities.SpawnEntity(null, coords);
@@ -205,6 +207,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
             {
                 user = sEntities.SpawnEntity(null, coords);
                 sEntities.EnsureComponent<HandsComponent>(user);
+                sEntities.EnsureComponent<ComplexInteractionComponent>(user);
                 handSys.AddHand(user, "hand", HandLocation.Left);
                 target = sEntities.SpawnEntity(null, new MapCoordinates(new Vector2(SharedInteractionSystem.InteractionRange - 0.1f, 0), mapId));
                 item = sEntities.SpawnEntity(null, coords);
@@ -347,6 +350,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
             {
                 user = sEntities.SpawnEntity(null, coords);
                 sEntities.EnsureComponent<HandsComponent>(user);
+                sEntities.EnsureComponent<ComplexInteractionComponent>(user);
                 handSys.AddHand(user, "hand", HandLocation.Left);
                 target = sEntities.SpawnEntity(null, coords);
                 item = sEntities.SpawnEntity(null, coords);
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index 42f64b344c..e5f794feaa 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -137,6 +137,7 @@ public abstract partial class InteractionTest
     prototype: Aghost
   - type: DoAfter
   - type: Hands
+  - type: ComplexInteraction
   - type: MindContainer
   - type: Stripping
   - type: Tag
diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index 7f9c02fc13..ed1e554943 100644
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -103,7 +103,7 @@ public sealed class MaterialArbitrageTest
                         continue;
 
                     var stackProto = protoManager.Index<StackPrototype>(materialStep.MaterialPrototypeId);
-                    var spawnProto = protoManager.Index<EntityPrototype>(stackProto.Spawn);
+                    var spawnProto = protoManager.Index(stackProto.Spawn);
 
                     if (!spawnProto.Components.ContainsKey(materialName) ||
                         !spawnProto.Components.TryGetValue(compositionName, out var compositionReg))
diff --git a/Content.IntegrationTests/Tests/Tag/TagTest.cs b/Content.IntegrationTests/Tests/Tag/TagTest.cs
index cbcdd1c6c6..e6cd2accaf 100644
--- a/Content.IntegrationTests/Tests/Tag/TagTest.cs
+++ b/Content.IntegrationTests/Tests/Tag/TagTest.cs
@@ -53,11 +53,13 @@ namespace Content.IntegrationTests.Tests.Tag
 
             EntityUid sTagDummy = default;
             TagComponent sTagComponent = null!;
+            Entity<TagComponent> sTagEntity = default;
 
             await server.WaitPost(() =>
             {
                 sTagDummy = sEntityManager.SpawnEntity(TagEntityId, MapCoordinates.Nullspace);
                 sTagComponent = sEntityManager.GetComponent<TagComponent>(sTagDummy);
+                sTagEntity = new Entity<TagComponent>(sTagDummy, sTagComponent);
             });
 
             await server.WaitAssertion(() =>
@@ -130,49 +132,64 @@ namespace Content.IntegrationTests.Tests.Tag
                 Assert.Multiple(() =>
                 {
                     // Cannot add the starting tag again
-                    Assert.That(tagSystem.AddTag(sTagDummy, sTagComponent, StartingTag), Is.False);
-                    Assert.That(tagSystem.AddTags(sTagDummy, sTagComponent, StartingTag, StartingTag), Is.False);
-                    Assert.That(tagSystem.AddTags(sTagDummy, sTagComponent, new List<string> { StartingTag, StartingTag }), Is.False);
+                    Assert.That(tagSystem.AddTag(sTagEntity, StartingTag), Is.False);
+
+                    Assert.That(tagSystem.AddTags(sTagEntity, StartingTag, StartingTag), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, new List<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.False);
 
                     // Has the starting tag
                     Assert.That(tagSystem.HasTag(sTagComponent, StartingTag), Is.True);
+
                     Assert.That(tagSystem.HasAllTags(sTagComponent, StartingTag, StartingTag), Is.True);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { StartingTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.True);
+
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, StartingTag, StartingTag), Is.True);
-                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<string> { StartingTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, StartingTag }), Is.True);
 
                     // Does not have the added tag yet
                     Assert.That(tagSystem.HasTag(sTagComponent, AddedTag), Is.False);
+
                     Assert.That(tagSystem.HasAllTags(sTagComponent, AddedTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
+
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, AddedTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<string> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
 
                     // Has a combination of the two tags
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, StartingTag, AddedTag), Is.True);
-                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<string> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
 
                     // Does not have both tags
                     Assert.That(tagSystem.HasAllTags(sTagComponent, StartingTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
 
                     // Cannot remove a tag that does not exist
-                    Assert.That(tagSystem.RemoveTag(sTagDummy, sTagComponent, AddedTag), Is.False);
-                    Assert.That(tagSystem.RemoveTags(sTagDummy, sTagComponent, AddedTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.RemoveTags(sTagDummy, sTagComponent, new List<string> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.RemoveTag(sTagEntity, AddedTag), Is.False);
+
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, AddedTag, AddedTag), Is.False);
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, new List<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { AddedTag, AddedTag }), Is.False);
                 });
 
                 // Can add the new tag
-                Assert.That(tagSystem.AddTag(sTagDummy, sTagComponent, AddedTag), Is.True);
+                Assert.That(tagSystem.AddTag(sTagEntity, AddedTag), Is.True);
 
                 Assert.Multiple(() =>
                 {
                     // Cannot add it twice
-                    Assert.That(tagSystem.AddTag(sTagDummy, sTagComponent, AddedTag), Is.False);
+                    Assert.That(tagSystem.AddTag(sTagEntity, AddedTag), Is.False);
 
                     // Cannot add existing tags
-                    Assert.That(tagSystem.AddTags(sTagDummy, sTagComponent, StartingTag, AddedTag), Is.False);
-                    Assert.That(tagSystem.AddTags(sTagDummy, sTagComponent, new List<string> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, StartingTag, AddedTag), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.AddTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
 
                     // Now has two tags
                     Assert.That(sTagComponent.Tags, Has.Count.EqualTo(2));
@@ -180,65 +197,103 @@ namespace Content.IntegrationTests.Tests.Tag
                     // Has both tags
                     Assert.That(tagSystem.HasTag(sTagComponent, StartingTag), Is.True);
                     Assert.That(tagSystem.HasTag(sTagComponent, AddedTag), Is.True);
+
                     Assert.That(tagSystem.HasAllTags(sTagComponent, StartingTag, StartingTag), Is.True);
                     Assert.That(tagSystem.HasAllTags(sTagComponent, AddedTag, StartingTag), Is.True);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { StartingTag, AddedTag }), Is.True);
-                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<string> { AddedTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { AddedTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { AddedTag, StartingTag }), Is.True);
+
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, StartingTag, AddedTag), Is.True);
                     Assert.That(tagSystem.HasAnyTag(sTagComponent, AddedTag, StartingTag), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { AddedTag, StartingTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.True);
+                    Assert.That(tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { AddedTag, StartingTag }), Is.True);
                 });
 
                 Assert.Multiple(() =>
                 {
                     // Remove the existing starting tag
-                    Assert.That(tagSystem.RemoveTag(sTagDummy, sTagComponent, StartingTag), Is.True);
+                    Assert.That(tagSystem.RemoveTag(sTagEntity, StartingTag), Is.True);
 
                     // Remove the existing added tag
-                    Assert.That(tagSystem.RemoveTags(sTagDummy, sTagComponent, AddedTag, AddedTag), Is.True);
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, AddedTag, AddedTag), Is.True);
                 });
 
                 Assert.Multiple(() =>
                 {
                     // No tags left to remove
-                    Assert.That(tagSystem.RemoveTags(sTagDummy, sTagComponent, new List<string> { StartingTag, AddedTag }), Is.False);
+                    Assert.That(tagSystem.RemoveTags(sTagEntity, new List<ProtoId<TagPrototype>> { StartingTag, AddedTag }), Is.False);
 
                     // No tags left in the component
                     Assert.That(sTagComponent.Tags, Is.Empty);
                 });
 
-#if !DEBUG
-                return;
+                // It is run only in DEBUG build,
+                // as the checks are performed only in DEBUG build.
+#if DEBUG
+                // Has single
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasTag(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasTag(sTagComponent, UnregisteredTag); });
+
+                // HasAny entityUid methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagDummy, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagDummy, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagDummy, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // HasAny component methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagComponent, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagComponent, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagComponent, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAnyTag(sTagComponent, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // HasAll entityUid methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagDummy, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagDummy, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagDummy, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // HasAll component methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagComponent, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagComponent, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagComponent, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.HasAllTags(sTagComponent, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // RemoveTag single
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTag(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTag(sTagEntity, UnregisteredTag); });
+
+                // RemoveTags entityUid methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagDummy, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagDummy, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagDummy, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // RemoveTags entity methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagEntity, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagEntity, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagEntity, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.RemoveTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // AddTag single
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTag(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTag(sTagEntity, UnregisteredTag); });
+
+                // AddTags entityUid methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagDummy, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagDummy, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagDummy, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagDummy, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
+
+                // AddTags entity methods
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagEntity, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagEntity, UnregisteredTag, UnregisteredTag); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagEntity, new List<ProtoId<TagPrototype>> { UnregisteredTag }); });
+                Assert.Throws<DebugAssertException>(() => { tagSystem.AddTags(sTagEntity, new HashSet<ProtoId<TagPrototype>> { UnregisteredTag }); });
 #endif
-
-                // Single
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasTag(sTagDummy, UnregisteredTag);
-                });
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasTag(sTagComponent, UnregisteredTag);
-                });
-
-                // Any
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasAnyTag(sTagDummy, UnregisteredTag);
-                });
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasAnyTag(sTagComponent, UnregisteredTag);
-                });
-
-                // All
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasAllTags(sTagDummy, UnregisteredTag);
-                });
-                Assert.Throws<DebugAssertException>(() =>
-                {
-                    tagSystem.HasAllTags(sTagComponent, UnregisteredTag);
-                });
             });
             await pair.CleanReturnAsync();
         }
diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
index 99481db70e..3cceaefbdc 100644
--- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
+++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
@@ -27,6 +27,7 @@ namespace Content.IntegrationTests.Tests
   id: HumanVendingDummy
   components:
   - type: Hands
+  - type: ComplexInteraction
   - type: Body
     prototype: Human
 
diff --git a/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs
new file mode 100644
index 0000000000..5032281dfe
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs
@@ -0,0 +1,1913 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20240531011555_RoleWhitelist")]
+    partial class RoleWhitelist
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group~");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loa~");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs
new file mode 100644
index 0000000000..1cd0d8df17
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs
@@ -0,0 +1,40 @@
+#nullable disable
+
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class RoleWhitelist : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "role_whitelists",
+                columns: table => new
+                {
+                    player_user_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    role_id = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_role_whitelists", x => new { x.player_user_id, x.role_id });
+                    table.ForeignKey(
+                        name: "FK_role_whitelists_player_player_user_id",
+                        column: x => x.player_user_id,
+                        principalTable: "player",
+                        principalColumn: "user_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "role_whitelists");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index bbbd64d874..32a655f7f6 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -900,6 +900,22 @@ namespace Content.Server.Database.Migrations.Postgres
                     b.ToTable("profile_role_loadout", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.Round", b =>
                 {
                     b.Property<int>("Id")
@@ -1623,6 +1639,19 @@ namespace Content.Server.Database.Migrations.Postgres
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Round", b =>
                 {
                     b.HasOne("Content.Server.Database.Server", "Server")
@@ -1822,6 +1851,8 @@ namespace Content.Server.Database.Migrations.Postgres
                     b.Navigation("AdminWatchlistsLastEdited");
 
                     b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
                 });
 
             modelBuilder.Entity("Content.Server.Database.Preference", b =>
diff --git a/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs
new file mode 100644
index 0000000000..531f013604
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs
@@ -0,0 +1,1838 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20240531011549_RoleWhitelist")]
+    partial class RoleWhitelist
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileLoadoutGroupId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout");
+
+                    b.HasIndex("ProfileLoadoutGroupId");
+
+                    b.ToTable("profile_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_loadout_group_id");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("group_name");
+
+                    b.Property<int>("ProfileRoleLoadoutId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_loadout_group");
+
+                    b.HasIndex("ProfileRoleLoadoutId");
+
+                    b.ToTable("profile_loadout_group", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_role_loadout_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile_role_loadout");
+
+                    b.HasIndex("ProfileId");
+
+                    b.ToTable("profile_role_loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileLoadoutGroup", "ProfileLoadoutGroup")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileLoadoutGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_profile_loadout_group_profile_loadout_group_id");
+
+                    b.Navigation("ProfileLoadoutGroup");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.HasOne("Content.Server.Database.ProfileRoleLoadout", "ProfileRoleLoadout")
+                        .WithMany("Groups")
+                        .HasForeignKey("ProfileRoleLoadoutId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_loadout_group_profile_role_loadout_profile_role_loadout_id");
+
+                    b.Navigation("ProfileRoleLoadout");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_role_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileLoadoutGroup", b =>
+                {
+                    b.Navigation("Loadouts");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ProfileRoleLoadout", b =>
+                {
+                    b.Navigation("Groups");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs
new file mode 100644
index 0000000000..9d192fc685
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs
@@ -0,0 +1,40 @@
+#nullable disable
+
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class RoleWhitelist : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "role_whitelists",
+                columns: table => new
+                {
+                    player_user_id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    role_id = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_role_whitelists", x => new { x.player_user_id, x.role_id });
+                    table.ForeignKey(
+                        name: "FK_role_whitelists_player_player_user_id",
+                        column: x => x.player_user_id,
+                        principalTable: "player",
+                        principalColumn: "user_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "role_whitelists");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index d343f49f41..2c444c83eb 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -847,6 +847,22 @@ namespace Content.Server.Database.Migrations.Sqlite
                     b.ToTable("profile_role_loadout", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.HasKey("PlayerUserId", "RoleId")
+                        .HasName("PK_role_whitelists");
+
+                    b.ToTable("role_whitelists", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.Round", b =>
                 {
                     b.Property<int>("Id")
@@ -1548,6 +1564,19 @@ namespace Content.Server.Database.Migrations.Sqlite
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.RoleWhitelist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("JobWhitelists")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_role_whitelists_player_player_user_id");
+
+                    b.Navigation("Player");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Round", b =>
                 {
                     b.HasOne("Content.Server.Database.Server", "Server")
@@ -1747,6 +1776,8 @@ namespace Content.Server.Database.Migrations.Sqlite
                     b.Navigation("AdminWatchlistsLastEdited");
 
                     b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
                 });
 
             modelBuilder.Entity("Content.Server.Database.Preference", b =>
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 57dcc3fc6d..60935e8f06 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -40,6 +40,7 @@ namespace Content.Server.Database
         public DbSet<AdminNote> AdminNotes { get; set; } = null!;
         public DbSet<AdminWatchlist> AdminWatchlists { get; set; } = null!;
         public DbSet<AdminMessage> AdminMessages { get; set; } = null!;
+        public DbSet<RoleWhitelist> RoleWhitelists { get; set; } = null!;
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -314,6 +315,13 @@ namespace Content.Server.Database
                 .HasForeignKey(ban => ban.LastEditedById)
                 .HasPrincipalKey(author => author.UserId)
                 .OnDelete(DeleteBehavior.SetNull);
+
+            modelBuilder.Entity<RoleWhitelist>()
+                .HasOne(w => w.Player)
+                .WithMany(p => p.JobWhitelists)
+                .HasForeignKey(w => w.PlayerUserId)
+                .HasPrincipalKey(p => p.UserId)
+                .OnDelete(DeleteBehavior.Cascade);
         }
 
         public virtual IQueryable<AdminLog> SearchLogs(IQueryable<AdminLog> query, string searchText)
@@ -530,6 +538,7 @@ namespace Content.Server.Database
         public List<ServerBan> AdminServerBansLastEdited { get; set; } = null!;
         public List<ServerRoleBan> AdminServerRoleBansCreated { get; set; } = null!;
         public List<ServerRoleBan> AdminServerRoleBansLastEdited { get; set; } = null!;
+        public List<RoleWhitelist> JobWhitelists { get; set; } = null!;
     }
 
     [Table("whitelist")]
@@ -1099,4 +1108,15 @@ namespace Content.Server.Database
         /// </summary>
         public bool Dismissed { get; set; }
     }
+
+    [PrimaryKey(nameof(PlayerUserId), nameof(RoleId))]
+    public class RoleWhitelist
+    {
+        [Required, ForeignKey("Player")]
+        public Guid PlayerUserId { get; set; }
+        public Player Player { get; set; } = default!;
+
+        [Required]
+        public string RoleId { get; set; } = default!;
+    }
 }
diff --git a/Content.Server/Actions/ActionOnInteractSystem.cs b/Content.Server/Actions/ActionOnInteractSystem.cs
index b6eec0ce0f..2868585859 100644
--- a/Content.Server/Actions/ActionOnInteractSystem.cs
+++ b/Content.Server/Actions/ActionOnInteractSystem.cs
@@ -39,7 +39,7 @@ public sealed class ActionOnInteractSystem : EntitySystem
 
     private void OnActivate(EntityUid uid, ActionOnInteractComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         if (component.ActionEntities is not {} actionEnts)
diff --git a/Content.Server/Administration/BanList/BanListEui.cs b/Content.Server/Administration/BanList/BanListEui.cs
index 3a86a42d53..8ddc7459d7 100644
--- a/Content.Server/Administration/BanList/BanListEui.cs
+++ b/Content.Server/Administration/BanList/BanListEui.cs
@@ -65,13 +65,23 @@ public sealed class BanListEui : BaseEui
                 unban = new SharedServerUnban(unbanningAdmin, ban.Unban.UnbanTime.UtcDateTime);
             }
 
+            (string, int cidrMask)? ip = ("*Hidden*", 0);
+            var hwid = "*Hidden*";
+
+            if (_admins.HasAdminFlag(Player, AdminFlags.Pii))
+            {
+                ip = ban.Address is { } address
+                    ? (address.address.ToString(), address.cidrMask)
+                    : null;
+
+                hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
+            }
+
             Bans.Add(new SharedServerBan(
                 ban.Id,
                 ban.UserId,
-                ban.Address is { } address
-                    ? (address.address.ToString(), address.cidrMask)
-                    : null,
-                ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan()),
+                ip,
+                hwid,
                 ban.BanTime.UtcDateTime,
                 ban.ExpirationTime?.UtcDateTime,
                 ban.Reason,
@@ -96,13 +106,22 @@ public sealed class BanListEui : BaseEui
                 unban = new SharedServerUnban(unbanningAdmin, ban.Unban.UnbanTime.UtcDateTime);
             }
 
+            (string, int cidrMask)? ip = ("*Hidden*", 0);
+            var hwid = "*Hidden*";
+
+            if (_admins.HasAdminFlag(Player, AdminFlags.Pii))
+            {
+                ip = ban.Address is { } address
+                    ? (address.address.ToString(), address.cidrMask)
+                    : null;
+
+                hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
+            }
             RoleBans.Add(new SharedServerRoleBan(
                 ban.Id,
                 ban.UserId,
-                ban.Address is { } address
-                    ? (address.address.ToString(), address.cidrMask)
-                    : null,
-                ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan()),
+                ip,
+                hwid,
                 ban.BanTime.UtcDateTime,
                 ban.ExpirationTime?.UtcDateTime,
                 ban.Reason,
diff --git a/Content.Server/Administration/Commands/AdminWhoCommand.cs b/Content.Server/Administration/Commands/AdminWhoCommand.cs
index cf2f8c453c..feeec90e48 100644
--- a/Content.Server/Administration/Commands/AdminWhoCommand.cs
+++ b/Content.Server/Administration/Commands/AdminWhoCommand.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Utility;
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.AdminWho)]
 public sealed class AdminWhoCommand : IConsoleCommand
 {
     public string Command => "adminwho";
diff --git a/Content.Server/Administration/Commands/AnnounceUiCommand.cs b/Content.Server/Administration/Commands/AnnounceUiCommand.cs
index d80db96686..abb9235a3a 100644
--- a/Content.Server/Administration/Commands/AnnounceUiCommand.cs
+++ b/Content.Server/Administration/Commands/AnnounceUiCommand.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class AnnounceUiCommand : IConsoleCommand
     {
         public string Command => "announceui";
diff --git a/Content.Server/Administration/Commands/BanExemptionCommands.cs b/Content.Server/Administration/Commands/BanExemptionCommands.cs
index 6db00db90c..b6b5f705f9 100644
--- a/Content.Server/Administration/Commands/BanExemptionCommands.cs
+++ b/Content.Server/Administration/Commands/BanExemptionCommands.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Ban)]
 public sealed class BanExemptionUpdateCommand : LocalizedCommands
 {
     [Dependency] private readonly IServerDbManager _dbManager = default!;
@@ -61,7 +61,7 @@ public sealed class BanExemptionUpdateCommand : LocalizedCommands
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Ban)]
 public sealed class BanExemptionGetCommand : LocalizedCommands
 {
     [Dependency] private readonly IServerDbManager _dbManager = default!;
diff --git a/Content.Server/Administration/Commands/DSay.cs b/Content.Server/Administration/Commands/DSay.cs
index 8682614b5f..f29e105909 100644
--- a/Content.Server/Administration/Commands/DSay.cs
+++ b/Content.Server/Administration/Commands/DSay.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     sealed class DSay : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _e = default!;
diff --git a/Content.Server/Administration/Commands/FaxUiCommand.cs b/Content.Server/Administration/Commands/FaxUiCommand.cs
index cf9e97e399..8323278c58 100644
--- a/Content.Server/Administration/Commands/FaxUiCommand.cs
+++ b/Content.Server/Administration/Commands/FaxUiCommand.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Fun)]
 public sealed class FaxUiCommand : IConsoleCommand
 {
     public string Command => "faxui";
@@ -27,4 +27,3 @@ public sealed class FaxUiCommand : IConsoleCommand
         eui.OpenEui(ui, player);
     }
 }
-
diff --git a/Content.Server/Administration/Commands/JobWhitelistCommands.cs b/Content.Server/Administration/Commands/JobWhitelistCommands.cs
new file mode 100644
index 0000000000..a84a11ef84
--- /dev/null
+++ b/Content.Server/Administration/Commands/JobWhitelistCommands.cs
@@ -0,0 +1,214 @@
+using System.Linq;
+using Content.Server.Database;
+using Content.Server.Players.JobWhitelist;
+using Content.Shared.Administration;
+using Content.Shared.Roles;
+using Robust.Server.Player;
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Ban)]
+public sealed class JobWhitelistAddCommand : LocalizedCommands
+{
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly JobWhitelistManager _jobWhitelist = default!;
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+
+    public override string Command => "jobwhitelistadd";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific",
+                ("properAmount", 2),
+                ("currentAmount", args.Length)));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var player = args[0].Trim();
+        var job = new ProtoId<JobPrototype>(args[1].Trim());
+        if (!_prototypes.TryIndex(job, out var jobPrototype))
+        {
+            shell.WriteError(Loc.GetString("cmd-jobwhitelist-job-does-not-exist", ("job", job.Id)));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var data = await _playerLocator.LookupIdByNameAsync(player);
+        if (data != null)
+        {
+            var guid = data.UserId;
+            var isWhitelisted = await _db.IsJobWhitelisted(guid, job);
+            if (isWhitelisted)
+            {
+                shell.WriteLine(Loc.GetString("cmd-jobwhitelist-already-whitelisted",
+                    ("player", player),
+                    ("jobId", job.Id),
+                    ("jobName", jobPrototype.LocalizedName)));
+                return;
+            }
+
+            _jobWhitelist.AddWhitelist(guid, job);
+            shell.WriteLine(Loc.GetString("cmd-jobwhitelistadd-added",
+                ("player", player),
+                ("jobId", job.Id),
+                ("jobName", jobPrototype.LocalizedName)));
+            return;
+        }
+
+        shell.WriteError(Loc.GetString("cmd-jobwhitelist-player-not-found", ("player", player)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                _players.Sessions.Select(s => s.Name),
+                Loc.GetString("cmd-jobwhitelist-hint-player"));
+        }
+
+        if (args.Length == 2)
+        {
+            return CompletionResult.FromHintOptions(
+                _prototypes.EnumeratePrototypes<JobPrototype>().Select(p => p.ID),
+                Loc.GetString("cmd-jobwhitelist-hint-job"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
+
+[AdminCommand(AdminFlags.Ban)]
+public sealed class GetJobWhitelistCommand : LocalizedCommands
+{
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+
+    public override string Command => "jobwhitelistget";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length == 0)
+        {
+            shell.WriteError("This command needs at least one argument.");
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var player = string.Join(' ', args).Trim();
+        var data = await _playerLocator.LookupIdByNameAsync(player);
+        if (data != null)
+        {
+            var guid = data.UserId;
+            var whitelists = await _db.GetJobWhitelists(guid);
+            if (whitelists.Count == 0)
+            {
+                shell.WriteLine(Loc.GetString("cmd-jobwhitelistget-whitelisted-none", ("player", player)));
+                return;
+            }
+
+            shell.WriteLine(Loc.GetString("cmd-jobwhitelistget-whitelisted-for",
+                ("player", player),
+                ("jobs", string.Join(", ", whitelists))));
+            return;
+        }
+
+        shell.WriteError(Loc.GetString("cmd-jobwhitelist-player-not-found", ("player", player)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                _players.Sessions.Select(s => s.Name),
+                Loc.GetString("cmd-jobwhitelist-hint-player"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
+
+[AdminCommand(AdminFlags.Ban)]
+public sealed class RemoveJobWhitelistCommand : LocalizedCommands
+{
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly JobWhitelistManager _jobWhitelist = default!;
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+
+    public override string Command => "jobwhitelistremove";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific",
+                ("properAmount", 2),
+                ("currentAmount", args.Length)));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var player = args[0].Trim();
+        var job = new ProtoId<JobPrototype>(args[1].Trim());
+        if (!_prototypes.TryIndex(job, out var jobPrototype))
+        {
+            shell.WriteError(Loc.GetString("cmd-jobwhitelist-job-does-not-exist", ("job", job)));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var data = await _playerLocator.LookupIdByNameAsync(player);
+        if (data != null)
+        {
+            var guid = data.UserId;
+            var isWhitelisted = await _db.IsJobWhitelisted(guid, job);
+            if (!isWhitelisted)
+            {
+                shell.WriteError(Loc.GetString("cmd-jobwhitelistremove-was-not-whitelisted",
+                    ("player", player),
+                    ("jobId", job.Id),
+                    ("jobName", jobPrototype.LocalizedName)));
+                return;
+            }
+
+            _jobWhitelist.RemoveWhitelist(guid, job);
+            shell.WriteLine(Loc.GetString("cmd-jobwhitelistremove-removed",
+                ("player", player),
+                ("jobId", job.Id),
+                ("jobName", jobPrototype.LocalizedName)));
+            return;
+        }
+
+        shell.WriteError(Loc.GetString("cmd-jobwhitelist-player-not-found", ("player", player)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                _players.Sessions.Select(s => s.Name),
+                Loc.GetString("cmd-jobwhitelist-hint-player"));
+        }
+
+        if (args.Length == 2)
+        {
+            return CompletionResult.FromHintOptions(
+                _prototypes.EnumeratePrototypes<JobPrototype>().Select(p => p.ID),
+                Loc.GetString("cmd-jobwhitelist-hint-job"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Administration/Commands/LinkBluespaceLocker.cs b/Content.Server/Administration/Commands/LinkBluespaceLocker.cs
index d2f7e4de15..9fac72664b 100644
--- a/Content.Server/Administration/Commands/LinkBluespaceLocker.cs
+++ b/Content.Server/Administration/Commands/LinkBluespaceLocker.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Fun)]
 public sealed class LinkBluespaceLocker : IConsoleCommand
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
diff --git a/Content.Server/Administration/Commands/PlayTimeCommands.cs b/Content.Server/Administration/Commands/PlayTimeCommands.cs
index 97d3f12e38..42bc8635c4 100644
--- a/Content.Server/Administration/Commands/PlayTimeCommands.cs
+++ b/Content.Server/Administration/Commands/PlayTimeCommands.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeAddOverallCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -58,7 +58,7 @@ public sealed class PlayTimeAddOverallCommand : IConsoleCommand
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeAddRoleCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -123,7 +123,7 @@ public sealed class PlayTimeAddRoleCommand : IConsoleCommand
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeGetOverallCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -168,7 +168,7 @@ public sealed class PlayTimeGetOverallCommand : IConsoleCommand
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeGetRoleCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -247,7 +247,7 @@ public sealed class PlayTimeGetRoleCommand : IConsoleCommand
 /// <summary>
 /// Saves the timers for a particular player immediately
 /// </summary>
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeSaveCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
diff --git a/Content.Server/Administration/Commands/SetAdminOOC.cs b/Content.Server/Administration/Commands/SetAdminOOC.cs
index 27528e1940..c1f72f7666 100644
--- a/Content.Server/Administration/Commands/SetAdminOOC.cs
+++ b/Content.Server/Administration/Commands/SetAdminOOC.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.NameColor)]
     internal sealed class SetAdminOOC : IConsoleCommand
     {
         public string Command => "setadminooc";
diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
index 3a05b934b2..68bd817026 100644
--- a/Content.Server/Administration/Managers/BanManager.cs
+++ b/Content.Server/Administration/Managers/BanManager.cs
@@ -73,7 +73,9 @@ public sealed class BanManager : IBanManager, IPostInjectInit
 
     public HashSet<string>? GetRoleBans(NetUserId playerUserId)
     {
-        return _cachedRoleBans.TryGetValue(playerUserId, out var roleBans) ? roleBans.Select(banDef => banDef.Role).ToHashSet() : null;
+        return _cachedRoleBans.TryGetValue(playerUserId, out var roleBans)
+            ? roleBans.Select(banDef => banDef.Role).ToHashSet()
+            : null;
     }
 
     private async Task CacheDbRoleBans(NetUserId userId, IPAddress? address = null, ImmutableArray<byte>? hwId = null)
@@ -263,13 +265,13 @@ public sealed class BanManager : IBanManager, IPostInjectInit
         return $"Pardoned ban with id {banId}";
     }
 
-    public HashSet<string>? GetJobBans(NetUserId playerUserId)
+    public HashSet<ProtoId<JobPrototype>>? GetJobBans(NetUserId playerUserId)
     {
         if (!_cachedRoleBans.TryGetValue(playerUserId, out var roleBans))
             return null;
         return roleBans
             .Where(ban => ban.Role.StartsWith(JobPrefix, StringComparison.Ordinal))
-            .Select(ban => ban.Role[JobPrefix.Length..])
+            .Select(ban => new ProtoId<JobPrototype>(ban.Role[JobPrefix.Length..]))
             .ToHashSet();
     }
     #endregion
diff --git a/Content.Server/Administration/Managers/IBanManager.cs b/Content.Server/Administration/Managers/IBanManager.cs
index dafe3d35bd..b60e0a2535 100644
--- a/Content.Server/Administration/Managers/IBanManager.cs
+++ b/Content.Server/Administration/Managers/IBanManager.cs
@@ -2,8 +2,10 @@ using System.Collections.Immutable;
 using System.Net;
 using System.Threading.Tasks;
 using Content.Shared.Database;
+using Content.Shared.Roles;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Administration.Managers;
 
@@ -24,7 +26,7 @@ public interface IBanManager
     /// <param name="reason">Reason for the ban</param>
     public void CreateServerBan(NetUserId? target, string? targetUsername, NetUserId? banningAdmin, (IPAddress, int)? addressRange, ImmutableArray<byte>? hwid, uint? minutes, NoteSeverity severity, string reason);
     public HashSet<string>? GetRoleBans(NetUserId playerUserId);
-    public HashSet<string>? GetJobBans(NetUserId playerUserId);
+    public HashSet<ProtoId<JobPrototype>>? GetJobBans(NetUserId playerUserId);
 
     /// <summary>
     /// Creates a job ban for the specified target, username or GUID
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index b7ca4e915b..a1a6b33ebc 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -292,6 +292,19 @@ namespace Content.Server.Administration.Systems
                 : _adminManager.ActiveAdmins;
             var hasAdmins = admins.Any();
 
+            // TODO Fix order dependent Cvars
+            // Please for the sake of my sanity don't make cvars & order dependent.
+            // Just make a bool field on the system instead of having some cvars automatically modify other cvars.
+            //
+            // I.e., this:
+            //   /sudo cvar game.panic_bunker.enabled true
+            //   /sudo cvar game.panic_bunker.disable_with_admins true
+            // and this:
+            //   /sudo cvar game.panic_bunker.disable_with_admins true
+            //   /sudo cvar game.panic_bunker.enabled true
+            //
+            // should have the same effect, but currently setting the disable_with_admins can modify enabled.
+
             if (hasAdmins && PanicBunker.DisableWithAdmins)
             {
                 _config.SetCVar(CCVars.PanicBunkerEnabled, false);
diff --git a/Content.Server/Administration/Toolshed/TagCommand.cs b/Content.Server/Administration/Toolshed/TagCommand.cs
index 1af2779766..e1cf53e1b1 100644
--- a/Content.Server/Administration/Toolshed/TagCommand.cs
+++ b/Content.Server/Administration/Toolshed/TagCommand.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Shared.Administration;
 using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Toolshed.Syntax;
 using Robust.Shared.Toolshed.TypeParsers;
@@ -13,14 +14,14 @@ public sealed class TagCommand : ToolshedCommand
     private TagSystem? _tag;
 
     [CommandImplementation("list")]
-    public IEnumerable<string> List([PipedArgument] IEnumerable<EntityUid> ent)
+    public IEnumerable<ProtoId<TagPrototype>> List([PipedArgument] IEnumerable<EntityUid> ent)
     {
         return ent.SelectMany(x =>
         {
             if (TryComp<TagComponent>(x, out var tags))
                 // Note: Cast is required for C# to figure out the type signature.
-                return (IEnumerable<string>)tags.Tags;
-            return Array.Empty<string>();
+                return (IEnumerable<ProtoId<TagPrototype>>)tags.Tags;
+            return Array.Empty<ProtoId<TagPrototype>>();
         });
     }
 
@@ -72,7 +73,7 @@ public sealed class TagCommand : ToolshedCommand
     )
     {
         _tag ??= GetSys<TagSystem>();
-        _tag.AddTags(input, @ref.Evaluate(ctx)!);
+        _tag.AddTags(input, (IEnumerable<ProtoId<TagPrototype>>)@ref.Evaluate(ctx)!);
         return input;
     }
 
@@ -92,7 +93,7 @@ public sealed class TagCommand : ToolshedCommand
     )
     {
         _tag ??= GetSys<TagSystem>();
-        _tag.RemoveTags(input, @ref.Evaluate(ctx)!);
+        _tag.RemoveTags(input, (IEnumerable<ProtoId<TagPrototype>>)@ref.Evaluate(ctx)!);
         return input;
     }
 
diff --git a/Content.Server/Advertise/Components/AdvertiseComponent.cs b/Content.Server/Advertise/Components/AdvertiseComponent.cs
index 3d617e3a34..94650234bb 100644
--- a/Content.Server/Advertise/Components/AdvertiseComponent.cs
+++ b/Content.Server/Advertise/Components/AdvertiseComponent.cs
@@ -1,12 +1,12 @@
 using Content.Server.Advertise.EntitySystems;
-using Content.Shared.Advertise;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Advertise.Components;
 
 /// <summary>
 /// Makes this entity periodically advertise by speaking a randomly selected
-/// message from a specified MessagePack into local chat.
+/// message from a specified dataset into local chat.
 /// </summary>
 [RegisterComponent, Access(typeof(AdvertiseSystem))]
 public sealed partial class AdvertiseComponent : Component
@@ -33,10 +33,10 @@ public sealed partial class AdvertiseComponent : Component
     public bool Prewarm = true;
 
     /// <summary>
-    /// The identifier for the advertisements pack prototype.
+    /// The identifier for the advertisements dataset prototype.
     /// </summary>
     [DataField(required: true)]
-    public ProtoId<MessagePackPrototype> Pack { get; private set; }
+    public ProtoId<LocalizedDatasetPrototype> Pack { get; private set; }
 
     /// <summary>
     /// The next time an advertisement will be said.
diff --git a/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs b/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs
index 2a663b7f89..99d0080d7f 100644
--- a/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs
+++ b/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Advertise;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Advertise.Components;
@@ -11,10 +11,10 @@ namespace Content.Server.Advertise.Components;
 public sealed partial class SpeakOnUIClosedComponent : Component
 {
     /// <summary>
-    /// The identifier for the message pack prototype containing messages to be spoken by this entity.
+    /// The identifier for the dataset prototype containing messages to be spoken by this entity.
     /// </summary>
     [DataField(required: true)]
-    public ProtoId<MessagePackPrototype> Pack { get; private set; }
+    public ProtoId<LocalizedDatasetPrototype> Pack { get; private set; }
 
     /// <summary>
     /// Is this component active? If false, no messages will be spoken.
diff --git a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
index 28fa01628f..7f2e128183 100644
--- a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
+++ b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
@@ -62,7 +62,7 @@ public sealed class AdvertiseSystem : EntitySystem
             return;
 
         if (_prototypeManager.TryIndex(advert.Pack, out var advertisements))
-            _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Messages)), InGameICChatType.Speak, hideChat: true);
+            _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Values)), InGameICChatType.Speak, hideChat: true);
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
index 232b4b7eda..a0a709e5fa 100644
--- a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
+++ b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Advertise.Components;
 using Content.Server.Chat.Systems;
-using Content.Server.UserInterface;
-using Content.Shared.Advertise;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using ActivatableUIComponent = Content.Shared.UserInterface.ActivatableUIComponent;
@@ -39,10 +38,10 @@ public sealed partial class SpeakOnUIClosedSystem : EntitySystem
         if (!entity.Comp.Enabled)
             return false;
 
-        if (!_prototypeManager.TryIndex(entity.Comp.Pack, out MessagePackPrototype? messagePack))
+        if (!_prototypeManager.TryIndex(entity.Comp.Pack, out var messagePack))
             return false;
 
-        var message = Loc.GetString(_random.Pick(messagePack.Messages), ("name", Name(entity)));
+        var message = Loc.GetString(_random.Pick(messagePack.Values), ("name", Name(entity)));
         _chat.TrySendInGameICMessage(entity, message, InGameICChatType.Speak, true);
         entity.Comp.Flag = false;
         return true;
diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
index f52fc2b718..405500442f 100644
--- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
+++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Console;
 namespace Content.Server.AlertLevel.Commands
 {
     [UsedImplicitly]
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Fun)]
     public sealed class SetAlertLevelCommand : LocalizedCommands
     {
         [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
diff --git a/Content.Server/Announcements/AnnounceCommand.cs b/Content.Server/Announcements/AnnounceCommand.cs
index cedde3fc14..2307f36a5d 100644
--- a/Content.Server/Announcements/AnnounceCommand.cs
+++ b/Content.Server/Announcements/AnnounceCommand.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Announcements
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class AnnounceCommand : IConsoleCommand
     {
         public string Command => "announce";
diff --git a/Content.Server/Antag/AntagRandomSpawnRule.cs b/Content.Server/Antag/AntagRandomSpawnRule.cs
new file mode 100644
index 0000000000..499761a8df
--- /dev/null
+++ b/Content.Server/Antag/AntagRandomSpawnRule.cs
@@ -0,0 +1,22 @@
+using Content.Server.Antag.Components;
+using Content.Server.GameTicking.Rules;
+
+namespace Content.Server.Antag;
+
+public sealed class AntagRandomSpawnSystem : GameRuleSystem<AntagRandomSpawnComponent>
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AntagRandomSpawnComponent, AntagSelectLocationEvent>(OnSelectLocation);
+    }
+
+    private void OnSelectLocation(Entity<AntagRandomSpawnComponent> ent, ref AntagSelectLocationEvent args)
+    {
+        if (TryFindRandomTile(out _, out _, out _, out var coords))
+            args.Coordinates.Add(_transform.ToMapCoordinates(coords));
+    }
+}
diff --git a/Content.Server/Antag/AntagSelectionSystem.API.cs b/Content.Server/Antag/AntagSelectionSystem.API.cs
index 16d83c4f3f..23e77c2102 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.API.cs
@@ -5,6 +5,7 @@ using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Objectives;
 using Content.Shared.Chat;
 using Content.Shared.Mind;
+using Content.Shared.Preferences;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Enums;
@@ -156,6 +157,36 @@ public sealed partial class AntagSelectionSystem
         return ent.Comp.SelectedMinds.Select(p => p.Item1).ToList();
     }
 
+    /// <summary>
+    /// Checks if a given session has the primary antag preferences for a given definition
+    /// </summary>
+    public bool HasPrimaryAntagPreference(ICommonSession? session, AntagSelectionDefinition def)
+    {
+        if (session == null)
+            return true;
+
+        if (def.PrefRoles.Count == 0)
+            return false;
+
+        var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
+        return pref.AntagPreferences.Any(p => def.PrefRoles.Contains(p));
+    }
+
+    /// <summary>
+    /// Checks if a given session has the fallback antag preferences for a given definition
+    /// </summary>
+    public bool HasFallbackAntagPreference(ICommonSession? session, AntagSelectionDefinition def)
+    {
+        if (session == null)
+            return true;
+
+        if (def.FallbackRoles.Count == 0)
+            return false;
+
+        var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
+        return pref.AntagPreferences.Any(p => def.FallbackRoles.Contains(p));
+    }
+
     /// <summary>
     /// Returns all the antagonists for this rule who are currently alive
     /// </summary>
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index b42831cbde..47da1b6475 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -18,7 +18,7 @@ using Content.Shared.GameTicking;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.Players;
-using Content.Shared.Preferences;
+using Content.Shared.Whitelist;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -42,6 +42,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
 
     // arbitrary random number to give late joining some mild interest.
     public const float LateJoinRandomChance = 0.5f;
@@ -121,12 +122,15 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         // something to figure out later.
 
         var query = QueryActiveRules();
+        var rules = new List<(EntityUid, AntagSelectionComponent)>();
         while (query.MoveNext(out var uid, out _, out var antag, out _))
         {
-            // TODO ANTAG
-            // what why aasdiuhasdopiuasdfhksad
-            // stop this insanity please
-            // probability of antag assignment shouldn't depend on the order in which rules are returned by the query.
+            rules.Add((uid, antag));
+        }
+        RobustRandom.Shuffle(rules);
+
+        foreach (var (uid, antag) in rules)
+        {
             if (!RobustRandom.Prob(LateJoinRandomChance))
                 continue;
 
@@ -232,13 +236,13 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     /// <summary>
     /// Tries to makes a given player into the specified antagonist.
     /// </summary>
-    public bool TryMakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? session, AntagSelectionDefinition def, bool ignoreSpawner = false)
+    public bool TryMakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? session, AntagSelectionDefinition def, bool ignoreSpawner = false, bool checkPref = true)
     {
-        if (!IsSessionValid(ent, session, def) ||
-            !IsEntityValid(session?.AttachedEntity, def))
-        {
+        if (checkPref && !HasPrimaryAntagPreference(session, def))
+            return false;
+
+        if (!IsSessionValid(ent, session, def) || !IsEntityValid(session?.AttachedEntity, def))
             return false;
-        }
 
         MakeAntag(ent, session, def, ignoreSpawner);
         return true;
@@ -338,16 +342,14 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         var fallbackList = new List<ICommonSession>();
         foreach (var session in sessions)
         {
-            if (!IsSessionValid(ent, session, def) ||
-                !IsEntityValid(session.AttachedEntity, def))
+            if (!IsSessionValid(ent, session, def) || !IsEntityValid(session.AttachedEntity, def))
                 continue;
 
-            var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
-            if (def.PrefRoles.Count != 0 && pref.AntagPreferences.Any(p => def.PrefRoles.Contains(p)))
+            if (HasPrimaryAntagPreference(session, def))
             {
                 preferredList.Add(session);
             }
-            else if (def.FallbackRoles.Count != 0 && pref.AntagPreferences.Any(p => def.FallbackRoles.Contains(p)))
+            else if (HasFallbackAntagPreference(session, def))
             {
                 fallbackList.Add(session);
             }
@@ -418,13 +420,13 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
 
         if (def.Whitelist != null)
         {
-            if (!def.Whitelist.IsValid(entity.Value, EntityManager))
+            if (!_whitelist.IsValid(def.Whitelist, entity.Value))
                 return false;
         }
 
         if (def.Blacklist != null)
         {
-            if (def.Blacklist.IsValid(entity.Value, EntityManager))
+            if (_whitelist.IsValid(def.Blacklist, entity.Value))
                 return false;
         }
 
diff --git a/Content.Server/Antag/AntagSpawnerSystem.cs b/Content.Server/Antag/AntagSpawnerSystem.cs
new file mode 100644
index 0000000000..f8a036749a
--- /dev/null
+++ b/Content.Server/Antag/AntagSpawnerSystem.cs
@@ -0,0 +1,21 @@
+using Content.Server.Antag.Components;
+
+namespace Content.Server.Antag;
+
+/// <summary>
+/// Spawns an entity when creating an antag for <see cref="AntagSpawnerComponent"/>.
+/// </summary>
+public sealed class AntagSpawnerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AntagSpawnerComponent, AntagSelectEntityEvent>(OnSelectEntity);
+    }
+
+    private void OnSelectEntity(Entity<AntagSpawnerComponent> ent, ref AntagSelectEntityEvent args)
+    {
+        args.Entity = Spawn(ent.Comp.Prototype);
+    }
+}
diff --git a/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs b/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
new file mode 100644
index 0000000000..16edd256a2
--- /dev/null
+++ b/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.Antag.Components;
+
+/// <summary>
+/// Spawns this rule's antags at random tiles on a station using <c>TryGetRandomTile</c>.
+/// Requires <see cref="AntagSelectionComponent"/>.
+/// </summary>
+[RegisterComponent]
+public sealed partial class AntagRandomSpawnComponent : Component;
diff --git a/Content.Server/Antag/Components/AntagSpawnerComponent.cs b/Content.Server/Antag/Components/AntagSpawnerComponent.cs
new file mode 100644
index 0000000000..7153babc76
--- /dev/null
+++ b/Content.Server/Antag/Components/AntagSpawnerComponent.cs
@@ -0,0 +1,17 @@
+using Content.Server.Antag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Antag.Components;
+
+/// <summary>
+/// Spawns a prototype for antags created with a spawner.
+/// </summary>
+[RegisterComponent, Access(typeof(AntagSpawnerSystem))]
+public sealed partial class AntagSpawnerComponent : Component
+{
+    /// <summary>
+    /// The entity to spawn.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Prototype = string.Empty;
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
index c1b58f7a77..0d622f3067 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
@@ -106,7 +106,7 @@ namespace Content.Server.Atmos.EntitySystems
                 if (tile?.Air == null)
                     continue;
 
-                tile.Air.CopyFromMutable(combined);
+                tile.Air.CopyFrom(combined);
                 InvalidateVisuals(ent, tile);
             }
 
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 78b2402f4b..4c60a88331 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -156,7 +156,7 @@ namespace Content.Server.Atmos.EntitySystems
 
         private void OnExtinguishActivateInWorld(EntityUid uid, ExtinguishOnInteractComponent component, ActivateInWorldEvent args)
         {
-            if (args.Handled)
+            if (args.Handled || !args.Complex)
                 return;
 
             if (!TryComp(uid, out FlammableComponent? flammable))
diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
index 881f54512a..f4650861db 100644
--- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
@@ -246,6 +246,9 @@ public sealed class AirAlarmSystem : EntitySystem
 
     private void OnActivate(EntityUid uid, AirAlarmComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (TryComp<WiresPanelComponent>(uid, out var panel) && panel.Open)
         {
             args.Handled = false;
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
index 83b7b67ba4..871c84e058 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
@@ -103,6 +103,9 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 
         private void OnPumpActivate(EntityUid uid, GasPressurePumpComponent pump, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
 
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
index ed7567428e..4aeba2f8fe 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
@@ -52,8 +52,12 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 
         private void OnActivate(EntityUid uid, GasValveComponent component, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             Toggle(uid, component);
             _audio.PlayPvs(component.ValveSound, uid, AudioParams.Default.WithVariation(0.25f));
+            args.Handled = true;
         }
 
         public void Set(EntityUid uid, GasValveComponent component, bool value)
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index cbcd1f4fa3..d9fbeb474e 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -133,6 +133,9 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 
         private void OnPumpActivate(EntityUid uid, GasVolumePumpComponent pump, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
 
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index 007d304e98..752d1e9eb8 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -99,6 +99,9 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
 
         private void OnFilterActivate(EntityUid uid, GasFilterComponent filter, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
 
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
index 4ab8572843..178caeaa4a 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
@@ -139,6 +139,9 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
 
         private void OnMixerActivate(EntityUid uid, GasMixerComponent mixer, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index e279db09aa..584928def7 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -201,6 +201,9 @@ public sealed class GasCanisterSystem : EntitySystem
 
     private void OnCanisterActivate(EntityUid uid, GasCanisterComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!TryComp<ActorComponent>(args.User, out var actor))
             return;
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
index 834a1dfb0b..6203918517 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
@@ -33,8 +33,12 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnActivate(EntityUid uid, GasOutletInjectorComponent component, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             component.Enabled = !component.Enabled;
             UpdateAppearance(uid, component);
+            args.Handled = true;
         }
 
         public void UpdateAppearance(EntityUid uid, GasOutletInjectorComponent component, AppearanceComponent? appearance = null)
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index c1e1de2baa..b79e083bd4 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -23,6 +23,7 @@ public sealed class InternalsSystem : EntitySystem
     [Dependency] private readonly GasTankSystem _gasTank = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly RespiratorSystem _respirator = default!;
 
     private EntityQuery<InternalsComponent> _internalsQuery;
 
@@ -38,15 +39,30 @@ public sealed class InternalsSystem : EntitySystem
         SubscribeLocalEvent<InternalsComponent, GetVerbsEvent<InteractionVerb>>(OnGetInteractionVerbs);
         SubscribeLocalEvent<InternalsComponent, InternalsDoAfterEvent>(OnDoAfter);
 
-        SubscribeLocalEvent<StartingGearEquippedEvent>(OnStartingGear);
+        SubscribeLocalEvent<InternalsComponent, StartingGearEquippedEvent>(OnStartingGear);
     }
 
-    private void OnStartingGear(ref StartingGearEquippedEvent ev)
+    private void OnStartingGear(EntityUid uid, InternalsComponent component, ref StartingGearEquippedEvent args)
     {
-        if (!_internalsQuery.TryComp(ev.Entity, out var internals) || internals.BreathToolEntity == null)
+        if (component.BreathToolEntity == null)
             return;
 
-        ToggleInternals(ev.Entity, ev.Entity, force: false, internals);
+        if (component.GasTankEntity != null)
+            return; // already connected
+
+        // Can the entity breathe the air it is currently exposed to?
+        if (_respirator.CanMetabolizeInhaledAir(uid))
+            return;
+
+        var tank = FindBestGasTank(uid);
+        if (tank == null)
+            return;
+
+        // Could the entity metabolise the air in the linked gas tank?
+        if (!_respirator.CanMetabolizeGas(uid, tank.Value.Comp.Air))
+            return;
+
+        ToggleInternals(uid, uid, force: false, component);
     }
 
     private void OnGetInteractionVerbs(
@@ -243,6 +259,7 @@ public sealed class InternalsSystem : EntitySystem
     public Entity<GasTankComponent>? FindBestGasTank(
         Entity<HandsComponent?, InventoryComponent?, ContainerManagerComponent?> user)
     {
+        // TODO use _respirator.CanMetabolizeGas() to prioritize metabolizable gasses
         // Prioritise
         // 1. back equipped tanks
         // 2. exo-slot tanks
diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Server/Body/Systems/LungSystem.cs
index e83d3c32a2..7e58c24f7e 100644
--- a/Content.Server/Body/Systems/LungSystem.cs
+++ b/Content.Server/Body/Systems/LungSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Clothing;
 using Content.Shared.Inventory.Events;
 
@@ -77,23 +78,32 @@ public sealed class LungSystem : EntitySystem
         if (!_solutionContainerSystem.ResolveSolution(uid, lung.SolutionName, ref lung.Solution, out var solution))
             return;
 
-        foreach (var gas in Enum.GetValues<Gas>())
+        GasToReagent(lung.Air, solution);
+        _solutionContainerSystem.UpdateChemicals(lung.Solution.Value);
+    }
+
+    private void GasToReagent(GasMixture gas, Solution solution)
+    {
+        foreach (var gasId in Enum.GetValues<Gas>())
         {
-            var i = (int) gas;
-            var moles = lung.Air[i];
+            var i = (int) gasId;
+            var moles = gas[i];
             if (moles <= 0)
                 continue;
+
             var reagent = _atmosphereSystem.GasReagents[i];
-            if (reagent is null) continue;
+            if (reagent is null)
+                continue;
 
             var amount = moles * Atmospherics.BreathMolesToReagentMultiplier;
             solution.AddReagent(reagent, amount);
-
-            // We don't remove the gas from the lung mix,
-            // that's the responsibility of whatever gas is being metabolized.
-            // Most things will just want to exhale again.
         }
+    }
 
-        _solutionContainerSystem.UpdateChemicals(lung.Solution.Value);
+    public Solution GasToReagent(GasMixture gas)
+    {
+        var solution = new Solution();
+        GasToReagent(gas, solution);
+        return solution;
     }
 }
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index a46294beb4..4e6c02edbd 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -1,16 +1,21 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Server.Chemistry.ReagentEffectConditions;
+using Content.Server.Chemistry.ReagentEffects;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
+using Content.Shared.Body.Prototypes;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Mobs.Systems;
 using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
@@ -26,9 +31,12 @@ public sealed class RespiratorSystem : EntitySystem
     [Dependency] private readonly DamageableSystem _damageableSys = default!;
     [Dependency] private readonly LungSystem _lungSystem = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
 
+    private static readonly ProtoId<MetabolismGroupPrototype> GasId = new("Gas");
+
     public override void Initialize()
     {
         base.Initialize();
@@ -109,7 +117,7 @@ public sealed class RespiratorSystem : EntitySystem
 
         // Inhale gas
         var ev = new InhaleLocationEvent();
-        RaiseLocalEvent(uid, ref ev, broadcast: false);
+        RaiseLocalEvent(uid, ref ev);
 
         ev.Gas ??= _atmosSys.GetContainingMixture(uid, excite: true);
 
@@ -164,6 +172,112 @@ public sealed class RespiratorSystem : EntitySystem
         _atmosSys.Merge(ev.Gas, outGas);
     }
 
+    /// <summary>
+    /// Check whether or not an entity can metabolize inhaled air without suffocating or taking damage (i.e., no toxic
+    /// gasses).
+    /// </summary>
+    public bool CanMetabolizeInhaledAir(Entity<RespiratorComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        var ev = new InhaleLocationEvent();
+        RaiseLocalEvent(ent, ref ev);
+
+        var gas = ev.Gas ?? _atmosSys.GetContainingMixture(ent.Owner);
+        if (gas == null)
+            return false;
+
+        return CanMetabolizeGas(ent, gas);
+    }
+
+    /// <summary>
+    /// Check whether or not an entity can metabolize the given gas mixture without suffocating or taking damage
+    /// (i.e., no toxic gasses).
+    /// </summary>
+    public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        var organs = _bodySystem.GetBodyOrganComponents<LungComponent>(ent);
+        if (organs.Count == 0)
+            return false;
+
+        gas = new GasMixture(gas);
+        var lungRatio = 1.0f / organs.Count;
+        gas.Multiply(MathF.Min(lungRatio * gas.Volume/Atmospherics.BreathVolume, lungRatio));
+        var solution = _lungSystem.GasToReagent(gas);
+
+        float saturation = 0;
+        foreach (var organ in organs)
+        {
+            saturation += GetSaturation(solution, organ.Comp.Owner, out var toxic);
+            if (toxic)
+                return false;
+        }
+
+        return saturation > ent.Comp.UpdateInterval.TotalSeconds;
+    }
+
+    /// <summary>
+    /// Get the amount of saturation that would be generated if the lung were to metabolize the given solution.
+    /// </summary>
+    /// <remarks>
+    /// This assumes the metabolism rate is unbounded, which generally should be the case for lungs, otherwise we get
+    /// back to the old pulmonary edema bug.
+    /// </remarks>
+    /// <param name="solution">The reagents to metabolize</param>
+    /// <param name="lung">The entity doing the metabolizing</param>
+    /// <param name="toxic">Whether or not any of the reagents would deal damage to the entity</param>
+    private float GetSaturation(Solution solution, Entity<MetabolizerComponent?> lung, out bool toxic)
+    {
+        toxic = false;
+        if (!Resolve(lung, ref lung.Comp))
+            return 0;
+
+        if (lung.Comp.MetabolismGroups == null)
+            return 0;
+
+        float saturation = 0;
+        foreach (var (id, quantity) in solution.Contents)
+        {
+            var reagent = _protoMan.Index<ReagentPrototype>(id.Prototype);
+            if (reagent.Metabolisms == null)
+                continue;
+
+            if (!reagent.Metabolisms.TryGetValue(GasId, out var entry))
+                continue;
+
+            foreach (var effect in entry.Effects)
+            {
+                if (effect is HealthChange health)
+                    toxic |= CanMetabolize(health) && health.Damage.AnyPositive();
+                else if (effect is Oxygenate oxy && CanMetabolize(oxy))
+                    saturation += oxy.Factor * quantity.Float();
+            }
+        }
+
+        // TODO generalize condition checks
+        // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
+        // Applying actual reaction effects require a full ReagentEffectArgs struct.
+        bool CanMetabolize(ReagentEffect effect)
+        {
+            if (effect.Conditions == null)
+                return true;
+
+            foreach (var cond in effect.Conditions)
+            {
+                if (cond is OrganType organ && !organ.Condition(lung, EntityManager))
+                    return false;
+            }
+
+            return true;
+        }
+
+        return saturation;
+    }
+
     private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
     {
         if (ent.Comp.SuffocationCycles == 2)
diff --git a/Content.Server/CardboardBox/CardboardBoxSystem.cs b/Content.Server/CardboardBox/CardboardBoxSystem.cs
index b9c9427d5c..836dc485d9 100644
--- a/Content.Server/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Server/CardboardBox/CardboardBoxSystem.cs
@@ -36,7 +36,6 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
         SubscribeLocalEvent<CardboardBoxComponent, StorageAfterCloseEvent>(AfterStorageClosed);
         SubscribeLocalEvent<CardboardBoxComponent, GetAdditionalAccessEvent>(OnGetAdditionalAccess);
         SubscribeLocalEvent<CardboardBoxComponent, ActivateInWorldEvent>(OnInteracted);
-        SubscribeLocalEvent<CardboardBoxComponent, InteractedNoHandEvent>(OnNoHandInteracted);
         SubscribeLocalEvent<CardboardBoxComponent, EntInsertedIntoContainerMessage>(OnEntInserted);
         SubscribeLocalEvent<CardboardBoxComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
 
@@ -45,9 +44,18 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
 
     private void OnInteracted(EntityUid uid, CardboardBoxComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled)
+            return;
+
         if (!TryComp<EntityStorageComponent>(uid, out var box))
             return;
 
+        if (!args.Complex)
+        {
+            if (box.Open || !box.Contents.Contains(args.User))
+                return;
+        }
+
         args.Handled = true;
         _storage.ToggleOpen(args.User, uid, box);
 
@@ -58,15 +66,6 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
         }
     }
 
-    private void OnNoHandInteracted(EntityUid uid, CardboardBoxComponent component, InteractedNoHandEvent args)
-    {
-        //Free the mice please
-        if (!TryComp<EntityStorageComponent>(uid, out var box) || box.Open || !box.Contents.Contains(args.User))
-            return;
-
-        _storage.OpenStorage(uid);
-    }
-
     private void OnGetAdditionalAccess(EntityUid uid, CardboardBoxComponent component, ref GetAdditionalAccessEvent args)
     {
         if (component.Mover == null)
diff --git a/Content.Server/Chat/Commands/SetOOCCommand.cs b/Content.Server/Chat/Commands/SetOOCCommand.cs
index e6e688377e..d712a62401 100644
--- a/Content.Server/Chat/Commands/SetOOCCommand.cs
+++ b/Content.Server/Chat/Commands/SetOOCCommand.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Chat.Commands;
 
-[AdminCommand(AdminFlags.Server)]
+[AdminCommand(AdminFlags.Admin)]
 public sealed class SetOOCCommand : IConsoleCommand
 {
     public string Command => "setooc";
diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index d120812b88..23e1517d75 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -81,9 +81,7 @@ public partial class ChatSystem
         bool ignoreActionBlocker = false
         )
     {
-        if (!(emote.Whitelist?.IsValid(source, EntityManager) ?? true))
-            return;
-        if (emote.Blacklist?.IsValid(source, EntityManager) ?? false)
+        if (_whitelistSystem.IsWhitelistFailOrNull(emote.Whitelist, source) || _whitelistSystem.IsBlacklistPass(emote.Blacklist, source))
             return;
 
         if (!emote.Available &&
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 111e56a2a3..0fe9dcbc4d 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -10,6 +10,7 @@ using Content.Server.Speech.EntitySystems;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
@@ -21,6 +22,7 @@ using Content.Shared.Mobs.Systems;
 using Content.Shared.Players;
 using Content.Shared.Radio;
 using Content.Shared.Speech;
+using Content.Shared.Whitelist;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -57,6 +59,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const int VoiceRange = 10; // how far voice goes in world units
     public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
@@ -277,9 +280,13 @@ public sealed partial class ChatSystem : SharedChatSystem
         message = SanitizeInGameOOCMessage(message);
 
         var sendType = type;
-        // If dead player LOOC is disabled, unless you are an aghost, send dead messages to dead chat
-        if (!_adminManager.IsAdmin(player) && !_deadLoocEnabled &&
-            (HasComp<GhostComponent>(source) || _mobStateSystem.IsDead(source)))
+        // If dead player LOOC is disabled, unless you are an admin with Moderator perms, send dead messages to dead chat
+        if ((_adminManager.IsAdmin(player) && _adminManager.HasAdminFlag(player, AdminFlags.Moderator)) // Override if admin
+            || _deadLoocEnabled
+            || (!HasComp<GhostComponent>(source) && !_mobStateSystem.IsDead(source))) // Check that player is not dead
+        {
+        }
+        else
             sendType = InGameOOCChatType.Dead;
 
         // If crit player LOOC is disabled, don't send the message at all.
@@ -378,7 +385,7 @@ public sealed partial class ChatSystem : SharedChatSystem
         if (!_actionBlocker.CanSpeak(source) && !ignoreActionBlocker)
             return;
 
-        var message = TransformSpeech(source, FormattedMessage.RemoveMarkup(originalMessage));
+        var message = TransformSpeech(source, originalMessage);
 
         if (message.Length == 0)
             return;
@@ -417,7 +424,7 @@ public sealed partial class ChatSystem : SharedChatSystem
 
         // To avoid logging any messages sent by entities that are not players, like vendors, cloning, etc.
         // Also doesn't log if hideLog is true.
-        if (!HasComp<ActorComponent>(source) || hideLog == true)
+        if (!HasComp<ActorComponent>(source) || hideLog)
             return;
 
         if (originalMessage == message)
@@ -818,7 +825,7 @@ public sealed partial class ChatSystem : SharedChatSystem
                 recipients.Add(player, new ICChatRecipientData(-1, true));
         }
 
-        RaiseLocalEvent(new ExpandICChatRecipientstEvent(source, voiceGetRange, recipients));
+        RaiseLocalEvent(new ExpandICChatRecipientsEvent(source, voiceGetRange, recipients));
         return recipients;
     }
 
@@ -863,7 +870,7 @@ public sealed partial class ChatSystem : SharedChatSystem
 ///     This event is raised before chat messages are sent out to clients. This enables some systems to send the chat
 ///     messages to otherwise out-of view entities (e.g. for multiple viewports from cameras).
 /// </summary>
-public record ExpandICChatRecipientstEvent(EntityUid Source, float VoiceRange, Dictionary<ICommonSession, ChatSystem.ICChatRecipientData> Recipients)
+public record ExpandICChatRecipientsEvent(EntityUid Source, float VoiceRange, Dictionary<ICommonSession, ChatSystem.ICChatRecipientData> Recipients)
 {
 }
 
diff --git a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs b/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
index 4ae13b6a6e..986c3d79c8 100644
--- a/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
+++ b/Content.Server/Chemistry/ReagentEffectConditions/OrganType.cs
@@ -25,9 +25,15 @@ namespace Content.Server.Chemistry.ReagentEffectConditions
             if (args.OrganEntity == null)
                 return false;
 
-            if (args.EntityManager.TryGetComponent<MetabolizerComponent>(args.OrganEntity.Value, out var metabolizer)
-                && metabolizer.MetabolizerTypes != null
-                && metabolizer.MetabolizerTypes.Contains(Type))
+            return Condition(args.OrganEntity.Value, args.EntityManager);
+        }
+
+        public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
+        {
+            metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
+            if (metabolizer.Comp != null
+                && metabolizer.Comp.MetabolizerTypes != null
+                && metabolizer.Comp.MetabolizerTypes.Contains(Type))
                 return ShouldHave;
             return !ShouldHave;
         }
diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
index 80c5ca5cf2..9bd8fdaa68 100644
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
@@ -12,9 +12,6 @@ namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
         [DataField]
         public float Amount { get; protected set; } = 1;
 
-        [DataField]
-        public float Prob { get; protected set; } = 1; // = (80);
-
         /// <summary>
         /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
         /// </summary>
@@ -45,11 +42,7 @@ namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
                                     || mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
                 return false;
 
-            if (Prob >= 1f)
-                return true;
-
-            // Dependencies are never injected for reagents if you intend to do that for this.
-            return !(Prob <= 0f) && IoCManager.Resolve<IRobustRandom>().Prob(Prob);
+            return true;
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/Construction/MachineFrameSystem.cs b/Content.Server/Construction/MachineFrameSystem.cs
index 09d8d413ec..e20c36d849 100644
--- a/Content.Server/Construction/MachineFrameSystem.cs
+++ b/Content.Server/Construction/MachineFrameSystem.cs
@@ -59,23 +59,27 @@ public sealed class MachineFrameSystem : EntitySystem
             return;
         }
 
-        // Machine parts cannot currently satisfy stack/component/tag restrictions. Similarly stacks cannot satisfy
-        // component/tag restrictions. However, there is no reason this cannot be supported in the future. If this
-        // changes, then RegenerateProgress() also needs to be updated.
-        //
+        // If this changes in the future, then RegenerateProgress() also needs to be updated.
         // Note that one entity is ALLOWED to satisfy more than one kind of component or tag requirements. This is
         // necessary in order to avoid weird entity-ordering shenanigans in RegenerateProgress().
+        var stack = CompOrNull<StackComponent>(args.Used);
+        var machinePart = CompOrNull<MachinePartComponent>(args.Used);
+        if (stack != null && machinePart != null)
+        {
+            if (TryInsertPartStack(uid, args.Used, component, machinePart, stack))
+                args.Handled = true;
+            return;
+        }
 
         // Handle parts
-        if (TryComp<MachinePartComponent>(args.Used, out var machinePart))
+        if (machinePart != null)
         {
             if (TryInsertPart(uid, args.Used, component, machinePart))
                 args.Handled = true;
             return;
         }
 
-        // Handle stacks
-        if (TryComp<StackComponent>(args.Used, out var stack))
+        if (stack != null)
         {
             if (TryInsertStack(uid, args.Used, component, stack))
                 args.Handled = true;
@@ -191,6 +195,44 @@ public sealed class MachineFrameSystem : EntitySystem
         return true;
     }
 
+    /// <returns>Whether or not the function had any effect. Does not indicate success.</returns>
+    private bool TryInsertPartStack(EntityUid uid, EntityUid used, MachineFrameComponent component, MachinePartComponent machinePart, StackComponent stack)
+    {
+        if (!component.Requirements.ContainsKey(machinePart.PartType))
+            return false;
+
+        var progress = component.Progress[machinePart.PartType];
+        var requirement = component.Requirements[machinePart.PartType];
+
+        var needed = requirement - progress;
+        if (needed <= 0)
+            return false;
+
+        var count = stack.Count;
+        if (count < needed)
+        {
+            if (!_container.Insert(used, component.PartContainer))
+                return true;
+
+            component.Progress[machinePart.PartType] += count;
+            return true;
+        }
+
+        var splitStack = _stack.Split(used, needed, Transform(uid).Coordinates, stack);
+
+        if (splitStack == null)
+            return false;
+
+        if (!_container.Insert(splitStack.Value, component.PartContainer))
+            return true;
+
+        component.Progress[machinePart.PartType] += needed;
+        if (IsComplete(component))
+            _popupSystem.PopupEntity(Loc.GetString("machine-frame-component-on-complete"), uid);
+
+        return true;
+    }
+
     /// <returns>Whether or not the function had any effect. Does not indicate success.</returns>
     private bool TryInsertStack(EntityUid uid, EntityUid used, MachineFrameComponent component, StackComponent stack)
     {
@@ -328,8 +370,6 @@ public sealed class MachineFrameSystem : EntitySystem
         {
             if (TryComp<MachinePartComponent>(part, out var machinePart))
             {
-                DebugTools.Assert(!HasComp<StackComponent>(part));
-
                 // Check this is part of the requirements...
                 if (!component.Requirements.ContainsKey(machinePart.PartType))
                     continue;
@@ -338,7 +378,6 @@ public sealed class MachineFrameSystem : EntitySystem
                     component.Progress[machinePart.PartType] = 1;
                 else
                     component.Progress[machinePart.PartType]++;
-
                 continue;
             }
 
diff --git a/Content.Server/Damage/Commands/GodModeCommand.cs b/Content.Server/Damage/Commands/GodModeCommand.cs
index 866737f17a..06a968b473 100644
--- a/Content.Server/Damage/Commands/GodModeCommand.cs
+++ b/Content.Server/Damage/Commands/GodModeCommand.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Damage.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Fun)]
     public sealed class GodModeCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
diff --git a/Content.Server/Damage/Systems/DamageOnLandSystem.cs b/Content.Server/Damage/Systems/DamageOnLandSystem.cs
index 8f01e791ea..2e72e76e6d 100644
--- a/Content.Server/Damage/Systems/DamageOnLandSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOnLandSystem.cs
@@ -22,7 +22,7 @@ namespace Content.Server.Damage.Systems
         private void OnAttemptPacifiedThrow(Entity<DamageOnLandComponent> ent, ref AttemptPacifiedThrowEvent args)
         {
             // Allow healing projectiles, forbid any that do damage:
-            if (ent.Comp.Damage.Any())
+            if (ent.Comp.Damage.AnyPositive())
             {
                 args.Cancel("pacified-cannot-throw");
             }
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 8743a4b5db..be6c7196d5 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -14,9 +14,11 @@ using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
+using Content.Shared.Roles;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Database
@@ -1579,6 +1581,65 @@ INSERT INTO player_round (players_id, rounds_id) VALUES ({players[player]}, {id}
 
         #endregion
 
+        #region Job Whitelists
+
+        public async Task<bool> AddJobWhitelist(Guid player, ProtoId<JobPrototype> job)
+        {
+            await using var db = await GetDb();
+            var exists = await db.DbContext.RoleWhitelists
+                .Where(w => w.PlayerUserId == player)
+                .Where(w => w.RoleId == job.Id)
+                .AnyAsync();
+
+            if (exists)
+                return false;
+
+            var whitelist = new RoleWhitelist
+            {
+                PlayerUserId = player,
+                RoleId = job
+            };
+            db.DbContext.RoleWhitelists.Add(whitelist);
+            await db.DbContext.SaveChangesAsync();
+            return true;
+        }
+
+        public async Task<List<string>> GetJobWhitelists(Guid player, CancellationToken cancel)
+        {
+            await using var db = await GetDb(cancel);
+            return await db.DbContext.RoleWhitelists
+                .Where(w => w.PlayerUserId == player)
+                .Select(w => w.RoleId)
+                .ToListAsync(cancellationToken: cancel);
+        }
+
+        public async Task<bool> IsJobWhitelisted(Guid player, ProtoId<JobPrototype> job)
+        {
+            await using var db = await GetDb();
+            return await db.DbContext.RoleWhitelists
+                .Where(w => w.PlayerUserId == player)
+                .Where(w => w.RoleId == job.Id)
+                .AnyAsync();
+        }
+
+        public async Task<bool> RemoveJobWhitelist(Guid player, ProtoId<JobPrototype> job)
+        {
+            await using var db = await GetDb();
+            var entry = await db.DbContext.RoleWhitelists
+                .Where(w => w.PlayerUserId == player)
+                .Where(w => w.RoleId == job.Id)
+                .SingleOrDefaultAsync();
+
+            if (entry == null)
+                return false;
+
+            db.DbContext.RoleWhitelists.Remove(entry);
+            await db.DbContext.SaveChangesAsync();
+            return true;
+        }
+
+        #endregion
+
         // SQLite returns DateTime as Kind=Unspecified, Npgsql actually knows for sure it's Kind=Utc.
         // Normalize DateTimes here so they're always Utc. Thanks.
         protected abstract DateTime NormalizeDatabaseTime(DateTime time);
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 01d1526727..1983fe43d2 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -9,6 +9,7 @@ using Content.Shared.Administration.Logs;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Preferences;
+using Content.Shared.Roles;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -17,6 +18,7 @@ using Prometheus;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using LogLevel = Robust.Shared.Log.LogLevel;
 using MSLogLevel = Microsoft.Extensions.Logging.LogLevel;
 
@@ -290,6 +292,18 @@ namespace Content.Server.Database
         Task MarkMessageAsSeen(int id, bool dismissedToo);
 
         #endregion
+
+        #region Job Whitelists
+
+        Task AddJobWhitelist(Guid player, ProtoId<JobPrototype> job);
+
+
+        Task<List<string>> GetJobWhitelists(Guid player, CancellationToken cancel = default);
+        Task<bool> IsJobWhitelisted(Guid player, ProtoId<JobPrototype> job);
+
+        Task<bool> RemoveJobWhitelist(Guid player, ProtoId<JobPrototype> job);
+
+        #endregion
     }
 
     public sealed class ServerDbManager : IServerDbManager
@@ -869,6 +883,30 @@ namespace Content.Server.Database
             return RunDbCommand(() => _db.MarkMessageAsSeen(id, dismissedToo));
         }
 
+        public Task AddJobWhitelist(Guid player, ProtoId<JobPrototype> job)
+        {
+            DbWriteOpsMetric.Inc();
+            return RunDbCommand(() => _db.AddJobWhitelist(player, job));
+        }
+
+        public Task<List<string>> GetJobWhitelists(Guid player, CancellationToken cancel = default)
+        {
+            DbReadOpsMetric.Inc();
+            return RunDbCommand(() => _db.GetJobWhitelists(player, cancel));
+        }
+
+        public Task<bool> IsJobWhitelisted(Guid player, ProtoId<JobPrototype> job)
+        {
+            DbReadOpsMetric.Inc();
+            return RunDbCommand(() => _db.IsJobWhitelisted(player, job));
+        }
+
+        public Task<bool> RemoveJobWhitelist(Guid player, ProtoId<JobPrototype> job)
+        {
+            DbWriteOpsMetric.Inc();
+            return RunDbCommand(() => _db.RemoveJobWhitelist(player, job));
+        }
+
         // Wrapper functions to run DB commands from the thread pool.
         // This will avoid SynchronizationContext capturing and avoid running CPU work on the main thread.
         // For SQLite, this will also enable read parallelization (within limits).
diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
index c58c594dba..1aac86c129 100644
--- a/Content.Server/Database/UserDbDataManager.cs
+++ b/Content.Server/Database/UserDbDataManager.cs
@@ -1,8 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Preferences.Managers;
-using Robust.Server.Player;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
@@ -19,11 +17,12 @@ namespace Content.Server.Database;
 /// </remarks>
 public sealed class UserDbDataManager : IPostInjectInit
 {
-    [Dependency] private readonly IServerPreferencesManager _prefs = default!;
     [Dependency] private readonly ILogManager _logManager = default!;
-    [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
 
     private readonly Dictionary<NetUserId, UserData> _users = new();
+    private readonly List<OnLoadPlayer> _onLoadPlayer = [];
+    private readonly List<OnFinishLoad> _onFinishLoad = [];
+    private readonly List<OnPlayerDisconnect> _onPlayerDisconnect = [];
 
     private ISawmill _sawmill = default!;
 
@@ -51,8 +50,10 @@ public sealed class UserDbDataManager : IPostInjectInit
         data.Cancel.Cancel();
         data.Cancel.Dispose();
 
-        _prefs.OnClientDisconnected(session);
-        _playTimeTracking.ClientDisconnected(session);
+        foreach (var onDisconnect in _onPlayerDisconnect)
+        {
+            onDisconnect(session);
+        }
     }
 
     private async Task Load(ICommonSession session, CancellationToken cancel)
@@ -62,12 +63,20 @@ public sealed class UserDbDataManager : IPostInjectInit
         // As such, this task must NOT throw a non-cancellation error!
         try
         {
-            await Task.WhenAll(
-                _prefs.LoadData(session, cancel),
-                _playTimeTracking.LoadData(session, cancel));
+            var tasks = new List<Task>();
+            foreach (var action in _onLoadPlayer)
+            {
+                tasks.Add(action(session, cancel));
+            }
+
+            await Task.WhenAll(tasks);
 
             cancel.ThrowIfCancellationRequested();
-            _prefs.FinishLoad(session);
+
+            foreach (var action in _onFinishLoad)
+            {
+                action(session);
+            }
 
             _sawmill.Verbose($"Load complete for user {session}");
         }
@@ -118,10 +127,31 @@ public sealed class UserDbDataManager : IPostInjectInit
         return _users[session.UserId].Task;
     }
 
+    public void AddOnLoadPlayer(OnLoadPlayer action)
+    {
+        _onLoadPlayer.Add(action);
+    }
+
+    public void AddOnFinishLoad(OnFinishLoad action)
+    {
+        _onFinishLoad.Add(action);
+    }
+
+    public void AddOnPlayerDisconnect(OnPlayerDisconnect action)
+    {
+        _onPlayerDisconnect.Add(action);
+    }
+
     void IPostInjectInit.PostInject()
     {
         _sawmill = _logManager.GetSawmill("userdb");
     }
 
     private sealed record UserData(CancellationTokenSource Cancel, Task Task);
+
+    public delegate Task OnLoadPlayer(ICommonSession player, CancellationToken cancel);
+
+    public delegate void OnFinishLoad(ICommonSession player);
+
+    public delegate void OnPlayerDisconnect(ICommonSession player);
 }
diff --git a/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs b/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
index f6469d68b9..67fad29d93 100644
--- a/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
@@ -26,7 +26,7 @@ public sealed class SignalSwitchSystem : EntitySystem
 
     private void OnActivated(EntityUid uid, SignalSwitchComponent comp, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         comp.State = !comp.State;
diff --git a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
index 8e9c9e4ba7..e1fbdbf089 100644
--- a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
+++ b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
@@ -152,6 +152,9 @@ public sealed class MailingUnitSystem : EntitySystem
 
     private void HandleActivate(EntityUid uid, MailingUnitComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
         {
             return;
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index 1f3b9703d4..e63c03bd5e 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -263,6 +263,9 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
 
     private void OnActivate(EntityUid uid, SharedDisposalUnitComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         if (!TryComp(args.User, out ActorComponent? actor))
         {
             return;
diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs
index 71f9347e9e..fd5d3a9ceb 100644
--- a/Content.Server/Doors/Systems/AirlockSystem.cs
+++ b/Content.Server/Doors/Systems/AirlockSystem.cs
@@ -67,6 +67,9 @@ public sealed class AirlockSystem : SharedAirlockSystem
 
     private void OnActivate(EntityUid uid, AirlockComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         if (TryComp<WiresPanelComponent>(uid, out var panel) &&
             panel.Open &&
             TryComp<ActorComponent>(args.User, out var actor))
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 1e29b80eba..62d1f61a35 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.GenericAntag;
 using Content.Server.Objectives.Components;
 using Content.Server.Objectives.Systems;
 using Content.Server.Popups;
@@ -55,7 +54,6 @@ public sealed partial class DragonSystem : EntitySystem
         SubscribeLocalEvent<DragonComponent, DragonSpawnRiftActionEvent>(OnSpawnRift);
         SubscribeLocalEvent<DragonComponent, RefreshMovementSpeedModifiersEvent>(OnDragonMove);
         SubscribeLocalEvent<DragonComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<DragonComponent, GenericAntagCreatedEvent>(OnCreated);
         SubscribeLocalEvent<DragonComponent, EntityZombifiedEvent>(OnZombified);
     }
 
@@ -192,18 +190,6 @@ public sealed partial class DragonSystem : EntitySystem
         DeleteRifts(uid, false, component);
     }
 
-    private void OnCreated(EntityUid uid, DragonComponent comp, ref GenericAntagCreatedEvent args)
-    {
-        var mindId = args.MindId;
-        var mind = args.Mind;
-
-        _role.MindAddRole(mindId, new DragonRoleComponent(), mind);
-        _role.MindAddRole(mindId, new RoleBriefingComponent()
-        {
-            Briefing = Loc.GetString("dragon-role-briefing")
-        }, mind);
-    }
-
     private void OnZombified(Entity<DragonComponent> ent, ref EntityZombifiedEvent args)
     {
         // prevent carp attacking zombie dragon
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index 8291e97efe..67e60c9de4 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -166,7 +166,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
         if (!electrified.OnAttacked)
             return;
 
-        if (!_meleeWeapon.GetDamage(args.Used, args.User).Any())
+        if (_meleeWeapon.GetDamage(args.Used, args.User).Empty)
             return;
 
         TryDoElectrifiedAct(uid, args.User, 1, electrified);
@@ -183,7 +183,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
         if (!component.CurrentLit || args.Used != args.User)
             return;
 
-        if (!_meleeWeapon.GetDamage(args.Used, args.User).Any())
+        if (_meleeWeapon.GetDamage(args.Used, args.User).Empty)
             return;
 
         DoCommonElectrocution(args.User, uid, component.UnarmedHitShock, component.UnarmedHitStun, false);
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 3cdf3bfe8e..234a2e4658 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -14,6 +14,7 @@ using Content.Server.Info;
 using Content.Server.IoC;
 using Content.Server.Maps;
 using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.Players.JobWhitelist;
 using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Preferences.Managers;
 using Content.Server.ServerInfo;
@@ -107,6 +108,7 @@ namespace Content.Server.Entry
                 _voteManager.Initialize();
                 _updateManager.Initialize();
                 _playTimeTracking.Initialize();
+                IoCManager.Resolve<JobWhitelistManager>().Initialize();
             }
         }
 
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs b/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
index 7db1f513f7..2ddcc052d8 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
@@ -14,7 +14,7 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
     public MapGridComponent Grid;
     private bool _needToTransform = false;
 
-    private Matrix3 _matrix = Matrix3.Identity;
+    private Matrix3x2 _matrix = Matrix3x2.Identity;
     private Vector2 _offset;
 
     // Tiles which neighbor an exploding tile, but have not yet had the explosion spread to them due to an
@@ -44,7 +44,7 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
         int typeIndex,
         Dictionary<Vector2i, NeighborFlag> edgeTiles,
         EntityUid? referenceGrid,
-        Matrix3 spaceMatrix,
+        Matrix3x2 spaceMatrix,
         Angle spaceAngle)
     {
         Grid = grid;
@@ -72,9 +72,10 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
         var transform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Grid.Owner);
         var size = (float) Grid.TileSize;
 
-        _matrix.R0C2 = size / 2;
-        _matrix.R1C2 = size / 2;
-        _matrix *= transform.WorldMatrix * Matrix3.Invert(spaceMatrix);
+        _matrix.M31 = size / 2;
+        _matrix.M32 = size / 2;
+        Matrix3x2.Invert(spaceMatrix, out var invSpace);
+        _matrix *= transform.WorldMatrix * invSpace;
         var relativeAngle = transform.WorldRotation - spaceAngle;
         _offset = relativeAngle.RotateVec(new Vector2(size / 4, size / 4));
     }
@@ -228,7 +229,7 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
             return;
         }
 
-        var center = _matrix.Transform(tile);
+        var center = Vector2.Transform(tile, _matrix);
         SpaceJump.Add(new((int) MathF.Floor(center.X + _offset.X), (int) MathF.Floor(center.Y + _offset.Y)));
         SpaceJump.Add(new((int) MathF.Floor(center.X - _offset.Y), (int) MathF.Floor(center.Y + _offset.X)));
         SpaceJump.Add(new((int) MathF.Floor(center.X - _offset.X), (int) MathF.Floor(center.Y - _offset.Y)));
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
index 719a2eca79..556fe7c141 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
@@ -60,7 +60,7 @@ public sealed partial class ExplosionSystem : EntitySystem
     {
         Dictionary<Vector2i, BlockedSpaceTile> transformedEdges = new();
 
-        var targetMatrix = Matrix3.Identity;
+        var targetMatrix = Matrix3x2.Identity;
         Angle targetAngle = new();
         var tileSize = DefaultTileSize;
         var maxDistanceSq = (int) (maxDistance * maxDistance);
@@ -75,9 +75,9 @@ public sealed partial class ExplosionSystem : EntitySystem
             tileSize = targetGrid.TileSize;
         }
 
-        var offsetMatrix = Matrix3.Identity;
-        offsetMatrix.R0C2 = tileSize / 2f;
-        offsetMatrix.R1C2 = tileSize / 2f;
+        var offsetMatrix = Matrix3x2.Identity;
+        offsetMatrix.M31 = tileSize / 2f;
+        offsetMatrix.M32 = tileSize / 2f;
 
         // Here we can end up with a triple nested for loop:
         // foreach other grid
@@ -106,7 +106,7 @@ public sealed partial class ExplosionSystem : EntitySystem
             var xform = xforms.GetComponent(gridToTransform);
             var  (_, gridWorldRotation, gridWorldMatrix, invGridWorldMatrid) = xform.GetWorldPositionRotationMatrixWithInv(xforms);
 
-            var localEpicentre = (Vector2i) invGridWorldMatrid.Transform(epicentre.Position);
+            var localEpicentre = (Vector2i) Vector2.Transform(epicentre.Position, invGridWorldMatrid);
             var matrix = offsetMatrix * gridWorldMatrix * targetMatrix;
             var angle = gridWorldRotation - targetAngle;
 
@@ -119,7 +119,7 @@ public sealed partial class ExplosionSystem : EntitySystem
                 if (delta.X * delta.X + delta.Y * delta.Y > maxDistanceSq) // no Vector2.Length???
                     continue;
 
-                var center = matrix.Transform(tile);
+                var center = Vector2.Transform(tile, matrix);
 
                 if ((dir & NeighborFlag.Cardinal) == 0)
                 {
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index a93157a175..c30a9ce300 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -298,8 +298,8 @@ public sealed partial class ExplosionSystem
     ///     Same as <see cref="ExplodeTile"/>, but for SPAAAAAAACE.
     /// </summary>
     internal void ExplodeSpace(BroadphaseComponent lookup,
-        Matrix3 spaceMatrix,
-        Matrix3 invSpaceMatrix,
+        Matrix3x2 spaceMatrix,
+        Matrix3x2 invSpaceMatrix,
         Vector2i tile,
         float throwForce,
         DamageSpecifier damage,
@@ -341,7 +341,7 @@ public sealed partial class ExplosionSystem
     }
 
     private static bool SpaceQueryCallback(
-        ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
+        ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3x2 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
         in EntityUid uid)
     {
         if (state.Processed.Contains(uid))
@@ -352,7 +352,7 @@ public sealed partial class ExplosionSystem
         if (xform.ParentUid == state.LookupOwner)
         {
             // parented directly to the map, use local position
-            if (state.GridBox.Contains(state.InvSpaceMatrix.Transform(xform.LocalPosition)))
+            if (state.GridBox.Contains(Vector2.Transform(xform.LocalPosition, state.InvSpaceMatrix)))
                 state.List.Add((uid, xform));
 
             return true;
@@ -360,14 +360,14 @@ public sealed partial class ExplosionSystem
 
         // finally check if it intersects our tile
         var wpos = state.System.GetWorldPosition(xform);
-        if (state.GridBox.Contains(state.InvSpaceMatrix.Transform(wpos)))
+        if (state.GridBox.Contains(Vector2.Transform(wpos, state.InvSpaceMatrix)))
             state.List.Add((uid, xform));
 
         return true;
     }
 
     private static bool SpaceQueryCallback(
-        ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
+        ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3x2 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
         in FixtureProxy proxy)
     {
         var uid = proxy.Entity;
@@ -396,7 +396,7 @@ public sealed partial class ExplosionSystem
 
         // don't raise BeforeExplodeEvent if the entity is completely immune to explosions
         var thisDamage = GetDamage(uid, prototype, originalDamage);
-        if (!thisDamage.Any())
+        if (thisDamage.Empty)
             return;
 
         _toDamage.Add((uid, thisDamage));
@@ -585,12 +585,12 @@ sealed class Explosion
     /// <summary>
     ///     The matrix that defines the reference frame for the explosion in space.
     /// </summary>
-    private readonly Matrix3 _spaceMatrix;
+    private readonly Matrix3x2 _spaceMatrix;
 
     /// <summary>
     ///     Inverse of <see cref="_spaceMatrix"/>
     /// </summary>
-    private readonly Matrix3 _invSpaceMatrix;
+    private readonly Matrix3x2 _invSpaceMatrix;
 
     /// <summary>
     ///     Have all the tiles on all the grids been processed?
@@ -656,7 +656,7 @@ sealed class Explosion
         List<ExplosionGridTileFlood> gridData,
         List<float> tileSetIntensity,
         MapCoordinates epicenter,
-        Matrix3 spaceMatrix,
+        Matrix3x2 spaceMatrix,
         int area,
         float tileBreakScale,
         int maxTileBreak,
@@ -695,7 +695,7 @@ sealed class Explosion
             });
 
             _spaceMatrix = spaceMatrix;
-            _invSpaceMatrix = Matrix3.Invert(spaceMatrix);
+            Matrix3x2.Invert(spaceMatrix, out _invSpaceMatrix);
         }
 
         foreach (var grid in gridData)
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
index a42dd11083..8b4c0e14c5 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
@@ -26,7 +26,7 @@ public sealed partial class ExplosionSystem : EntitySystem
     /// <param name="maxIntensity">The maximum intensity that the explosion can have at any given tile. This
     /// effectively caps the damage that this explosion can do.</param>
     /// <returns>A list of tile-sets and a list of intensity values which describe the explosion.</returns>
-    private (int, List<float>, ExplosionSpaceTileFlood?, Dictionary<EntityUid, ExplosionGridTileFlood>, Matrix3)? GetExplosionTiles(
+    private (int, List<float>, ExplosionSpaceTileFlood?, Dictionary<EntityUid, ExplosionGridTileFlood>, Matrix3x2)? GetExplosionTiles(
         MapCoordinates epicenter,
         string typeID,
         float totalIntensity,
@@ -84,7 +84,7 @@ public sealed partial class ExplosionSystem : EntitySystem
         Dictionary<EntityUid, HashSet<Vector2i>>? previousGridJump;
 
         // variables for transforming between grid and space-coordinates
-        var spaceMatrix = Matrix3.Identity;
+        var spaceMatrix = Matrix3x2.Identity;
         var spaceAngle = Angle.Zero;
         if (referenceGrid != null)
         {
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
index d332531502..5db8b55bf9 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
 using Robust.Server.GameObjects;
@@ -35,7 +36,7 @@ public sealed partial class ExplosionSystem : EntitySystem
     /// <summary>
     ///     Constructor for the shared <see cref="ExplosionEvent"/> using the server-exclusive explosion classes.
     /// </summary>
-    private EntityUid CreateExplosionVisualEntity(MapCoordinates epicenter, string prototype, Matrix3 spaceMatrix, ExplosionSpaceTileFlood? spaceData, IEnumerable<ExplosionGridTileFlood> gridData, List<float> iterationIntensity)
+    private EntityUid CreateExplosionVisualEntity(MapCoordinates epicenter, string prototype, Matrix3x2 spaceMatrix, ExplosionSpaceTileFlood? spaceData, IEnumerable<ExplosionGridTileFlood> gridData, List<float> iterationIntensity)
     {
         var explosionEntity = Spawn(null, MapCoordinates.Nullspace);
         var comp = AddComp<ExplosionVisualsComponent>(explosionEntity);
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 7c6b5df7f1..e03b8aff54 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -218,6 +218,9 @@ namespace Content.Server.Explosion.EntitySystems
 
         private void OnActivate(EntityUid uid, TriggerOnActivateComponent component, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             Trigger(uid, args.User);
             args.Handled = true;
         }
diff --git a/Content.Server/Flash/Components/DamagedByFlashingComponent.cs b/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
index 2a9024607d..ef33454295 100644
--- a/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
+++ b/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
@@ -3,7 +3,6 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server.Flash.Components;
 
-// Also needed FlashableComponent on entity to work
 [RegisterComponent, Access(typeof(DamagedByFlashingSystem))]
 public sealed partial class DamagedByFlashingComponent : Component
 {
@@ -11,5 +10,5 @@ public sealed partial class DamagedByFlashingComponent : Component
     /// damage from flashing
     /// </summary>
     [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
-    public DamageSpecifier FlashDamage = new ();
+    public DamageSpecifier FlashDamage = new();
 }
diff --git a/Content.Server/Flash/Components/FlashImmunityComponent.cs b/Content.Server/Flash/Components/FlashImmunityComponent.cs
index 80bbdd1282..a982a9059f 100644
--- a/Content.Server/Flash/Components/FlashImmunityComponent.cs
+++ b/Content.Server/Flash/Components/FlashImmunityComponent.cs
@@ -1,10 +1,13 @@
-namespace Content.Server.Flash.Components
+namespace Content.Server.Flash.Components;
+
+/// <summary>
+///     Makes the entity immune to being flashed.
+///     When given to clothes in the "head", "eyes" or "mask" slot it protects the wearer.
+/// </summary>
+[RegisterComponent, Access(typeof(FlashSystem))]
+public sealed partial class FlashImmunityComponent : Component
 {
-    [RegisterComponent, Access(typeof(FlashSystem))]
-    public sealed partial class FlashImmunityComponent : Component
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("enabled")]
-        public bool Enabled { get; set; } = true;
-    }
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("enabled")]
+    public bool Enabled { get; set; } = true;
 }
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index dd8cdab426..ccb58e94f8 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -9,18 +9,17 @@ using Content.Shared.Charges.Systems;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Flash;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
-using Content.Shared.Physics;
 using Content.Shared.Tag;
 using Content.Shared.Traits.Assorted;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.StatusEffect;
+using Content.Shared.Examine;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
 
 namespace Content.Server.Flash
@@ -31,14 +30,14 @@ namespace Content.Server.Flash
         [Dependency] private readonly AudioSystem _audio = default!;
         [Dependency] private readonly SharedChargesSystem _charges = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
-        [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly StunSystem _stun = default!;
         [Dependency] private readonly TagSystem _tag = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
 
         public override void Initialize()
         {
@@ -46,7 +45,7 @@ namespace Content.Server.Flash
 
             SubscribeLocalEvent<FlashComponent, MeleeHitEvent>(OnFlashMeleeHit);
             // ran before toggling light for extra-bright lantern
-            SubscribeLocalEvent<FlashComponent, UseInHandEvent>(OnFlashUseInHand, before: new []{ typeof(HandheldLightSystem) });
+            SubscribeLocalEvent<FlashComponent, UseInHandEvent>(OnFlashUseInHand, before: new[] { typeof(HandheldLightSystem) });
             SubscribeLocalEvent<InventoryComponent, FlashAttemptEvent>(OnInventoryFlashAttempt);
             SubscribeLocalEvent<FlashImmunityComponent, FlashAttemptEvent>(OnFlashImmunityFlashAttempt);
             SubscribeLocalEvent<PermanentBlindnessComponent, FlashAttemptEvent>(OnPermanentBlindnessFlashAttempt);
@@ -114,19 +113,35 @@ namespace Content.Server.Flash
             float flashDuration,
             float slowTo,
             bool displayPopup = true,
-            FlashableComponent? flashable = null,
             bool melee = false,
             TimeSpan? stunDuration = null)
         {
-            if (!Resolve(target, ref flashable, false))
-                return;
-
             var attempt = new FlashAttemptEvent(target, user, used);
             RaiseLocalEvent(target, attempt, true);
 
             if (attempt.Cancelled)
                 return;
 
+            // don't paralyze, slowdown or convert to rev if the target is immune to flashes
+            if (!_statusEffectsSystem.TryAddStatusEffect<FlashedComponent>(target, FlashedKey, TimeSpan.FromSeconds(flashDuration / 1000f), true))
+                return;
+
+            if (stunDuration != null)
+            {
+                _stun.TryParalyze(target, stunDuration.Value, true);
+            }
+            else
+            {
+                _stun.TrySlowdown(target, TimeSpan.FromSeconds(flashDuration / 1000f), true,
+                slowTo, slowTo);
+            }
+
+            if (displayPopup && user != null && target != user && Exists(user.Value))
+            {
+                _popup.PopupEntity(Loc.GetString("flash-component-user-blinds-you",
+                    ("user", Identity.Entity(user.Value, EntityManager))), target, target);
+            }
+
             if (melee)
             {
                 var ev = new AfterFlashedEvent(target, user, used);
@@ -135,48 +150,31 @@ namespace Content.Server.Flash
                 if (used != null)
                     RaiseLocalEvent(used.Value, ref ev);
             }
-
-            flashable.LastFlash = _timing.CurTime;
-            flashable.Duration = flashDuration / 1000f; // TODO: Make this sane...
-            Dirty(target, flashable);
-
-            if (stunDuration != null)
-            {
-                _stun.TryParalyze(target, stunDuration.Value, true);
-            }
-            else
-            {
-                _stun.TrySlowdown(target, TimeSpan.FromSeconds(flashDuration/1000f), true,
-                slowTo, slowTo);
-            }
-
-            if (displayPopup && user != null && target != user && Exists(user.Value))
-            {
-                _popup.PopupEntity(Loc.GetString("flash-component-user-blinds-you",
-                    ("user", Identity.Entity(user.Value, EntityManager))), target, target);
-            }
         }
 
         public void FlashArea(Entity<FlashComponent?> source, EntityUid? user, float range, float duration, float slowTo = 0.8f, bool displayPopup = false, float probability = 1f, SoundSpecifier? sound = null)
         {
             var transform = Transform(source);
             var mapPosition = _transform.GetMapCoordinates(transform);
-            var flashableQuery = GetEntityQuery<FlashableComponent>();
+            var statusEffectsQuery = GetEntityQuery<StatusEffectsComponent>();
+            var damagedByFlashingQuery = GetEntityQuery<DamagedByFlashingComponent>();
 
             foreach (var entity in _entityLookup.GetEntitiesInRange(transform.Coordinates, range))
             {
                 if (!_random.Prob(probability))
                     continue;
 
-                if (!flashableQuery.TryGetComponent(entity, out var flashable))
+                // Is the entity affected by the flash either through status effects or by taking damage?
+                if (!statusEffectsQuery.HasComponent(entity) && !damagedByFlashingQuery.HasComponent(entity))
                     continue;
 
-                // Check for unobstructed entities while ignoring the mobs with flashable components.
-                if (!_interaction.InRangeUnobstructed(entity, mapPosition, range, flashable.CollisionGroup, predicate: (e) => flashableQuery.HasComponent(e) || e == source.Owner))
+                // Check for entites in view
+                // put damagedByFlashingComponent in the predicate because shadow anomalies block vision.
+                if (!_examine.InRangeUnOccluded(entity, mapPosition, range, predicate: (e) => damagedByFlashingQuery.HasComponent(e)))
                     continue;
 
                 // They shouldn't have flash removed in between right?
-                Flash(entity, user, source, duration, slowTo, displayPopup, flashableQuery.GetComponent(entity));
+                Flash(entity, user, source, duration, slowTo, displayPopup);
             }
 
             _audio.PlayPvs(sound, source, AudioParams.Default.WithVolume(1f).WithMaxDistance(3f));
@@ -195,13 +193,15 @@ namespace Content.Server.Flash
 
         private void OnFlashImmunityFlashAttempt(EntityUid uid, FlashImmunityComponent component, FlashAttemptEvent args)
         {
-            if(component.Enabled)
+            if (component.Enabled)
                 args.Cancel();
         }
 
         private void OnPermanentBlindnessFlashAttempt(EntityUid uid, PermanentBlindnessComponent component, FlashAttemptEvent args)
         {
-            args.Cancel();
+            // check for total blindness
+            if (component.Blindness == 0)
+                args.Cancel();
         }
 
         private void OnTemporaryBlindnessFlashAttempt(EntityUid uid, TemporaryBlindnessComponent component, FlashAttemptEvent args)
@@ -210,6 +210,10 @@ namespace Content.Server.Flash
         }
     }
 
+    /// <summary>
+    ///     Called before a flash is used to check if the attempt is cancelled by blindness, items or FlashImmunityComponent.
+    ///     Raised on the target hit by the flash, the user of the flash and the flash used.
+    /// </summary>
     public sealed class FlashAttemptEvent : CancellableEntityEventArgs
     {
         public readonly EntityUid Target;
@@ -224,8 +228,8 @@ namespace Content.Server.Flash
         }
     }
     /// <summary>
-    /// Called after a flash is used via melee on another person to check for rev conversion.
-    /// Raised on the user of the flash, the target hit by the flash, and the flash used.
+    ///     Called after a flash is used via melee on another person to check for rev conversion.
+    ///     Raised on the target hit by the flash, the user of the flash and the flash used.
     /// </summary>
     [ByRefEvent]
     public readonly struct AfterFlashedEvent
@@ -241,6 +245,4 @@ namespace Content.Server.Flash
             Used = used;
         }
     }
-
-
 }
diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index d88f46968a..52afdcf8b4 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Popups;
 using Content.Shared.Chemistry.Components;
@@ -34,7 +35,7 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
         base.Initialize();
         SubscribeLocalEvent<AbsorbentComponent, ComponentInit>(OnAbsorbentInit);
         SubscribeLocalEvent<AbsorbentComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<AbsorbentComponent, InteractNoHandEvent>(OnInteractNoHand);
+        SubscribeLocalEvent<AbsorbentComponent, UserActivateInWorldEvent>(OnActivateInWorld);
         SubscribeLocalEvent<AbsorbentComponent, SolutionContainerChangedEvent>(OnAbsorbentSolutionChange);
     }
 
@@ -84,12 +85,12 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
         Dirty(uid, component);
     }
 
-    private void OnInteractNoHand(EntityUid uid, AbsorbentComponent component, InteractNoHandEvent args)
+    private void OnActivateInWorld(EntityUid uid, AbsorbentComponent component, UserActivateInWorldEvent args)
     {
-        if (args.Handled || args.Target == null)
+        if (args.Handled)
             return;
 
-        Mop(uid, args.Target.Value, uid, component);
+        Mop(uid, args.Target, uid, component);
         args.Handled = true;
     }
 
@@ -317,7 +318,7 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
 
         var userXform = Transform(user);
         var targetPos = _transform.GetWorldPosition(target);
-        var localPos = _transform.GetInvWorldMatrix(userXform).Transform(targetPos);
+        var localPos = Vector2.Transform(targetPos, _transform.GetInvWorldMatrix(userXform));
         localPos = userXform.LocalRotation.RotateVec(localPos);
 
         _melee.DoLunge(user, used, Angle.Zero, localPos, null, false);
diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index 1445e253f3..3304330aca 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.DoAfter;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics.Components;
 using Content.Server.Popups;
+using Content.Shared.Popups;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Forensics;
@@ -11,6 +12,7 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Random;
+using Content.Shared.Verbs;
 
 namespace Content.Server.Forensics
 {
@@ -32,6 +34,8 @@ namespace Content.Server.Forensics
             SubscribeLocalEvent<CleansForensicsComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(AbsorbentSystem) });
             SubscribeLocalEvent<ForensicsComponent, CleanForensicsDoAfterEvent>(OnCleanForensicsDoAfter);
             SubscribeLocalEvent<DnaComponent, TransferDnaEvent>(OnTransferDnaEvent);
+            SubscribeLocalEvent<CleansForensicsComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
+
         }
 
         private void OnInteract(EntityUid uid, FingerprintComponent component, ContactInteractionEvent args)
@@ -51,7 +55,7 @@ namespace Content.Server.Forensics
 
         private void OnBeingGibbed(EntityUid uid, DnaComponent component, BeingGibbedEvent args)
         {
-            foreach(EntityUid part in args.GibbedParts)
+            foreach (EntityUid part in args.GibbedParts)
             {
                 var partComp = EnsureComp<ForensicsComponent>(part);
                 partComp.DNAs.Add(component.DNA);
@@ -61,13 +65,13 @@ namespace Content.Server.Forensics
 
         private void OnMeleeHit(EntityUid uid, ForensicsComponent component, MeleeHitEvent args)
         {
-            if((args.BaseDamage.DamageDict.TryGetValue("Blunt", out var bluntDamage) && bluntDamage.Value > 0) ||
+            if ((args.BaseDamage.DamageDict.TryGetValue("Blunt", out var bluntDamage) && bluntDamage.Value > 0) ||
                 (args.BaseDamage.DamageDict.TryGetValue("Slash", out var slashDamage) && slashDamage.Value > 0) ||
                 (args.BaseDamage.DamageDict.TryGetValue("Piercing", out var pierceDamage) && pierceDamage.Value > 0))
             {
-                foreach(EntityUid hitEntity in args.HitEntities)
+                foreach (EntityUid hitEntity in args.HitEntities)
                 {
-                    if(TryComp<DnaComponent>(hitEntity, out var hitEntityComp))
+                    if (TryComp<DnaComponent>(hitEntity, out var hitEntityComp))
                         component.DNAs.Add(hitEntityComp.DNA);
                 }
             }
@@ -101,17 +105,58 @@ namespace Content.Server.Forensics
             }
         }
 
-        private void OnAfterInteract(EntityUid uid, CleansForensicsComponent component, AfterInteractEvent args)
+        private void OnAfterInteract(Entity<CleansForensicsComponent> cleanForensicsEntity, ref AfterInteractEvent args)
         {
-            if (args.Handled || !args.CanReach)
+            if (args.Handled || !args.CanReach || args.Target == null)
                 return;
 
-            if (!TryComp<ForensicsComponent>(args.Target, out var forensicsComp))
+            args.Handled = TryStartCleaning(cleanForensicsEntity, args.User, args.Target.Value);
+        }
+
+        private void OnUtilityVerb(Entity<CleansForensicsComponent> entity, ref GetVerbsEvent<UtilityVerb> args)
+        {
+            if (!args.CanInteract || !args.CanAccess)
                 return;
 
-            if((forensicsComp.DNAs.Count > 0 && forensicsComp.CanDnaBeCleaned) || (forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count > 0))
+            // These need to be set outside for the anonymous method!
+            var user = args.User;
+            var target = args.Target;
+
+            var verb = new UtilityVerb()
             {
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
+                Act = () => TryStartCleaning(entity, user, target),
+                IconEntity = GetNetEntity(entity),
+                Text = Loc.GetString(Loc.GetString("forensics-verb-text")),
+                Message = Loc.GetString(Loc.GetString("forensics-verb-message")),
+                // This is important because if its true using the cleaning device will count as touching the object.
+                DoContactInteraction = false
+            };
+
+            args.Verbs.Add(verb);
+        }
+
+        /// <summary>
+        ///     Attempts to clean the given item with the given CleansForensics entity.
+        /// </summary>
+        /// <param name="cleanForensicsEntity">The entity that is being used to clean the target.</param>
+        /// <param name="user">The user that is using the cleanForensicsEntity.</param>
+        /// <param name="target">The target of the forensics clean.</param>
+        /// <returns>True if the target can be cleaned and has some sort of DNA or fingerprints / fibers and false otherwise.</returns>
+        public bool TryStartCleaning(Entity<CleansForensicsComponent> cleanForensicsEntity, EntityUid user, EntityUid target)
+        {
+            if (!TryComp<ForensicsComponent>(target, out var forensicsComp))
+            {
+                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning-cannot-clean", ("target", target)), user, user, PopupType.MediumCaution);
+                return false;
+            }
+
+            var totalPrintsAndFibers = forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count;
+            var hasRemovableDNA = forensicsComp.DNAs.Count > 0 && forensicsComp.CanDnaBeCleaned;
+
+            if (hasRemovableDNA || totalPrintsAndFibers > 0)
+            {
+                var cleanDelay = cleanForensicsEntity.Comp.CleanDelay;
+                var doAfterArgs = new DoAfterArgs(EntityManager, user, cleanDelay, new CleanForensicsDoAfterEvent(), cleanForensicsEntity, target: target, used: cleanForensicsEntity)
                 {
                     BreakOnHandChange = true,
                     NeedHand = true,
@@ -122,10 +167,17 @@ namespace Content.Server.Forensics
                 };
 
                 _doAfterSystem.TryStartDoAfter(doAfterArgs);
-                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", args.Target)), args.User, args.User);
 
-                args.Handled = true;
+                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", target)), user, user);
+
+                return true;
             }
+            else
+            {
+                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning-cannot-clean", ("target", target)), user, user, PopupType.MediumCaution);
+                return false;
+            }
+
         }
 
         private void OnCleanForensicsDoAfter(EntityUid uid, ForensicsComponent component, CleanForensicsDoAfterEvent args)
diff --git a/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs b/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs
new file mode 100644
index 0000000000..cd15cfb8f8
--- /dev/null
+++ b/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Roles;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.GameTicking.Events;
+
+[ByRefEvent]
+public readonly record struct GetDisallowedJobsEvent(ICommonSession Player, HashSet<ProtoId<JobPrototype>> Jobs);
diff --git a/Content.Server/GameTicking/Events/IsJobAllowedEvent.cs b/Content.Server/GameTicking/Events/IsJobAllowedEvent.cs
new file mode 100644
index 0000000000..51969d61ea
--- /dev/null
+++ b/Content.Server/GameTicking/Events/IsJobAllowedEvent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Roles;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.GameTicking.Events;
+
+[ByRefEvent]
+public struct IsJobAllowedEvent(ICommonSession player, ProtoId<JobPrototype> jobId, bool cancelled = false)
+{
+    public readonly ICommonSession Player = player;
+    public readonly ProtoId<JobPrototype> JobId = jobId;
+    public bool Cancelled = cancelled;
+}
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 9f4b99c312..0cdb244df3 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -2,11 +2,11 @@ using System.Globalization;
 using System.Linq;
 using System.Numerics;
 using Content.Server.Administration.Managers;
+using Content.Server.GameTicking.Events;
 using Content.Server.Ghost;
 using Content.Server.Spawners.Components;
 using Content.Server.Speech.Components;
 using Content.Server.Station.Components;
-using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Mind;
 using Content.Shared.Players;
@@ -137,8 +137,14 @@ namespace Content.Server.GameTicking
             if (jobBans == null || jobId != null && jobBans.Contains(jobId))
                 return;
 
-            if (jobId != null && !_playTimeTrackings.IsAllowed(player, jobId))
-                return;
+            if (jobId != null)
+            {
+                var ev = new IsJobAllowedEvent(player, new ProtoId<JobPrototype>(jobId));
+                RaiseLocalEvent(ref ev);
+                if (ev.Cancelled)
+                    return;
+            }
+
             SpawnPlayer(player, character, station, jobId, lateJoin, silent);
         }
 
@@ -181,10 +187,9 @@ namespace Content.Server.GameTicking
             }
 
             // Figure out job restrictions
-            var restrictedRoles = new HashSet<string>();
-
-            var getDisallowed = _playTimeTrackings.GetDisallowedJobs(player);
-            restrictedRoles.UnionWith(getDisallowed);
+            var restrictedRoles = new HashSet<ProtoId<JobPrototype>>();
+            var ev = new GetDisallowedJobsEvent(player, restrictedRoles);
+            RaiseLocalEvent(ref ev);
 
             var jobBans = _banManager.GetJobBans(player.UserId);
             if (jobBans != null)
@@ -413,7 +418,7 @@ namespace Content.Server.GameTicking
                 {
                     var gridXform = Transform(gridUid);
 
-                    return new EntityCoordinates(gridUid, gridXform.InvWorldMatrix.Transform(toMap.Position));
+                    return new EntityCoordinates(gridUid, Vector2.Transform(toMap.Position, gridXform.InvWorldMatrix));
                 }
 
                 return spawn;
diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs
index fa23312268..d9511309b9 100644
--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/GameTicker.cs
@@ -19,7 +19,6 @@ using Content.Shared.Roles;
 using Robust.Server;
 using Robust.Server.GameObjects;
 using Robust.Server.GameStates;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
diff --git a/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs
index bb1b7c8746..54eaa6e32e 100644
--- a/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs
@@ -1,3 +1,5 @@
+using Robust.Shared.Prototypes;
+
 namespace Content.Server.GameTicking.Rules.Components;
 
 /// <summary>
@@ -5,6 +7,5 @@ namespace Content.Server.GameTicking.Rules.Components;
 /// and providing loadout + name for the operative on spawn.
 /// TODO: Remove once systems can request spawns from the ghost role system directly.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, EntityCategory("Spawner")]
 public sealed partial class NukeOperativeSpawnerComponent : Component;
-
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index d6f1c3c619..1b62778d75 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -25,6 +25,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
 using Content.Server.GameTicking.Components;
+using Content.Shared.Store.Components;
 
 namespace Content.Server.GameTicking.Rules;
 
diff --git a/Content.Server/Gatherable/GatherableSystem.cs b/Content.Server/Gatherable/GatherableSystem.cs
index 44e60cb102..d6a3be451b 100644
--- a/Content.Server/Gatherable/GatherableSystem.cs
+++ b/Content.Server/Gatherable/GatherableSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Gatherable.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Tag;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.Whitelist;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -18,6 +19,7 @@ public sealed partial class GatherableSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -30,7 +32,7 @@ public sealed partial class GatherableSystem : EntitySystem
 
     private void OnAttacked(Entity<GatherableComponent> gatherable, ref AttackedEvent args)
     {
-        if (gatherable.Comp.ToolWhitelist?.IsValid(args.Used, EntityManager) != true)
+        if (_whitelistSystem.IsWhitelistFailOrNull(gatherable.Comp.ToolWhitelist, args.Used))
             return;
 
         Gather(gatherable, args.User);
@@ -38,10 +40,14 @@ public sealed partial class GatherableSystem : EntitySystem
 
     private void OnActivate(Entity<GatherableComponent> gatherable, ref ActivateInWorldEvent args)
     {
-        if (gatherable.Comp.ToolWhitelist?.IsValid(args.User, EntityManager) != true)
+        if (args.Handled || !args.Complex)
+            return;
+
+        if (_whitelistSystem.IsWhitelistFailOrNull(gatherable.Comp.ToolWhitelist, args.User))
             return;
 
         Gather(gatherable, args.User);
+        args.Handled = true;
     }
 
     public void Gather(EntityUid gatheredUid, EntityUid? gatherer = null, GatherableComponent? component = null)
diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
index 6c2a6986fc..6116173f90 100644
--- a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Server.Ghost.Roles.Components
     /// <summary>
     ///     Allows a ghost to take this role, spawning a new entity.
     /// </summary>
-    [RegisterComponent]
+    [RegisterComponent, EntityCategory("Spawner")]
     [Access(typeof(GhostRoleSystem))]
     public sealed partial class GhostRoleMobSpawnerComponent : Component
     {
diff --git a/Content.Server/GhostKick/GhostKickManager.cs b/Content.Server/GhostKick/GhostKickManager.cs
index 7dd82970ac..40d21d79d2 100644
--- a/Content.Server/GhostKick/GhostKickManager.cs
+++ b/Content.Server/GhostKick/GhostKickManager.cs
@@ -44,7 +44,7 @@ public sealed class GhostKickManager
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class GhostKickCommand : IConsoleCommand
 {
     public string Command => "ghostkick";
diff --git a/Content.Server/Humanoid/Components/RandomHumanoidAppearanceComponent.cs b/Content.Server/Humanoid/Components/RandomHumanoidAppearanceComponent.cs
index 5a0f6fcef1..5efea024f4 100644
--- a/Content.Server/Humanoid/Components/RandomHumanoidAppearanceComponent.cs
+++ b/Content.Server/Humanoid/Components/RandomHumanoidAppearanceComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
 namespace Content.Server.CharacterAppearance.Components;
@@ -7,4 +7,8 @@ namespace Content.Server.CharacterAppearance.Components;
 public sealed partial class RandomHumanoidAppearanceComponent : Component
 {
     [DataField("randomizeName")] public bool RandomizeName = true;
+    /// <summary>
+    /// After randomizing, sets the hair style to this, if possible
+    /// </summary>
+    [DataField] public string? Hair = null;
 }
diff --git a/Content.Server/Humanoid/Components/RandomHumanoidSpawnerComponent.cs b/Content.Server/Humanoid/Components/RandomHumanoidSpawnerComponent.cs
index b56664fe19..bb38e94e04 100644
--- a/Content.Server/Humanoid/Components/RandomHumanoidSpawnerComponent.cs
+++ b/Content.Server/Humanoid/Components/RandomHumanoidSpawnerComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Server.Humanoid.Components;
 ///     This is added to a marker entity in order to spawn a randomized
 ///     humanoid ingame.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, EntityCategory("Spawner")]
 public sealed partial class RandomHumanoidSpawnerComponent : Component
 {
     [DataField("settings", customTypeSerializer: typeof(PrototypeIdSerializer<RandomHumanoidSettingsPrototype>))]
diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
index 9185fedc38..2822fb69e1 100644
--- a/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
@@ -25,6 +25,9 @@ public sealed class RandomHumanoidAppearanceSystem : EntitySystem
         }
 
         var profile = HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species);
+        //If we have a specified hair style, change it to this
+        if(component.Hair != null)
+            profile = profile.WithCharacterAppearance(profile.Appearance.WithHairStyleName(component.Hair));
 
         _humanoid.LoadProfile(uid, profile, humanoid);
 
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index e8af08b2eb..88c5fb9459 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -20,6 +20,7 @@ using Robust.Shared.Random;
 using System.Numerics;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Store.Components;
 using Robust.Shared.Collections;
 using Robust.Shared.Map.Components;
 
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index f6800f7289..c6dfcadd38 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -13,6 +13,7 @@ using Content.Server.Info;
 using Content.Server.Maps;
 using Content.Server.MoMMI;
 using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.Players.JobWhitelist;
 using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Preferences.Managers;
 using Content.Server.ServerInfo;
@@ -61,6 +62,7 @@ namespace Content.Server.IoC
             IoCManager.Register<ServerDbEntryManager>();
             IoCManager.Register<ISharedPlaytimeManager, PlayTimeTrackingManager>();
             IoCManager.Register<ServerApi>();
+            IoCManager.Register<JobWhitelistManager>();
         }
     }
 }
diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
index 813f8c407b..a5a41bcc10 100644
--- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
@@ -126,7 +126,7 @@ namespace Content.Server.Light.EntitySystems
 
         private void OnActivate(Entity<HandheldLightComponent> ent, ref ActivateInWorldEvent args)
         {
-            if (args.Handled || !ent.Comp.ToggleOnInteract)
+            if (args.Handled || !args.Complex || !ent.Comp.ToggleOnInteract)
                 return;
 
             if (ToggleStatus(args.User, ent))
diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
index 4b2ba8ffbd..c5c44056b9 100644
--- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
+++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
@@ -40,7 +40,7 @@ public sealed class MechGrabberSystem : EntitySystem
         SubscribeLocalEvent<MechGrabberComponent, MechEquipmentRemovedEvent>(OnEquipmentRemoved);
         SubscribeLocalEvent<MechGrabberComponent, AttemptRemoveMechEquipmentEvent>(OnAttemptRemove);
 
-        SubscribeLocalEvent<MechGrabberComponent, InteractNoHandEvent>(OnInteract);
+        SubscribeLocalEvent<MechGrabberComponent, UserActivateInWorldEvent>(OnInteract);
         SubscribeLocalEvent<MechGrabberComponent, GrabberDoAfterEvent>(OnMechGrab);
     }
 
@@ -123,10 +123,11 @@ public sealed class MechGrabberSystem : EntitySystem
         args.States.Add(GetNetEntity(uid), state);
     }
 
-    private void OnInteract(EntityUid uid, MechGrabberComponent component, InteractNoHandEvent args)
+    private void OnInteract(EntityUid uid, MechGrabberComponent component, UserActivateInWorldEvent args)
     {
-        if (args.Handled || args.Target is not {} target)
+        if (args.Handled)
             return;
+        var target = args.Target;
 
         if (args.Target == args.User || component.DoAfter != null)
             return;
diff --git a/Content.Server/Mech/Systems/MechAssemblySystem.cs b/Content.Server/Mech/Systems/MechAssemblySystem.cs
index e5b7bfaac3..c1fff819b4 100644
--- a/Content.Server/Mech/Systems/MechAssemblySystem.cs
+++ b/Content.Server/Mech/Systems/MechAssemblySystem.cs
@@ -14,6 +14,7 @@ namespace Content.Server.Mech.Systems;
 public sealed class MechAssemblySystem : EntitySystem
 {
     [Dependency] private readonly ContainerSystem _container = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -44,7 +45,7 @@ public sealed class MechAssemblySystem : EntitySystem
 
         foreach (var (tag, val) in component.RequiredParts)
         {
-            if (!val && tagComp.Tags.Contains(tag))
+            if (!val && _tag.HasTag(tagComp, tag))
             {
                 component.RequiredParts[tag] = true;
                 _container.Insert(args.Used, component.PartsContainer);
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 38e88f6e1e..1acbf292f0 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Server.Access.Systems;
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
@@ -366,8 +367,8 @@ public sealed class SuitSensorSystem : EntitySystem
                 if (transform.GridUid != null)
                 {
                     coordinates = new EntityCoordinates(transform.GridUid.Value,
-                        _transform.GetInvWorldMatrix(xformQuery.GetComponent(transform.GridUid.Value), xformQuery)
-                        .Transform(_transform.GetWorldPosition(transform, xformQuery)));
+                        Vector2.Transform(_transform.GetWorldPosition(transform, xformQuery),
+                            _transform.GetInvWorldMatrix(xformQuery.GetComponent(transform.GridUid.Value), xformQuery)));
                 }
                 else if (transform.MapUid != null)
                 {
diff --git a/Content.Server/Motd/SetMOTDCommand.cs b/Content.Server/Motd/SetMOTDCommand.cs
index c99f728435..3a7a5e71c6 100644
--- a/Content.Server/Motd/SetMOTDCommand.cs
+++ b/Content.Server/Motd/SetMOTDCommand.cs
@@ -12,7 +12,7 @@ namespace Content.Server.Motd;
 /// <summary>
 /// A console command usable by any user which prints or sets the Message of the Day.
 /// </summary>
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class SetMotdCommand : LocalizedCommands
 {
     [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
diff --git a/Content.Server/NPC/HTN/Preconditions/KeyExistsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/KeyExistsPrecondition.cs
index 72c4e6367f..69e265f276 100644
--- a/Content.Server/NPC/HTN/Preconditions/KeyExistsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/KeyExistsPrecondition.cs
@@ -1,8 +1,13 @@
 namespace Content.Server.NPC.HTN.Preconditions;
 
+/// <summary>
+/// Checks for the presence of the value by the specified <see cref="KeyExistsPrecondition.Key"/> in the <see cref="NPCBlackboard"/>.
+/// Returns true if there is a value.
+/// </summary>
 public sealed partial class KeyExistsPrecondition : HTNPrecondition
 {
-    [DataField("key", required: true)] public string Key = string.Empty;
+    [DataField(required: true), ViewVariables]
+    public string Key = string.Empty;
 
     public override bool IsMet(NPCBlackboard blackboard)
     {
diff --git a/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
index c12663901c..8dc38e442a 100644
--- a/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
@@ -1,8 +1,12 @@
 namespace Content.Server.NPC.HTN.Preconditions;
 
+/// <summary>
+/// Checks if there is no value at the specified  <see cref="KeyNotExistsPrecondition.Key"/> in the <see cref="NPCBlackboard"/>.
+/// Returns true if there is no value.
+/// </summary>
 public sealed partial class KeyNotExistsPrecondition : HTNPrecondition
 {
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
index 8c7920e8be..2abb351272 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
@@ -1,16 +1,17 @@
 namespace Content.Server.NPC.HTN.Preconditions.Math;
 
 /// <summary>
-/// Checks for the presence of data in the blackboard and makes a comparison with the specified boolean
+/// Checks if there is a bool value for the specified <see cref="KeyBoolEqualsPrecondition.Key"/>
+/// in the <see cref="NPCBlackboard"/> and the specified value is equal to the <see cref="KeyBoolEqualsPrecondition.Value"/>.
 /// </summary>
 public sealed partial class KeyBoolEqualsPrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
     public bool Value;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
index 802fdaf2b9..0f7e2cca2a 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
@@ -1,13 +1,17 @@
 namespace Content.Server.NPC.HTN.Preconditions.Math;
 
+/// <summary>
+/// Checks if there is a float value for the specified <see cref="KeyFloatEqualsPrecondition.Key"/>
+/// in the <see cref="NPCBlackboard"/> and the specified value is equal to the <see cref="KeyFloatEqualsPrecondition.Value"/>.
+/// </summary>
 public sealed partial class KeyFloatEqualsPrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
     public float Value;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
index 3a9ac36698..b3a27a7d5d 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
@@ -1,13 +1,17 @@
 namespace Content.Server.NPC.HTN.Preconditions.Math;
 
+/// <summary>
+/// Checks if there is a float value for the specified <see cref="KeyFloatGreaterPrecondition.Key"/>
+/// in the <see cref="NPCBlackboard"/> and the specified value is greater then <see cref="KeyFloatGreaterPrecondition.Value"/>.
+/// </summary>
 public sealed partial class KeyFloatGreaterPrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
     public float Value;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
index 5cd51d7a7c..c5eb35eebc 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
@@ -1,13 +1,17 @@
 namespace Content.Server.NPC.HTN.Preconditions.Math;
 
+/// <summary>
+/// Checks if there is a float value for the specified <see cref="KeyFloatGreaterPrecondition.Key"/>
+/// in the <see cref="NPCBlackboard"/> and the specified value is less then <see cref="KeyFloatGreaterPrecondition.Value"/>.
+/// </summary>
 public sealed partial class KeyFloatLessPrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
     public float Value;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
index 00404517c9..f8ed20544e 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
@@ -4,13 +4,14 @@ using System.Threading.Tasks;
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
 
 /// <summary>
-/// Gets the key, and adds the value to that float
+/// Added <see cref="AddFloatOperator.Amount"/> to float value for the
+/// specified <see cref="AddFloatOperator.TargetKey"/> in the <see cref="NPCBlackboard"/>.
 /// </summary>
 public sealed partial class AddFloatOperator : HTNOperator
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string TargetKey = string.Empty;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
index a40b96798d..f168326af7 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
@@ -4,11 +4,12 @@ using System.Threading.Tasks;
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
 
 /// <summary>
-/// Just sets a blackboard key to a bool
+/// Set <see cref="SetBoolOperator.Value"/> to bool value for the
+/// specified <see cref="SetFloatOperator.TargetKey"/> in the <see cref="NPCBlackboard"/>.
 /// </summary>
 public sealed partial class SetBoolOperator : HTNOperator
 {
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string TargetKey = string.Empty;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
index 76842b431f..f9b5e54fe3 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
@@ -4,11 +4,12 @@ using System.Threading.Tasks;
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
 
 /// <summary>
-/// Just sets a blackboard key to a float
+/// Set <see cref="SetFloatOperator.Amount"/> to float value for the
+/// specified <see cref="SetFloatOperator.TargetKey"/> in the <see cref="NPCBlackboard"/>.
 /// </summary>
 public sealed partial class SetFloatOperator : HTNOperator
 {
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string TargetKey = string.Empty;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
index 999756f1f7..edcab6baff 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
@@ -5,20 +5,22 @@ using Robust.Shared.Random;
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
 
 /// <summary>
-/// Sets a random float from MinAmount to MaxAmount to blackboard
+/// Set random float value between <see cref="SetRandomFloatOperator.MinAmount"/> and
+/// <see cref="SetRandomFloatOperator.MaxAmount"/> specified <see cref="SetRandomFloatOperator.TargetKey"/>
+/// in the <see cref="NPCBlackboard"/>.
 /// </summary>
 public sealed partial class SetRandomFloatOperator : HTNOperator
 {
     [Dependency] private readonly IRobustRandom _random = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string TargetKey = string.Empty;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float MaxAmount = 1f;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float MinAmount = 0f;
+    public float MinAmount;
 
     public override async Task<(bool Valid, Dictionary<string, object>? Effects)> Plan(NPCBlackboard blackboard,
         CancellationToken cancelToken)
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
index d1c7d61915..558b1fc04d 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
@@ -20,7 +20,8 @@ public sealed partial class SayKeyOperator : HTNOperator
     public override void Initialize(IEntitySystemManager sysManager)
     {
         base.Initialize(sysManager);
-        _chat = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
+
+        _chat = sysManager.GetEntitySystem<ChatSystem>();
     }
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
@@ -28,8 +29,12 @@ public sealed partial class SayKeyOperator : HTNOperator
         if (!blackboard.TryGetValue<object>(Key, out var value, _entManager))
             return HTNOperatorStatus.Failed;
 
+        var @string = value.ToString();
+        if (@string is not { })
+            return HTNOperatorStatus.Failed;
+
         var speaker = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-        _chat.TrySendInGameICMessage(speaker, value.ToString() ?? "Oh no...", InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
+        _chat.TrySendInGameICMessage(speaker, @string, InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
 
         return base.Update(blackboard, frameTime);
     }
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
index cf07831959..8a4c655a39 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
@@ -6,7 +6,7 @@ public sealed partial class SpeakOperator : HTNOperator
 {
     private ChatSystem _chat = default!;
 
-    [DataField("speech", required: true)]
+    [DataField(required: true)]
     public string Speech = string.Empty;
 
     /// <summary>
@@ -18,14 +18,15 @@ public sealed partial class SpeakOperator : HTNOperator
     public override void Initialize(IEntitySystemManager sysManager)
     {
         base.Initialize(sysManager);
-        _chat = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
+
+        _chat = sysManager.GetEntitySystem<ChatSystem>();
     }
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
     {
         var speaker = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-
         _chat.TrySendInGameICMessage(speaker, Loc.GetString(Speech), InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
+
         return base.Update(blackboard, frameTime);
     }
 }
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
index 5daf38c420..b986ed5259 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
@@ -36,7 +36,7 @@ public sealed partial class PathfindingSystem
                 return Vector2.Zero;
             }
 
-            endPos = startXform.InvWorldMatrix.Transform(endXform.WorldMatrix.Transform(endPos));
+            endPos = Vector2.Transform(Vector2.Transform(endPos, endXform.WorldMatrix), startXform.InvWorldMatrix);
         }
 
         // TODO: Numerics when we changeover.
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
index 52f7db77ed..f4af65c617 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
@@ -395,7 +395,7 @@ public sealed partial class PathfindingSystem
 
     private Vector2i GetOrigin(EntityCoordinates coordinates, EntityUid gridUid)
     {
-        var localPos = _transform.GetInvWorldMatrix(gridUid).Transform(coordinates.ToMapPos(EntityManager, _transform));
+        var localPos = Vector2.Transform(coordinates.ToMapPos(EntityManager, _transform), _transform.GetInvWorldMatrix(gridUid));
         return new Vector2i((int) Math.Floor(localPos.X / ChunkSize), (int) Math.Floor(localPos.Y / ChunkSize));
     }
 
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
index 3672ad047b..b2958f0ccb 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
@@ -405,7 +405,7 @@ namespace Content.Server.NPC.Pathfinding
                 return null;
             }
 
-            var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager, _transform));
+            var localPos = Vector2.Transform(coordinates.ToMapPos(EntityManager, _transform), xform.InvWorldMatrix);
             var origin = GetOrigin(localPos);
 
             if (!TryGetChunk(origin, comp, out var chunk))
diff --git a/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs b/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs
index cfd3b08c61..c3e0328037 100644
--- a/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs
+++ b/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Shared.NPC.Components;
 using Content.Shared.NPC.Systems;
+using Content.Shared.Whitelist;
 using Robust.Shared.Collections;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
@@ -13,6 +14,7 @@ public sealed partial class NPCImprintingOnSpawnBehaviourSystem : SharedNPCImpri
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly NPCSystem _npc = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -27,7 +29,7 @@ public sealed partial class NPCImprintingOnSpawnBehaviourSystem : SharedNPCImpri
 
         foreach (var friend in friends)
         {
-            if (imprinting.Comp.Whitelist?.IsValid(friend) != false)
+            if (_whitelistSystem.IsWhitelistPassOrNull(imprinting.Comp.Whitelist, friend))
             {
                 AddImprintingTarget(imprinting, friend, imprinting.Comp);
             }
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 2e8c628b50..ca74d71335 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -19,6 +19,7 @@ using Content.Shared.Tools.Systems;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Whitelist;
 using Microsoft.Extensions.ObjectPool;
 using Robust.Server.Containers;
 using Robust.Shared.Prototypes;
@@ -46,6 +47,7 @@ public sealed class NPCUtilitySystem : EntitySystem
     [Dependency] private readonly SolutionContainerSystem _solutions = default!;
     [Dependency] private readonly WeldableSystem _weldable = default!;
     [Dependency] private readonly ExamineSystemShared _examine = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private EntityQuery<PuddleComponent> _puddleQuery;
     private EntityQuery<TransformComponent> _xformQuery;
@@ -249,7 +251,7 @@ public sealed class NPCUtilitySystem : EntitySystem
                     return 0f;
                 }
 
-                if (heldGun.Whitelist?.IsValid(targetUid, EntityManager) != true)
+                if (_whitelistSystem.IsWhitelistFailOrNull(heldGun.Whitelist, targetUid))
                 {
                     return 0f;
                 }
diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
index d0fcd11359..cd05413405 100644
--- a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Interaction.Components;
 using Content.Server.Popups;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.AnimalHusbandry;
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
index 4e672444d1..510b9552a3 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
@@ -18,7 +18,7 @@ namespace Content.Server.Nutrition.EntitySystems
 
         private void OnCigarActivatedEvent(Entity<CigarComponent> entity, ref ActivateInWorldEvent args)
         {
-            if (args.Handled)
+            if (args.Handled || !args.Complex)
                 return;
 
             if (!EntityManager.TryGetComponent(entity, out SmokableComponent? smokable))
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index d4934ee24e..43bf571eb4 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -8,6 +8,7 @@ using Content.Server.PDA.Ringer;
 using Content.Server.Station.Systems;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
+using Content.Server.Traitor.Uplink;
 using Content.Shared.Access.Components;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.Chat;
@@ -15,6 +16,7 @@ using Content.Shared.Light;
 using Content.Shared.Light.Components;
 using Content.Shared.Light.EntitySystems;
 using Content.Shared.PDA;
+using Content.Shared.Store.Components;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -152,7 +154,7 @@ namespace Content.Server.PDA
 
             var address = GetDeviceNetAddress(uid);
             var hasInstrument = HasComp<InstrumentComponent>(uid);
-            var showUplink = HasComp<StoreComponent>(uid) && IsUnlocked(uid);
+            var showUplink = HasComp<UplinkComponent>(uid) && IsUnlocked(uid);
 
             UpdateStationName(uid, pda);
             UpdateAlertLevel(uid, pda);
@@ -237,8 +239,8 @@ namespace Content.Server.PDA
                 return;
 
             // check if its locked again to prevent malicious clients opening locked uplinks
-            if (TryComp<StoreComponent>(uid, out var store) && IsUnlocked(uid))
-                _store.ToggleUi(msg.Actor, uid, store);
+            if (HasComp<UplinkComponent>(uid) && IsUnlocked(uid))
+                _store.ToggleUi(msg.Actor, uid);
         }
 
         private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaLockUplinkMessage msg)
diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs
index 47ae41896e..e15dcfaa2b 100644
--- a/Content.Server/PDA/Ringer/RingerSystem.cs
+++ b/Content.Server/PDA/Ringer/RingerSystem.cs
@@ -6,6 +6,7 @@ using Content.Shared.PDA;
 using Content.Shared.PDA.Ringer;
 using Content.Shared.Popups;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Network;
diff --git a/Content.Server/Pinpointer/PinpointerSystem.cs b/Content.Server/Pinpointer/PinpointerSystem.cs
index be9a715d5d..eebf9cbbfd 100644
--- a/Content.Server/Pinpointer/PinpointerSystem.cs
+++ b/Content.Server/Pinpointer/PinpointerSystem.cs
@@ -45,10 +45,15 @@ public sealed class PinpointerSystem : SharedPinpointerSystem
 
     private void OnActivate(EntityUid uid, PinpointerComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         TogglePinpointer(uid, component);
 
         if (!component.CanRetarget)
             LocateTarget(uid, component);
+
+        args.Handled = true;
     }
 
     private void OnLocateTarget(ref FTLCompletedEvent ev)
diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
new file mode 100644
index 0000000000..04289a4098
--- /dev/null
+++ b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
@@ -0,0 +1,114 @@
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Content.Server.Database;
+using Content.Shared.CCVar;
+using Content.Shared.Players.JobWhitelist;
+using Content.Shared.Roles;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Serilog;
+
+namespace Content.Server.Players.JobWhitelist;
+
+public sealed class JobWhitelistManager : IPostInjectInit
+{
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+    [Dependency] private readonly UserDbDataManager _userDb = default!;
+
+    private readonly Dictionary<NetUserId, HashSet<string>> _whitelists = new();
+
+    public void Initialize()
+    {
+        _net.RegisterNetMessage<MsgJobWhitelist>();
+    }
+
+    private async Task LoadData(ICommonSession session, CancellationToken cancel)
+    {
+        var whitelists = await _db.GetJobWhitelists(session.UserId, cancel);
+        cancel.ThrowIfCancellationRequested();
+        _whitelists[session.UserId] = whitelists.ToHashSet();
+    }
+
+    private void FinishLoad(ICommonSession session)
+    {
+        SendJobWhitelist(session);
+    }
+
+    private void ClientDisconnected(ICommonSession session)
+    {
+        _whitelists.Remove(session.UserId);
+    }
+
+    public async void AddWhitelist(NetUserId player, ProtoId<JobPrototype> job)
+    {
+        if (_whitelists.TryGetValue(player, out var whitelists))
+            whitelists.Add(job);
+
+        await _db.AddJobWhitelist(player, job);
+
+        if (_player.TryGetSessionById(player, out var session))
+            SendJobWhitelist(session);
+    }
+
+    public bool IsAllowed(ICommonSession session, ProtoId<JobPrototype> job)
+    {
+        if (!_config.GetCVar(CCVars.GameRoleWhitelist))
+            return true;
+
+        if (!_prototypes.TryIndex(job, out var jobPrototype) ||
+            !jobPrototype.Whitelisted)
+        {
+            return true;
+        }
+
+        return IsWhitelisted(session.UserId, job);
+    }
+
+    public bool IsWhitelisted(NetUserId player, ProtoId<JobPrototype> job)
+    {
+        if (!_whitelists.TryGetValue(player, out var whitelists))
+        {
+            Log.Error("Unable to check if player {Player} is whitelisted for {Job}. Stack trace:\\n{StackTrace}",
+                player,
+                job,
+                Environment.StackTrace);
+            return false;
+        }
+
+        return whitelists.Contains(job);
+    }
+
+    public async void RemoveWhitelist(NetUserId player, ProtoId<JobPrototype> job)
+    {
+        _whitelists.GetValueOrDefault(player)?.Remove(job);
+        await _db.RemoveJobWhitelist(player, job);
+
+        if (_player.TryGetSessionById(new NetUserId(player), out var session))
+            SendJobWhitelist(session);
+    }
+
+    public void SendJobWhitelist(ICommonSession player)
+    {
+        var msg = new MsgJobWhitelist
+        {
+            Whitelist = _whitelists.GetValueOrDefault(player.UserId) ?? new HashSet<string>()
+        };
+
+        _net.ServerSendMessage(msg, player.Channel);
+    }
+
+    void IPostInjectInit.PostInject()
+    {
+        _userDb.AddOnLoadPlayer(LoadData);
+        _userDb.AddOnFinishLoad(FinishLoad);
+        _userDb.AddOnPlayerDisconnect(ClientDisconnected);
+    }
+}
diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs b/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs
new file mode 100644
index 0000000000..aaada99dea
--- /dev/null
+++ b/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs
@@ -0,0 +1,83 @@
+using System.Collections.Immutable;
+using Content.Server.GameTicking.Events;
+using Content.Server.Station.Events;
+using Content.Shared.CCVar;
+using Content.Shared.Roles;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Players.JobWhitelist;
+
+public sealed class JobWhitelistSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly JobWhitelistManager _manager = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+
+    private ImmutableArray<ProtoId<JobPrototype>> _whitelistedJobs = [];
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+        SubscribeLocalEvent<StationJobsGetCandidatesEvent>(OnStationJobsGetCandidates);
+        SubscribeLocalEvent<IsJobAllowedEvent>(OnIsJobAllowed);
+        SubscribeLocalEvent<GetDisallowedJobsEvent>(OnGetDisallowedJobs);
+
+        CacheJobs();
+    }
+
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs ev)
+    {
+        if (ev.WasModified<JobPrototype>())
+            CacheJobs();
+    }
+
+    private void OnStationJobsGetCandidates(ref StationJobsGetCandidatesEvent ev)
+    {
+        if (!_config.GetCVar(CCVars.GameRoleWhitelist))
+            return;
+
+        for (var i = ev.Jobs.Count - 1; i >= 0; i--)
+        {
+            var jobId = ev.Jobs[i];
+            if (_player.TryGetSessionById(ev.Player, out var player) &&
+                !_manager.IsAllowed(player, jobId))
+            {
+                ev.Jobs.RemoveSwap(i);
+            }
+        }
+    }
+
+    private void OnIsJobAllowed(ref IsJobAllowedEvent ev)
+    {
+        if (!_manager.IsAllowed(ev.Player, ev.JobId))
+            ev.Cancelled = true;
+    }
+
+    private void OnGetDisallowedJobs(ref GetDisallowedJobsEvent ev)
+    {
+        if (!_config.GetCVar(CCVars.GameRoleWhitelist))
+            return;
+
+        foreach (var job in _whitelistedJobs)
+        {
+            if (!_manager.IsAllowed(ev.Player, job))
+                ev.Jobs.Add(job);
+        }
+    }
+
+    private void CacheJobs()
+    {
+        var builder = ImmutableArray.CreateBuilder<ProtoId<JobPrototype>>();
+        foreach (var job in _prototypes.EnumeratePrototypes<JobPrototype>())
+        {
+            if (job.Whitelisted)
+                builder.Add(job.ID);
+        }
+
+        _whitelistedJobs = builder.ToImmutable();
+    }
+}
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index c638c2f240..bfd6172f4c 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -54,7 +54,7 @@ public delegate void CalcPlayTimeTrackersCallback(ICommonSession player, HashSet
 /// Operations like refreshing and sending play time info to clients are deferred until the next frame (note: not tick).
 /// </para>
 /// </remarks>
-public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager
+public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager, IPostInjectInit
 {
     [Dependency] private readonly IServerDbManager _db = default!;
     [Dependency] private readonly IServerNetManager _net = default!;
@@ -62,6 +62,7 @@ public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly ITaskManager _task = default!;
     [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
+    [Dependency] private readonly UserDbDataManager _userDb = default!;
 
     private ISawmill _sawmill = default!;
 
@@ -445,4 +446,10 @@ public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager
         /// </summary>
         public readonly HashSet<string> DbTrackersDirty = new();
     }
+
+    void IPostInjectInit.PostInject()
+    {
+        _userDb.AddOnLoadPlayer(LoadData);
+        _userDb.AddOnPlayerDisconnect(ClientDisconnected);
+    }
 }
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
index e594e4de26..c3142a709a 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -4,7 +4,9 @@ using Content.Server.Administration.Managers;
 using Content.Server.Afk;
 using Content.Server.Afk.Events;
 using Content.Server.GameTicking;
+using Content.Server.GameTicking.Events;
 using Content.Server.Mind;
+using Content.Server.Station.Events;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Mobs;
@@ -12,7 +14,6 @@ using Content.Shared.Mobs.Components;
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Roles;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
@@ -50,6 +51,9 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
         SubscribeLocalEvent<UnAFKEvent>(OnUnAFK);
         SubscribeLocalEvent<MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
+        SubscribeLocalEvent<StationJobsGetCandidatesEvent>(OnStationJobsGetCandidates);
+        SubscribeLocalEvent<IsJobAllowedEvent>(OnIsJobAllowed);
+        SubscribeLocalEvent<GetDisallowedJobsEvent>(OnGetDisallowedJobs);
         _adminManager.OnPermsChanged += AdminPermsChanged;
     }
 
@@ -174,6 +178,22 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
         _tracking.QueueSendTimers(ev.PlayerSession);
     }
 
+    private void OnStationJobsGetCandidates(ref StationJobsGetCandidatesEvent ev)
+    {
+        RemoveDisallowedJobs(ev.Player, ev.Jobs);
+    }
+
+    private void OnIsJobAllowed(ref IsJobAllowedEvent ev)
+    {
+        if (!IsAllowed(ev.Player, ev.JobId))
+            ev.Cancelled = true;
+    }
+
+    private void OnGetDisallowedJobs(ref GetDisallowedJobsEvent ev)
+    {
+        ev.Jobs.UnionWith(GetDisallowedJobs(ev.Player));
+    }
+
     public bool IsAllowed(ICommonSession player, string role)
     {
         if (!_prototypes.TryIndex<JobPrototype>(role, out var job) ||
@@ -190,9 +210,9 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
         return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes);
     }
 
-    public HashSet<string> GetDisallowedJobs(ICommonSession player)
+    public HashSet<ProtoId<JobPrototype>> GetDisallowedJobs(ICommonSession player)
     {
-        var roles = new HashSet<string>();
+        var roles = new HashSet<ProtoId<JobPrototype>>();
         if (!_cfg.GetCVar(CCVars.GameRoleTimers))
             return roles;
 
@@ -222,7 +242,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
         return roles;
     }
 
-    public void RemoveDisallowedJobs(NetUserId userId, ref List<string> jobs)
+    public void RemoveDisallowedJobs(NetUserId userId, List<ProtoId<JobPrototype>> jobs)
     {
         if (!_cfg.GetCVar(CCVars.GameRoleTimers))
             return;
@@ -239,7 +259,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
         {
             var job = jobs[i];
 
-            if (!_prototypes.TryIndex<JobPrototype>(job, out var jobber) ||
+            if (!_prototypes.TryIndex(job, out var jobber) ||
                 jobber.Requirements == null ||
                 jobber.Requirements.Count == 0)
                 continue;
diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index 1ff13a24f2..038295eac1 100644
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -10,6 +10,7 @@ using Robust.Shared.Containers;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Storage.Components;
 using Robust.Server.Containers;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Power.EntitySystems;
 
@@ -20,6 +21,7 @@ internal sealed class ChargerSystem : EntitySystem
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -208,7 +210,7 @@ internal sealed class ChargerSystem : EntitySystem
         if (!receiverComponent.Powered)
             return;
 
-        if (component.Whitelist?.IsValid(targetEntity, EntityManager) == false)
+        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, targetEntity))
             return;
 
         if (!SearchForBattery(targetEntity, out var batteryUid, out var heldBattery))
diff --git a/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs b/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
index 0afd86679b..12118968b7 100644
--- a/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
+++ b/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using Robust.Shared.Utility;
 using System.Linq;
 using Robust.Shared.Threading;
@@ -37,6 +38,7 @@ namespace Content.Server.Power.Pow3r
             DebugTools.Assert(state.GroupedNets.Select(x => x.Count).Sum() == state.Networks.Count);
             _networkJob.State = state;
             _networkJob.FrameTime = frameTime;
+            ValidateNetworkGroups(state, state.GroupedNets);
 
             // Each network height layer can be run in parallel without issues.
             foreach (var group in state.GroupedNets)
@@ -321,9 +323,69 @@ namespace Content.Server.Power.Pow3r
                     RecursivelyEstimateNetworkDepth(state, network, groupedNetworks);
             }
 
+            ValidateNetworkGroups(state, groupedNetworks);
             return groupedNetworks;
         }
 
+        /// <summary>
+        /// Validate that network grouping is up to date. I.e., that it is safe to solve each networking in a given
+        /// group in parallel. This assumes that batteries are the only device that connects to multiple networks, and
+        /// is thus the only obstacle to solving everything in parallel.
+        /// </summary>
+        [Conditional("DEBUG")]
+        private void ValidateNetworkGroups(PowerState state, List<List<Network>> groupedNetworks)
+        {
+            HashSet<Network> nets = new();
+            HashSet<NodeId> netIds = new();
+            foreach (var layer in groupedNetworks)
+            {
+                nets.Clear();
+                netIds.Clear();
+
+                foreach (var net in layer)
+                {
+                    foreach (var batteryId in net.BatteryLoads)
+                    {
+                        var battery = state.Batteries[batteryId];
+                        if (battery.LinkedNetworkDischarging == default)
+                            continue;
+
+                        var subNet = state.Networks[battery.LinkedNetworkDischarging];
+                        if (battery.LinkedNetworkDischarging == net.Id)
+                        {
+                            DebugTools.Assert(subNet == net);
+                            continue;
+                        }
+
+                        DebugTools.Assert(!nets.Contains(subNet));
+                        DebugTools.Assert(!netIds.Contains(subNet.Id));
+                        DebugTools.Assert(subNet.Height < net.Height);
+                    }
+
+                    foreach (var batteryId in net.BatterySupplies)
+                    {
+                        var battery = state.Batteries[batteryId];
+                        if (battery.LinkedNetworkCharging == default)
+                            continue;
+
+                        var parentNet = state.Networks[battery.LinkedNetworkCharging];
+                        if (battery.LinkedNetworkCharging == net.Id)
+                        {
+                            DebugTools.Assert(parentNet == net);
+                            continue;
+                        }
+
+                        DebugTools.Assert(!nets.Contains(parentNet));
+                        DebugTools.Assert(!netIds.Contains(parentNet.Id));
+                        DebugTools.Assert(parentNet.Height > net.Height);
+                    }
+
+                    DebugTools.Assert(nets.Add(net));
+                    DebugTools.Assert(netIds.Add(net.Id));
+                }
+            }
+        }
+
         private static void RecursivelyEstimateNetworkDepth(PowerState state, Network network, List<List<Network>> groupedNetworks)
         {
             network.Height = -2;
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index e32af589e9..f7c15a2340 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -3,26 +3,21 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Database;
-using Content.Server.Humanoid;
 using Content.Shared.CCVar;
-using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
-using Content.Shared.Roles;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-
 namespace Content.Server.Preferences.Managers
 {
     /// <summary>
     /// Sends <see cref="MsgPreferencesAndSettings"/> before the client joins the lobby.
     /// Receives <see cref="MsgSelectCharacter"/> and <see cref="MsgUpdateCharacter"/> at any time.
     /// </summary>
-    public sealed class ServerPreferencesManager : IServerPreferencesManager
+    public sealed class ServerPreferencesManager : IServerPreferencesManager, IPostInjectInit
     {
         [Dependency] private readonly IServerNetManager _netManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
@@ -30,6 +25,7 @@ namespace Content.Server.Preferences.Managers
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IDependencyCollection _dependencies = default!;
         [Dependency] private readonly ILogManager _log = default!;
+        [Dependency] private readonly UserDbDataManager _userDb = default!;
 
         // Cache player prefs on the server so we don't need as much async hell related to them.
         private readonly Dictionary<NetUserId, PlayerPrefData> _cachedPlayerPrefs =
@@ -326,5 +322,12 @@ namespace Content.Server.Preferences.Managers
             public bool PrefsLoaded;
             public PlayerPreferences? Prefs;
         }
+
+        void IPostInjectInit.PostInject()
+        {
+            _userDb.AddOnLoadPlayer(LoadData);
+            _userDb.AddOnFinishLoad(FinishLoad);
+            _userDb.AddOnPlayerDisconnect(OnClientDisconnected);
+        }
     }
 }
diff --git a/Content.Server/Procedural/DungeonJob.PostGen.cs b/Content.Server/Procedural/DungeonJob.PostGen.cs
index b326bcc378..cb9e64f04e 100644
--- a/Content.Server/Procedural/DungeonJob.PostGen.cs
+++ b/Content.Server/Procedural/DungeonJob.PostGen.cs
@@ -13,6 +13,7 @@ using Robust.Shared.Collections;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -24,13 +25,15 @@ public sealed partial class DungeonJob
      * Run after the main dungeon generation
      */
 
+    private static readonly ProtoId<TagPrototype> WallTag = "Wall";
+
     private bool HasWall(MapGridComponent grid, Vector2i tile)
     {
         var anchored = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
 
         while (anchored.MoveNext(out var uid))
         {
-            if (_tagQuery.TryGetComponent(uid, out var tagComp) && tagComp.Tags.Contains("Wall"))
+            if (_tag.HasTag(uid.Value, WallTag))
                 return true;
         }
 
diff --git a/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs b/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
index 1783a56790..a19f7e4701 100644
--- a/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
+++ b/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
@@ -19,7 +19,7 @@ public sealed partial class DungeonJob
         var gen = _prototype.Index<DungeonPresetPrototype>(preset);
 
         var dungeonRotation = _dungeon.GetDungeonRotation(seed);
-        var dungeonTransform = Matrix3.CreateTransform(_position, dungeonRotation);
+        var dungeonTransform = Matrix3Helpers.CreateTransform(_position, dungeonRotation);
         var roomPackProtos = new Dictionary<Vector2i, List<DungeonRoomPackPrototype>>();
 
         foreach (var pack in _prototype.EnumeratePrototypes<DungeonRoomPackPrototype>())
@@ -69,7 +69,7 @@ public sealed partial class DungeonJob
         var dungeon = new Dungeon();
         var availablePacks = new List<DungeonRoomPackPrototype>();
         var chosenPacks = new DungeonRoomPackPrototype?[gen.RoomPacks.Count];
-        var packTransforms = new Matrix3[gen.RoomPacks.Count];
+        var packTransforms = new Matrix3x2[gen.RoomPacks.Count];
         var packRotations = new Angle[gen.RoomPacks.Count];
 
         // Actually pick the room packs and rooms
@@ -97,7 +97,7 @@ public sealed partial class DungeonJob
 
             // Iterate every pack
             random.Shuffle(availablePacks);
-            Matrix3 packTransform = default!;
+            Matrix3x2 packTransform = default!;
             var found = false;
             DungeonRoomPackPrototype pack = default!;
 
@@ -128,7 +128,7 @@ public sealed partial class DungeonJob
                     var aRotation = dir.AsDir().ToAngle();
 
                     // Use this pack
-                    packTransform = Matrix3.CreateTransform(bounds.Center, aRotation);
+                    packTransform = Matrix3Helpers.CreateTransform(bounds.Center, aRotation);
                     packRotations[i] = aRotation;
                     pack = aPack;
                     break;
@@ -168,7 +168,7 @@ public sealed partial class DungeonJob
             {
                 var roomDimensions = new Vector2i(roomSize.Width, roomSize.Height);
                 Angle roomRotation = Angle.Zero;
-                Matrix3 matty;
+                Matrix3x2 matty;
 
                 if (!roomProtos.TryGetValue(roomDimensions, out var roomProto))
                 {
@@ -176,13 +176,13 @@ public sealed partial class DungeonJob
 
                     if (!roomProtos.TryGetValue(roomDimensions, out roomProto))
                     {
-                        Matrix3.Multiply(packTransform, dungeonTransform, out matty);
+                        matty = Matrix3x2.Multiply(packTransform, dungeonTransform);
 
                         for (var x = roomSize.Left; x < roomSize.Right; x++)
                         {
                             for (var y = roomSize.Bottom; y < roomSize.Top; y++)
                             {
-                                var index = matty.Transform(new Vector2(x, y) + grid.TileSizeHalfVector - packCenter).Floored();
+                                var index = Vector2.Transform(new Vector2(x, y) + grid.TileSizeHalfVector - packCenter, matty).Floored();
                                 tiles.Add((index, new Tile(_tileDefManager["FloorPlanetGrass"].TileId)));
                             }
                         }
@@ -209,10 +209,10 @@ public sealed partial class DungeonJob
                     roomRotation += Math.PI;
                 }
 
-                var roomTransform = Matrix3.CreateTransform(roomSize.Center - packCenter, roomRotation);
+                var roomTransform = Matrix3Helpers.CreateTransform(roomSize.Center - packCenter, roomRotation);
 
-                Matrix3.Multiply(roomTransform, packTransform, out matty);
-                Matrix3.Multiply(matty, dungeonTransform, out var dungeonMatty);
+                matty = Matrix3x2.Multiply(roomTransform, packTransform);
+                var dungeonMatty = Matrix3x2.Multiply(matty, dungeonTransform);
 
                 // The expensive bit yippy.
                 _dungeon.SpawnRoom(gridUid, grid, dungeonMatty, room);
@@ -232,7 +232,7 @@ public sealed partial class DungeonJob
                             continue;
                         }
 
-                        var tilePos = dungeonMatty.Transform(new Vector2i(x + room.Offset.X, y + room.Offset.Y) + tileOffset);
+                        var tilePos = Vector2.Transform(new Vector2i(x + room.Offset.X, y + room.Offset.Y) + tileOffset, dungeonMatty);
                         exterior.Add(tilePos.Floored());
                     }
                 }
@@ -244,7 +244,7 @@ public sealed partial class DungeonJob
                     for (var y = 0; y < room.Size.Y; y++)
                     {
                         var roomTile = new Vector2i(x + room.Offset.X, y + room.Offset.Y);
-                        var tilePos = dungeonMatty.Transform(roomTile + tileOffset);
+                        var tilePos = Vector2.Transform(roomTile + tileOffset, dungeonMatty);
                         var tileIndex = tilePos.Floored();
                         roomTiles.Add(tileIndex);
 
diff --git a/Content.Server/Procedural/DungeonJob.cs b/Content.Server/Procedural/DungeonJob.cs
index 8fecf1c9e8..bf2822ff42 100644
--- a/Content.Server/Procedural/DungeonJob.cs
+++ b/Content.Server/Procedural/DungeonJob.cs
@@ -28,10 +28,10 @@ public sealed partial class DungeonJob : Job<Dungeon>
     private readonly DecalSystem _decals;
     private readonly DungeonSystem _dungeon;
     private readonly EntityLookupSystem _lookup;
+    private readonly TagSystem _tag;
     private readonly TileSystem _tile;
     private readonly SharedMapSystem _maps;
     private readonly SharedTransformSystem _transform;
-    private EntityQuery<TagComponent> _tagQuery;
 
     private readonly DungeonConfigPrototype _gen;
     private readonly int _seed;
@@ -53,6 +53,7 @@ public sealed partial class DungeonJob : Job<Dungeon>
         DecalSystem decals,
         DungeonSystem dungeon,
         EntityLookupSystem lookup,
+        TagSystem tag,
         TileSystem tile,
         SharedTransformSystem transform,
         DungeonConfigPrototype gen,
@@ -72,10 +73,10 @@ public sealed partial class DungeonJob : Job<Dungeon>
         _decals = decals;
         _dungeon = dungeon;
         _lookup = lookup;
+        _tag = tag;
         _tile = tile;
         _maps = _entManager.System<SharedMapSystem>();
         _transform = transform;
-        _tagQuery = _entManager.GetEntityQuery<TagComponent>();
 
         _gen = gen;
         _grid = grid;
diff --git a/Content.Server/Procedural/DungeonSystem.Rooms.cs b/Content.Server/Procedural/DungeonSystem.Rooms.cs
index 03bcc2b4b1..5b4de34906 100644
--- a/Content.Server/Procedural/DungeonSystem.Rooms.cs
+++ b/Content.Server/Procedural/DungeonSystem.Rooms.cs
@@ -67,7 +67,7 @@ public sealed partial class DungeonSystem
         bool clearExisting = false,
         bool rotation = false)
     {
-        var originTransform = Matrix3.CreateTranslation(origin);
+        var originTransform = Matrix3Helpers.CreateTranslation(origin.X, origin.Y);
         var roomRotation = Angle.Zero;
 
         if (rotation)
@@ -75,8 +75,8 @@ public sealed partial class DungeonSystem
             roomRotation = GetRoomRotation(room, random);
         }
 
-        var roomTransform = Matrix3.CreateTransform((Vector2) room.Size / 2f, roomRotation);
-        Matrix3.Multiply(roomTransform, originTransform, out var finalTransform);
+        var roomTransform = Matrix3Helpers.CreateTransform((Vector2) room.Size / 2f, roomRotation);
+        var finalTransform = Matrix3x2.Multiply(roomTransform, originTransform);
 
         SpawnRoom(gridUid, grid, finalTransform, room, clearExisting);
     }
@@ -101,7 +101,7 @@ public sealed partial class DungeonSystem
     public void SpawnRoom(
         EntityUid gridUid,
         MapGridComponent grid,
-        Matrix3 roomTransform,
+        Matrix3x2 roomTransform,
         DungeonRoomPrototype room,
         bool clearExisting = false)
     {
@@ -116,7 +116,7 @@ public sealed partial class DungeonSystem
         // go BRRNNTTT on existing stuff
         if (clearExisting)
         {
-            var gridBounds = new Box2(roomTransform.Transform(Vector2.Zero), roomTransform.Transform(room.Size));
+            var gridBounds = new Box2(Vector2.Transform(Vector2.Zero, roomTransform), Vector2.Transform(room.Size, roomTransform));
             _entitySet.Clear();
             // Polygon skin moment
             gridBounds = gridBounds.Enlarged(-0.05f);
@@ -148,7 +148,7 @@ public sealed partial class DungeonSystem
                 var indices = new Vector2i(x + room.Offset.X, y + room.Offset.Y);
                 var tileRef = _maps.GetTileRef(templateMapUid, templateGrid, indices);
 
-                var tilePos = roomTransform.Transform(indices + tileOffset);
+                var tilePos = Vector2.Transform(indices + tileOffset, roomTransform);
                 var rounded = tilePos.Floored();
                 _tiles.Add((rounded, tileRef.Tile));
             }
@@ -164,7 +164,7 @@ public sealed partial class DungeonSystem
         foreach (var templateEnt in _lookup.GetEntitiesIntersecting(templateMapUid, bounds, LookupFlags.Uncontained))
         {
             var templateXform = _xformQuery.GetComponent(templateEnt);
-            var childPos = roomTransform.Transform(templateXform.LocalPosition - roomCenter);
+            var childPos = Vector2.Transform(templateXform.LocalPosition - roomCenter, roomTransform);
             var childRot = templateXform.LocalRotation + finalRoomRotation;
             var protoId = _metaQuery.GetComponent(templateEnt).EntityPrototype?.ID;
 
@@ -192,7 +192,7 @@ public sealed partial class DungeonSystem
                 // Offset by 0.5 because decals are offset from bot-left corner
                 // So we convert it to center of tile then convert it back again after transform.
                 // Do these shenanigans because 32x32 decals assume as they are centered on bottom-left of tiles.
-                var position = roomTransform.Transform(decal.Coordinates + Vector2Helpers.Half - roomCenter);
+                var position = Vector2.Transform(decal.Coordinates + Vector2Helpers.Half - roomCenter, roomTransform);
                 position -= Vector2Helpers.Half;
 
                 // Umm uhh I love decals so uhhhh idk what to do about this
diff --git a/Content.Server/Procedural/DungeonSystem.cs b/Content.Server/Procedural/DungeonSystem.cs
index 069508bcbb..36009896a2 100644
--- a/Content.Server/Procedural/DungeonSystem.cs
+++ b/Content.Server/Procedural/DungeonSystem.cs
@@ -10,6 +10,7 @@ using Content.Shared.GameTicking;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Procedural;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
@@ -31,6 +32,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
     [Dependency] private readonly AnchorableSystem _anchorable = default!;
     [Dependency] private readonly DecalSystem _decals = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly TileSystem _tile = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly SharedMapSystem _maps = default!;
@@ -199,6 +201,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
             _decals,
             this,
             _lookup,
+            _tag,
             _tile,
             _transform,
             gen,
@@ -231,6 +234,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
             _decals,
             this,
             _lookup,
+            _tag,
             _tile,
             _transform,
             gen,
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index f8c8ef64b7..970536f42b 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -51,7 +51,7 @@ public sealed class ProjectileSystem : SharedProjectileSystem
 
         if (modifiedDamage is not null && EntityManager.EntityExists(component.Shooter))
         {
-            if (modifiedDamage.Any() && !deleted)
+            if (modifiedDamage.AnyPositive() && !deleted)
             {
                 _color.RaiseEffect(Color.Red, new List<EntityUid> { target }, Filter.Pvs(target, entityManager: EntityManager));
             }
diff --git a/Content.Server/Radiation/Systems/GeigerSystem.cs b/Content.Server/Radiation/Systems/GeigerSystem.cs
index f889336a06..a0bc5dd739 100644
--- a/Content.Server/Radiation/Systems/GeigerSystem.cs
+++ b/Content.Server/Radiation/Systems/GeigerSystem.cs
@@ -35,7 +35,7 @@ public sealed class GeigerSystem : SharedGeigerSystem
 
     private void OnActivate(Entity<GeigerComponent> geiger, ref ActivateInWorldEvent args)
     {
-        if (args.Handled || geiger.Comp.AttachedToSuit)
+        if (args.Handled || !args.Complex || geiger.Comp.AttachedToSuit)
             return;
         args.Handled = true;
 
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
index b8193c4d2f..ccee7cf227 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
@@ -195,11 +195,11 @@ public partial class RadiationSystem
 
         Vector2 srcLocal = sourceTrs.ParentUid == grid.Owner
             ? sourceTrs.LocalPosition
-            : gridTrs.InvLocalMatrix.Transform(ray.Source);
+            : Vector2.Transform(ray.Source, gridTrs.InvLocalMatrix);
 
         Vector2 dstLocal = destTrs.ParentUid == grid.Owner
             ? destTrs.LocalPosition
-            : gridTrs.InvLocalMatrix.Transform(ray.Destination);
+            : Vector2.Transform(ray.Destination, gridTrs.InvLocalMatrix);
 
         Vector2i sourceGrid = new(
             (int) Math.Floor(srcLocal.X / grid.Comp.TileSize),
diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index 4f58cb21e1..223d0e47c0 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -67,6 +67,9 @@ public sealed class JammerSystem : SharedJammerSystem
 
     private void OnActivate(EntityUid uid, RadioJammerComponent comp, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         var activated = !HasComp<ActiveRadioJammerComponent>(uid) &&
             _powerCell.TryGetBatteryFromSlot(uid, out var battery) &&
             battery.CurrentCharge > GetCurrentWattage(comp);
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 56c5d8e548..8484fb2336 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -81,6 +81,9 @@ public sealed class RadioDeviceSystem : EntitySystem
     #region Toggling
     private void OnActivateMicrophone(EntityUid uid, RadioMicrophoneComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!component.ToggleOnInteract)
             return;
 
@@ -90,6 +93,9 @@ public sealed class RadioDeviceSystem : EntitySystem
 
     private void OnActivateSpeaker(EntityUid uid, RadioSpeakerComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!component.ToggleOnInteract)
             return;
 
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 4106630d52..c889d59f15 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -28,6 +28,7 @@ using Content.Shared.Revenant.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Utility;
 using Robust.Shared.Map.Components;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Revenant.EntitySystems;
 
@@ -40,10 +41,11 @@ public sealed partial class RevenantSystem
     [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
     [Dependency] private readonly GhostSystem _ghost = default!;
     [Dependency] private readonly TileSystem _tile = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private void InitializeAbilities()
     {
-        SubscribeLocalEvent<RevenantComponent, InteractNoHandEvent>(OnInteract);
+        SubscribeLocalEvent<RevenantComponent, UserActivateInWorldEvent>(OnInteract);
         SubscribeLocalEvent<RevenantComponent, SoulEvent>(OnSoulSearch);
         SubscribeLocalEvent<RevenantComponent, HarvestEvent>(OnHarvest);
 
@@ -53,11 +55,14 @@ public sealed partial class RevenantSystem
         SubscribeLocalEvent<RevenantComponent, RevenantMalfunctionActionEvent>(OnMalfunctionAction);
     }
 
-    private void OnInteract(EntityUid uid, RevenantComponent component, InteractNoHandEvent args)
+    private void OnInteract(EntityUid uid, RevenantComponent component, UserActivateInWorldEvent args)
     {
-        if (args.Target == args.User || args.Target == null)
+        if (args.Handled)
             return;
-        var target = args.Target.Value;
+
+        if (args.Target == args.User)
+            return;
+        var target = args.Target;
 
         if (HasComp<PoweredLightComponent>(target))
         {
@@ -78,6 +83,8 @@ public sealed partial class RevenantSystem
         {
             BeginHarvestDoAfter(uid, target, component, essence);
         }
+
+        args.Handled = true;
     }
 
     private void BeginSoulSearchDoAfter(EntityUid uid, EntityUid target, RevenantComponent revenant)
@@ -241,7 +248,7 @@ public sealed partial class RevenantSystem
         foreach (var ent in lookup)
         {
             //break windows
-            if (tags.HasComponent(ent) && _tag.HasAnyTag(ent, "Window"))
+            if (tags.HasComponent(ent) && _tag.HasTag(ent, "Window"))
             {
                 //hardcoded damage specifiers til i die.
                 var dspec = new DamageSpecifier();
@@ -326,10 +333,8 @@ public sealed partial class RevenantSystem
 
         foreach (var ent in _lookup.GetEntitiesInRange(uid, component.MalfunctionRadius))
         {
-            if (component.MalfunctionWhitelist?.IsValid(ent, EntityManager) == false)
-                continue;
-
-            if (component.MalfunctionBlacklist?.IsValid(ent, EntityManager) == true)
+            if (_whitelistSystem.IsWhitelistFail(component.MalfunctionWhitelist, ent) ||
+                _whitelistSystem.IsBlacklistPass(component.MalfunctionBlacklist, ent))
                 continue;
 
             _emag.DoEmagEffect(uid, ent); //it does not emag itself. adorable.
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index c390432f3a..a05105662d 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -17,6 +17,7 @@ using Content.Shared.Popups;
 using Content.Shared.Revenant;
 using Content.Shared.Revenant.Components;
 using Content.Shared.StatusEffect;
+using Content.Shared.Store.Components;
 using Content.Shared.Stunnable;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Salvage/FultonSystem.cs b/Content.Server/Salvage/FultonSystem.cs
index ad998e5359..e2c0a6b4c5 100644
--- a/Content.Server/Salvage/FultonSystem.cs
+++ b/Content.Server/Salvage/FultonSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Salvage.Fulton;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
@@ -61,8 +62,9 @@ public sealed class FultonSystem : SharedFultonSystem
             var metadata = MetaData(uid);
             var oldCoords = xform.Coordinates;
             var offset = _random.NextVector2(1.5f);
-            var localPos = TransformSystem.GetInvWorldMatrix(beaconXform.ParentUid)
-                .Transform(TransformSystem.GetWorldPosition(beaconXform)) + offset;
+            var localPos = Vector2.Transform(
+                    TransformSystem.GetWorldPosition(beaconXform),
+                    TransformSystem.GetInvWorldMatrix(beaconXform.ParentUid)) + offset;
 
             TransformSystem.SetCoordinates(uid, new EntityCoordinates(beaconXform.ParentUid, localPos));
 
diff --git a/Content.Server/Shuttles/Events/FTLStartedEvent.cs b/Content.Server/Shuttles/Events/FTLStartedEvent.cs
index 965da7f0c5..eafbeddd5c 100644
--- a/Content.Server/Shuttles/Events/FTLStartedEvent.cs
+++ b/Content.Server/Shuttles/Events/FTLStartedEvent.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Robust.Shared.Map;
 
 namespace Content.Server.Shuttles.Events;
@@ -6,4 +7,4 @@ namespace Content.Server.Shuttles.Events;
 /// Raised when a shuttle has moved to FTL space.
 /// </summary>
 [ByRefEvent]
-public readonly record struct FTLStartedEvent(EntityUid Entity, EntityCoordinates TargetCoordinates, EntityUid? FromMapUid, Matrix3 FTLFrom, Angle FromRotation);
+public readonly record struct FTLStartedEvent(EntityUid Entity, EntityCoordinates TargetCoordinates, EntityUid? FromMapUid, Matrix3x2 FTLFrom, Angle FromRotation);
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index e87e781e62..eb1f9796b2 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Numerics;
 using Content.Server.Administration;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
@@ -277,7 +278,7 @@ public sealed class ArrivalsSystem : EntitySystem
         foreach (var (ent, xform) in toDump)
         {
             var rotation = xform.LocalRotation;
-            _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, args.FTLFrom.Transform(xform.LocalPosition)));
+            _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, Vector2.Transform(xform.LocalPosition, args.FTLFrom)));
             _transform.SetWorldRotation(ent, args.FromRotation + rotation);
         }
     }
diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
index e46a7c715f..1a95ef9cb2 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
@@ -46,13 +46,13 @@ public sealed partial class DockingSystem
        FixturesComponent shuttleFixtures,
        MapGridComponent grid,
        bool isMap,
-       out Matrix3 matty,
+       out Matrix3x2 matty,
        out Box2 shuttleDockedAABB,
        out Angle gridRotation)
    {
        shuttleDockedAABB = Box2.UnitCentered;
        gridRotation = Angle.Zero;
-       matty = Matrix3.Identity;
+       matty = Matrix3x2.Identity;
 
        if (shuttleDock.Docked ||
            gridDock.Docked ||
@@ -71,9 +71,9 @@ public sealed partial class DockingSystem
        var gridDockAngle = gridDockXform.LocalRotation.Opposite();
        var offsetAngle = gridDockAngle - shuttleDockAngle;
 
-       var stationDockMatrix = Matrix3.CreateInverseTransform(stationDockPos, shuttleDockAngle);
-       var gridXformMatrix = Matrix3.CreateTransform(gridDockXform.LocalPosition, gridDockAngle);
-       Matrix3.Multiply(in stationDockMatrix, in gridXformMatrix, out matty);
+       var stationDockMatrix = Matrix3Helpers.CreateInverseTransform(stationDockPos, shuttleDockAngle);
+       var gridXformMatrix = Matrix3Helpers.CreateTransform(gridDockXform.LocalPosition, gridDockAngle);
+       matty = Matrix3x2.Multiply(stationDockMatrix, gridXformMatrix);
 
        if (!ValidSpawn(grid, matty, offsetAngle, shuttleFixtures, isMap))
            return false;
@@ -193,7 +193,7 @@ public sealed partial class DockingSystem
                    }
 
                    // Can't just use the AABB as we want to get bounds as tight as possible.
-                   var gridPosition = new EntityCoordinates(targetGrid, matty.Transform(Vector2.Zero));
+                   var gridPosition = new EntityCoordinates(targetGrid, Vector2.Transform(Vector2.Zero, matty));
                    var spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, gridPosition.ToMapPos(EntityManager, _transform));
 
                    // TODO: use tight bounds
@@ -303,9 +303,9 @@ public sealed partial class DockingSystem
    /// <summary>
    /// Checks whether the shuttle can warp to the specified position.
    /// </summary>
-   private bool ValidSpawn(MapGridComponent grid, Matrix3 matty, Angle angle, FixturesComponent shuttleFixturesComp, bool isMap)
+   private bool ValidSpawn(MapGridComponent grid, Matrix3x2 matty, Angle angle, FixturesComponent shuttleFixturesComp, bool isMap)
    {
-       var transform = new Transform(matty.Transform(Vector2.Zero), angle);
+       var transform = new Transform(Vector2.Transform(Vector2.Zero, matty), angle);
 
        // Because some docking bounds are tight af need to check each chunk individually
        foreach (var fix in shuttleFixturesComp.Fixtures.Values)
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
index f346398cda..8a8d2d883d 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Server.Shuttles.Components;
 using Content.Shared.Audio;
 using Robust.Shared.Audio;
@@ -38,8 +39,8 @@ public sealed partial class ShuttleSystem
 
         var otherXform = Transform(args.OtherEntity);
 
-        var ourPoint = ourXform.InvWorldMatrix.Transform(args.WorldPoint);
-        var otherPoint = otherXform.InvWorldMatrix.Transform(args.WorldPoint);
+        var ourPoint = Vector2.Transform(args.WorldPoint, ourXform.InvWorldMatrix);
+        var otherPoint = Vector2.Transform(args.WorldPoint, otherXform.InvWorldMatrix);
 
         var ourVelocity = _physics.GetLinearVelocity(uid, ourPoint, ourBody, ourXform);
         var otherVelocity = _physics.GetLinearVelocity(args.OtherEntity, otherPoint, otherBody, otherXform);
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index 74c42ccbc5..e82235e44f 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -128,15 +128,20 @@ public sealed class ThrusterSystem : EntitySystem
 
     private void OnActivateThruster(EntityUid uid, ThrusterComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         component.Enabled ^= true;
 
         if (!component.Enabled)
         {
             DisableThruster(uid, component);
+            args.Handled = true;
         }
         else if (CanEnable(uid, component))
         {
             EnableThruster(uid, component);
+            args.Handled = true;
         }
     }
 
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index cc57c34c47..5c600be3f6 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -267,7 +267,7 @@ public sealed partial class BorgSystem
             return false;
         }
 
-        if (component.ModuleWhitelist?.IsValid(module, EntityManager) == false)
+        if (_whitelistSystem.IsWhitelistFail(component.ModuleWhitelist, module))
         {
             if (user != null)
                 Popup.PopupEntity(Loc.GetString("borg-module-whitelist-deny"), uid, user.Value);
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 082e38921a..1ab7f5387f 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -22,6 +22,7 @@ using Content.Shared.Roles;
 using Content.Shared.Silicons.Borgs;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Throwing;
+using Content.Shared.Whitelist;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -53,6 +54,8 @@ public sealed partial class BorgSystem : SharedBorgSystem
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
 
     [ValidatePrototypeId<JobPrototype>]
     public const string BorgJobId = "Borg";
@@ -104,9 +107,8 @@ public sealed partial class BorgSystem : SharedBorgSystem
             return;
         }
 
-        if (component.BrainEntity == null &&
-            brain != null &&
-            component.BrainWhitelist?.IsValid(used) != false)
+        if (component.BrainEntity == null && brain != null &&
+            _whitelistSystem.IsWhitelistPassOrNull(component.BrainWhitelist, used))
         {
             if (_mind.TryGetMind(used, out _, out var mind) && mind.Session != null)
             {
diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
index f1d0af6f90..779b2f5971 100644
--- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Server.Atmos.Components;
 using Content.Server.Singularity.Components;
 using Content.Shared.Ghost;
@@ -126,7 +127,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
     /// <param name="xform">(optional) The transform of the entity at the epicenter of the gravitational pulse.</param>
-    public void GravPulse(EntityUid uid, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV, TransformComponent? xform = null)
+    public void GravPulse(EntityUid uid, float maxRange, float minRange, in Matrix3x2 baseMatrixDeltaV, TransformComponent? xform = null)
     {
         if (Resolve(uid, ref xform))
             GravPulse(xform.Coordinates, maxRange, minRange, in baseMatrixDeltaV);
@@ -154,7 +155,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     /// <param name="maxRange">The maximum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
-    public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV)
+    public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3x2 baseMatrixDeltaV)
         => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, in baseMatrixDeltaV);
 
     /// <summary>
@@ -175,7 +176,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     /// <param name="maxRange">The maximum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse. Exists to prevent div/0 errors.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
-    public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV)
+    public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in Matrix3x2 baseMatrixDeltaV)
     {
         if (mapPos == MapCoordinates.Nullspace)
             return; // No gravpulses in nullspace please.
@@ -205,7 +206,7 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
                 continue;
 
             var scaling = (1f / distance2) * physics.Mass; // TODO: Variable falloff gradiants.
-            _physics.ApplyLinearImpulse(entity, (displacement * baseMatrixDeltaV) * scaling, body: physics);
+            _physics.ApplyLinearImpulse(entity, Vector2.Transform(displacement, baseMatrixDeltaV) * scaling, body: physics);
         }
     }
 
@@ -218,10 +219,9 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     /// <param name="baseRadialDeltaV">The base amount of velocity that will be added to entities in range towards the epicenter of the pulse.</param>
     /// <param name="baseTangentialDeltaV">The base amount of velocity that will be added to entities in range counterclockwise relative to the epicenter of the pulse.</param>
     public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange = 0.0f, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f)
-        => GravPulse(mapPos, maxRange, minRange, new Matrix3(
-            baseRadialDeltaV, +baseTangentialDeltaV, 0.0f,
-            -baseTangentialDeltaV, baseRadialDeltaV, 0.0f,
-            0.0f, 0.0f, 1.0f
+        => GravPulse(mapPos, maxRange, minRange, new Matrix3x2(
+            baseRadialDeltaV, -baseTangentialDeltaV, 0.0f,
+            +baseTangentialDeltaV, baseRadialDeltaV, 0.0f
         ));
 
     #endregion GravPulse
diff --git a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
index 5b98989bb3..1b06367b0d 100644
--- a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
@@ -2,7 +2,7 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server.Spawners.Components
 {
-    [RegisterComponent]
+    [RegisterComponent, EntityCategory("Spawner")]
     [Virtual]
     public partial class ConditionalSpawnerComponent : Component
     {
diff --git a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
index 9bf4d6d253..e6a597f365 100644
--- a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
@@ -2,7 +2,7 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server.Spawners.Components
 {
-    [RegisterComponent]
+    [RegisterComponent, EntityCategory("Spawner")]
     public sealed partial class RandomSpawnerComponent : ConditionalSpawnerComponent
     {
         [ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
index b60afbc88b..828e541717 100644
--- a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Server.Spawners.Components;
 /// Can configure the set of entities, spawn timing, spawn chance,
 /// and min/max number of entities to spawn.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, EntityCategory("Spawner")]
 public sealed partial class TimedSpawnerComponent : Component, ISerializationHooks
 {
     /// <summary>
diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index fe14d86aa1..7de8a43d35 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -21,6 +21,7 @@ public sealed class SpreaderSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     /// <summary>
     /// Cached maximum number of updates per spreader prototype. This is applied per-grid.
@@ -37,8 +38,7 @@ public sealed class SpreaderSystem : EntitySystem
 
     public const float SpreadCooldownSeconds = 1;
 
-    [ValidatePrototypeId<TagPrototype>]
-    private const string IgnoredTag = "SpreaderIgnore";
+    private static readonly ProtoId<TagPrototype> IgnoredTag = "SpreaderIgnore";
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -189,7 +189,6 @@ public sealed class SpreaderSystem : EntitySystem
         var airtightQuery = GetEntityQuery<AirtightComponent>();
         var dockQuery = GetEntityQuery<DockingComponent>();
         var xformQuery = GetEntityQuery<TransformComponent>();
-        var tagQuery = GetEntityQuery<TagComponent>();
         var blockedAtmosDirs = AtmosDirection.Invalid;
 
         // Due to docking ports they may not necessarily be opposite directions.
@@ -212,7 +211,7 @@ public sealed class SpreaderSystem : EntitySystem
 
             // If we're on a blocked tile work out which directions we can go.
             if (!airtightQuery.TryGetComponent(ent, out var airtight) || !airtight.AirBlocked ||
-                tagQuery.TryGetComponent(ent, out var tags) && tags.Tags.Contains(IgnoredTag))
+                _tag.HasTag(ent.Value, IgnoredTag))
             {
                 continue;
             }
@@ -250,8 +249,7 @@ public sealed class SpreaderSystem : EntitySystem
 
             while (directionEnumerator.MoveNext(out var ent))
             {
-                if (!airtightQuery.TryGetComponent(ent, out var airtight) || !airtight.AirBlocked ||
-                    tagQuery.TryGetComponent(ent, out var tags) && tags.Tags.Contains(IgnoredTag))
+                if (!airtightQuery.TryGetComponent(ent, out var airtight) || !airtight.AirBlocked || _tag.HasTag(ent.Value, IgnoredTag))
                 {
                     continue;
                 }
diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs
index 001093a8dd..e34592b45f 100644
--- a/Content.Server/Stack/StackSystem.cs
+++ b/Content.Server/Stack/StackSystem.cs
@@ -51,7 +51,7 @@ namespace Content.Server.Stack
 
             // Get a prototype ID to spawn the new entity. Null is also valid, although it should rarely be picked...
             var prototype = _prototypeManager.TryIndex<StackPrototype>(stack.StackTypeId, out var stackType)
-                ? stackType.Spawn
+                ? stackType.Spawn.ToString()
                 : Prototype(uid)?.ID;
 
             // Set the output parameter in the event instance to the newly split stack.
diff --git a/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs b/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs
new file mode 100644
index 0000000000..58d860b1e1
--- /dev/null
+++ b/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Roles;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Station.Events;
+
+[ByRefEvent]
+public readonly record struct StationJobsGetCandidatesEvent(NetUserId Player, List<ProtoId<JobPrototype>> Jobs);
diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
index 4b7cd64961..c3c3865c7b 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using Content.Server.Administration.Managers;
 using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Station.Components;
+using Content.Server.Station.Events;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Shared.Network;
@@ -342,8 +343,9 @@ public sealed partial class StationJobsSystem
         foreach (var (player, profile) in profiles)
         {
             var roleBans = _banManager.GetJobBans(player);
-            var profileJobs = profile.JobPriorities.Keys.ToList();
-            _playTime.RemoveDisallowedJobs(player, ref profileJobs);
+            var profileJobs = profile.JobPriorities.Keys.Select(k => new ProtoId<JobPrototype>(k)).ToList();
+            var ev = new StationJobsGetCandidatesEvent(player, profileJobs);
+            RaiseLocalEvent(ref ev);
 
             List<string>? availableJobs = null;
 
@@ -354,7 +356,7 @@ public sealed partial class StationJobsSystem
                 if (!(priority == selectedPriority || selectedPriority is null))
                     continue;
 
-                if (!_prototypeManager.TryIndex(jobId, out JobPrototype? job))
+                if (!_prototypeManager.TryIndex(jobId, out var job))
                     continue;
 
                 if (weight is not null && job.Weight != weight.Value)
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs
index debac8902e..3bfa815af1 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -428,7 +428,7 @@ public sealed partial class StationJobsSystem : EntitySystem
     /// <param name="pickOverflows">Whether or not to pick from the overflow list.</param>
     /// <param name="disallowedJobs">A set of disallowed jobs, if any.</param>
     /// <returns>The selected job, if any.</returns>
-    public string? PickBestAvailableJobWithPriority(EntityUid station, IReadOnlyDictionary<string, JobPriority> jobPriorities, bool pickOverflows, IReadOnlySet<string>? disallowedJobs = null)
+    public string? PickBestAvailableJobWithPriority(EntityUid station, IReadOnlyDictionary<string, JobPriority> jobPriorities, bool pickOverflows, IReadOnlySet<ProtoId<JobPrototype>>? disallowedJobs = null)
     {
         if (station == EntityUid.Invalid)
             return null;
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 05f5cc58bc..f175565a5a 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -204,7 +204,7 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
         }
 
         var gearEquippedEv = new StartingGearEquippedEvent(entity.Value);
-        RaiseLocalEvent(entity.Value, ref gearEquippedEv, true);
+        RaiseLocalEvent(entity.Value, ref gearEquippedEv);
 
         if (profile != null)
         {
diff --git a/Content.Server/StationEvents/Components/StationEventComponent.cs b/Content.Server/StationEvents/Components/StationEventComponent.cs
index cc17007d90..fdd1d3962e 100644
--- a/Content.Server/StationEvents/Components/StationEventComponent.cs
+++ b/Content.Server/StationEvents/Components/StationEventComponent.cs
@@ -24,6 +24,12 @@ public sealed partial class StationEventComponent : Component
     [DataField]
     public string? EndAnnouncement;
 
+    [DataField]
+    public Color StartAnnouncementColor = Color.Gold;
+
+    [DataField]
+    public Color EndAnnouncementColor = Color.Gold;
+
     [DataField]
     public SoundSpecifier? StartAudio;
 
@@ -42,12 +48,6 @@ public sealed partial class StationEventComponent : Component
     [DataField]
     public int ReoccurrenceDelay = 30;
 
-    /// <summary>
-    ///     How long after being added does the event start
-    /// </summary>
-    [DataField]
-    public TimeSpan StartDelay = TimeSpan.Zero;
-
     /// <summary>
     ///     How long the event lasts.
     /// </summary>
@@ -75,13 +75,6 @@ public sealed partial class StationEventComponent : Component
     [DataField]
     public int? MaxOccurrences;
 
-    /// <summary>
-    /// When the station event starts.
-    /// </summary>
-    [DataField("startTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan StartTime;
-
     /// <summary>
     /// When the station event ends.
     /// </summary>
diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
index 96633834ee..cf66a7c052 100644
--- a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
+++ b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
@@ -1,6 +1,5 @@
 using Content.Server.Anomaly;
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 
@@ -12,11 +11,14 @@ public sealed class AnomalySpawnRule : StationEventSystem<AnomalySpawnRuleCompon
 
     protected override void Added(EntityUid uid, AnomalySpawnRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString("anomaly-spawn-event-announcement",
             ("sighting", Loc.GetString($"anomaly-spawn-sighting-{RobustRandom.Next(1, 6)}")));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
     }
 
     protected override void Started(EntityUid uid, AnomalySpawnRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
index b3ed10999e..aaa0f0cffc 100644
--- a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
+++ b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
@@ -1,5 +1,4 @@
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Robust.Shared.Random;
 
@@ -9,11 +8,14 @@ public sealed class BluespaceArtifactRule : StationEventSystem<BluespaceArtifact
 {
     protected override void Added(EntityUid uid, BluespaceArtifactRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString("bluespace-artifact-event-announcement",
             ("sighting", Loc.GetString(RobustRandom.Pick(component.PossibleSighting))));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
     }
 
     protected override void Started(EntityUid uid, BluespaceArtifactRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/BreakerFlipRule.cs b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
index 16d3fd8c95..ef28259389 100644
--- a/Content.Server/StationEvents/Events/BreakerFlipRule.cs
+++ b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
@@ -1,5 +1,4 @@
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Station.Components;
@@ -15,10 +14,14 @@ public sealed class BreakerFlipRule : StationEventSystem<BreakerFlipRuleComponen
 
     protected override void Added(EntityUid uid, BreakerFlipRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString("station-event-breaker-flip-announcement", ("data", Loc.GetString(Loc.GetString($"random-sentience-event-data-{RobustRandom.Next(1, 6)}"))));
-        ChatSystem.DispatchGlobalAnnouncement(str, playSound: false, colorOverride: Color.Gold);
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
+
     }
 
     protected override void Started(EntityUid uid, BreakerFlipRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
index c27cd30278..4cddf4674b 100644
--- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs
+++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
@@ -3,7 +3,6 @@ using Content.Server.Cargo.Components;
 using Content.Server.Cargo.Systems;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Robust.Shared.Prototypes;
@@ -18,11 +17,14 @@ public sealed class CargoGiftsRule : StationEventSystem<CargoGiftsRuleComponent>
 
     protected override void Added(EntityUid uid, CargoGiftsRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString(component.Announce,
             ("sender", Loc.GetString(component.Sender)), ("description", Loc.GetString(component.Description)), ("dest", Loc.GetString(component.Dest)));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
     }
 
     /// <summary>
diff --git a/Content.Server/StationEvents/Events/FalseAlarmRule.cs b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
index e5317a5449..115b6d905e 100644
--- a/Content.Server/StationEvents/Events/FalseAlarmRule.cs
+++ b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
@@ -1,9 +1,7 @@
 using System.Linq;
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using JetBrains.Annotations;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
@@ -15,15 +13,16 @@ public sealed class FalseAlarmRule : StationEventSystem<FalseAlarmRuleComponent>
 
     protected override void Started(EntityUid uid, FalseAlarmRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
-        base.Started(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var allEv = _event.AllEvents().Select(p => p.Value).ToList();
         var picked = RobustRandom.Pick(allEv);
 
-        if (picked.StartAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(picked.StartAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
-        Audio.PlayGlobal(picked.StartAudio, Filter.Broadcast(), true);
+        stationEvent.StartAnnouncement = picked.StartAnnouncement;
+        stationEvent.StartAudio = picked.StartAudio;
+        stationEvent.StartAnnouncementColor = picked.StartAnnouncementColor;
+
+        base.Started(uid, component, gameRule, args);
     }
 }
diff --git a/Content.Server/StationEvents/Events/GasLeakRule.cs b/Content.Server/StationEvents/Events/GasLeakRule.cs
index 1221612171..c17f17a827 100644
--- a/Content.Server/StationEvents/Events/GasLeakRule.cs
+++ b/Content.Server/StationEvents/Events/GasLeakRule.cs
@@ -29,10 +29,10 @@ namespace Content.Server.StationEvents.Events
                 component.LeakGas = RobustRandom.Pick(component.LeakableGases);
                 // Was 50-50 on using normal distribution.
                 var totalGas = RobustRandom.Next(component.MinimumGas, component.MaximumGas);
-                var startAfter = stationEvent.StartDelay;
                 component.MolesPerSecond = RobustRandom.Next(component.MinimumMolesPerSecond, component.MaximumMolesPerSecond);
 
-                stationEvent.EndTime = _timing.CurTime + TimeSpan.FromSeconds(totalGas / component.MolesPerSecond + startAfter.TotalSeconds);
+                if (gameRule.Delay is {} startAfter)
+                    stationEvent.EndTime = _timing.CurTime + TimeSpan.FromSeconds(totalGas / component.MolesPerSecond + startAfter.Next(RobustRandom));
             }
 
             // Look technically if you wanted to guarantee a leak you'd do this in announcement but having the announcement
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
index bd377ec16c..38390cedb1 100644
--- a/Content.Server/StationEvents/Events/StationEventSystem.cs
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -1,14 +1,11 @@
-using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Database;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
@@ -20,7 +17,6 @@ namespace Content.Server.StationEvents.Events;
 public abstract class StationEventSystem<T> : GameRuleSystem<T> where T : IComponent
 {
     [Dependency] protected readonly IAdminLogManager AdminLogManager = default!;
-    [Dependency] protected readonly IMapManager MapManager = default!;
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] protected readonly ChatSystem ChatSystem = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
@@ -43,16 +39,12 @@ public abstract class StationEventSystem<T> : GameRuleSystem<T> where T : ICompo
         if (!TryComp<StationEventComponent>(uid, out var stationEvent))
             return;
 
-
         AdminLogManager.Add(LogType.EventAnnounced, $"Event added / announced: {ToPrettyString(uid)}");
 
         if (stationEvent.StartAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.StartAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
+            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.StartAnnouncement), playSound: false, colorOverride: stationEvent.StartAnnouncementColor);
 
         Audio.PlayGlobal(stationEvent.StartAudio, Filter.Broadcast(), true);
-        stationEvent.StartTime = Timing.CurTime + stationEvent.StartDelay;
     }
 
     /// <inheritdoc/>
@@ -86,9 +78,7 @@ public abstract class StationEventSystem<T> : GameRuleSystem<T> where T : ICompo
         AdminLogManager.Add(LogType.EventStopped, $"Event ended: {ToPrettyString(uid)}");
 
         if (stationEvent.EndAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.EndAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
+            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.EndAnnouncement), playSound: false, colorOverride: stationEvent.EndAnnouncementColor);
 
         Audio.PlayGlobal(stationEvent.EndAudio, Filter.Broadcast(), true);
     }
@@ -108,11 +98,7 @@ public abstract class StationEventSystem<T> : GameRuleSystem<T> where T : ICompo
             if (!GameTicker.IsGameRuleAdded(uid, ruleData))
                 continue;
 
-            if (!GameTicker.IsGameRuleActive(uid, ruleData) && Timing.CurTime >= stationEvent.StartTime)
-            {
-                GameTicker.StartGameRule(uid, ruleData);
-            }
-            else if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
+            if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
             {
                 GameTicker.EndGameRule(uid, ruleData);
             }
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index 838311c1aa..9da7606bcc 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -109,7 +109,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
             // Move contained air
             if (component.BehaviorProperties.TransportGas)
             {
-                entityStorageComponent.Air.CopyFromMutable(target.Value.storageComponent.Air);
+                entityStorageComponent.Air.CopyFrom(target.Value.storageComponent.Air);
                 target.Value.storageComponent.Air.Clear();
             }
 
@@ -326,7 +326,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
         // Move contained air
         if (component.BehaviorProperties.TransportGas)
         {
-            target.Value.storageComponent.Air.CopyFromMutable(entityStorageComponent.Air);
+            target.Value.storageComponent.Air.CopyFrom(entityStorageComponent.Air);
             entityStorageComponent.Air.Clear();
         }
 
diff --git a/Content.Server/Storage/EntitySystems/PickRandomSystem.cs b/Content.Server/Storage/EntitySystems/PickRandomSystem.cs
index dbbe1dd778..f0e986e199 100644
--- a/Content.Server/Storage/EntitySystems/PickRandomSystem.cs
+++ b/Content.Server/Storage/EntitySystems/PickRandomSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Database;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Storage;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
 
@@ -15,6 +16,7 @@ public sealed class PickRandomSystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -30,7 +32,7 @@ public sealed class PickRandomSystem : EntitySystem
 
         var user = args.User;
 
-        var enabled = storage.Container.ContainedEntities.Any(item => comp.Whitelist?.IsValid(item, EntityManager) ?? true);
+        var enabled = storage.Container.ContainedEntities.Any(item => _whitelistSystem.IsWhitelistPassOrNull(comp.Whitelist, item));
 
         // alt-click / alt-z to pick an item
         args.Verbs.Add(new AlternativeVerb
@@ -48,7 +50,7 @@ public sealed class PickRandomSystem : EntitySystem
 
     private void TryPick(EntityUid uid, PickRandomComponent comp, StorageComponent storage, EntityUid user)
     {
-        var entities = storage.Container.ContainedEntities.Where(item => comp.Whitelist?.IsValid(item, EntityManager) ?? true).ToArray();
+        var entities = storage.Container.ContainedEntities.Where(item => _whitelistSystem.IsWhitelistPassOrNull(comp.Whitelist, item)).ToArray();
 
         if (!entities.Any())
             return;
diff --git a/Content.Server/Store/Conditions/BuyBeforeCondition.cs b/Content.Server/Store/Conditions/BuyBeforeCondition.cs
index 132f353439..3f0c2de2e1 100644
--- a/Content.Server/Store/Conditions/BuyBeforeCondition.cs
+++ b/Content.Server/Store/Conditions/BuyBeforeCondition.cs
@@ -1,6 +1,7 @@
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Store.Conditions;
diff --git a/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs b/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
index 4e5e504aec..ea8de4a9cc 100644
--- a/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
+++ b/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
@@ -43,7 +43,7 @@ public sealed partial class BuyerDepartmentCondition : ListingCondition
         {
             foreach (var department in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
             {
-                if (department.Roles.Contains(job.Prototype) && Blacklist.Contains(department.ID))
+                if (department.Roles.Contains(job.Prototype.Value) && Blacklist.Contains(department.ID))
                     return false;
             }
         }
@@ -56,7 +56,7 @@ public sealed partial class BuyerDepartmentCondition : ListingCondition
             {
                 foreach (var department in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
                 {
-                    if (department.Roles.Contains(job.Prototype) && Whitelist.Contains(department.ID))
+                    if (department.Roles.Contains(job.Prototype.Value) && Whitelist.Contains(department.ID))
                     {
                         found = true;
                         break;
diff --git a/Content.Server/Store/Systems/StoreSystem.Command.cs b/Content.Server/Store/Systems/StoreSystem.Command.cs
index d259da2c95..5ad361eb42 100644
--- a/Content.Server/Store/Systems/StoreSystem.Command.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Command.cs
@@ -1,7 +1,9 @@
+using System.Linq;
 using Content.Server.Store.Components;
 using Content.Shared.FixedPoint;
 using Content.Server.Administration;
 using Content.Shared.Administration;
+using Content.Shared.Store.Components;
 using Robust.Shared.Console;
 
 namespace Content.Server.Store.Systems;
@@ -58,7 +60,7 @@ public sealed partial class StoreSystem
         if (args.Length == 2 && NetEntity.TryParse(args[0], out var uidNet) && TryGetEntity(uidNet, out var uid))
         {
             if (TryComp<StoreComponent>(uid, out var store))
-                return CompletionResult.FromHintOptions(store.CurrencyWhitelist, "<currency prototype>");
+                return CompletionResult.FromHintOptions(store.CurrencyWhitelist.Select(p => p.ToString()), "<currency prototype>");
         }
 
         return CompletionResult.Empty;
diff --git a/Content.Server/Store/Systems/StoreSystem.Listings.cs b/Content.Server/Store/Systems/StoreSystem.Listings.cs
index a56d9640d3..10b53a7c94 100644
--- a/Content.Server/Store/Systems/StoreSystem.Listings.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Listings.cs
@@ -1,5 +1,6 @@
-using Content.Server.Store.Components;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Store.Systems;
 
@@ -80,7 +81,11 @@ public sealed partial class StoreSystem
     /// <param name="categories">What categories to filter by.</param>
     /// <param name="storeEntity">The physial entity of the store. Can be null.</param>
     /// <returns>The available listings.</returns>
-    public IEnumerable<ListingData> GetAvailableListings(EntityUid buyer, HashSet<ListingData>? listings, HashSet<string> categories, EntityUid? storeEntity = null)
+    public IEnumerable<ListingData> GetAvailableListings(
+        EntityUid buyer,
+        HashSet<ListingData>? listings,
+        HashSet<ProtoId<StoreCategoryPrototype>> categories,
+        EntityUid? storeEntity = null)
     {
         listings ??= GetAllListings();
 
@@ -117,7 +122,7 @@ public sealed partial class StoreSystem
     /// <param name="listing">The listing itself.</param>
     /// <param name="categories">The categories to check through.</param>
     /// <returns>If the listing was present in one of the categories.</returns>
-    public bool ListingHasCategory(ListingData listing, HashSet<string> categories)
+    public bool ListingHasCategory(ListingData listing, HashSet<ProtoId<StoreCategoryPrototype>> categories)
     {
         foreach (var cat in categories)
         {
diff --git a/Content.Server/Store/Systems/StoreSystem.Refund.cs b/Content.Server/Store/Systems/StoreSystem.Refund.cs
index 5a8be4be2b..4e823582e6 100644
--- a/Content.Server/Store/Systems/StoreSystem.Refund.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Refund.cs
@@ -1,4 +1,5 @@
 using Content.Server.Store.Components;
+using Content.Shared.Store.Components;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Store.Systems;
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 0a1a8d19f3..983d68d0af 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -10,6 +10,7 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Mind;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
 using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
@@ -82,16 +83,11 @@ public sealed partial class StoreSystem
     /// <param name="user">The person who if opening the store ui. Listings are filtered based on this.</param>
     /// <param name="store">The store entity itself</param>
     /// <param name="component">The store component being refreshed.</param>
-    /// <param name="ui"></param>
     public void UpdateUserInterface(EntityUid? user, EntityUid store, StoreComponent? component = null)
     {
         if (!Resolve(store, ref component))
             return;
 
-        // TODO: Why is the state not being set unless this?
-        if (!_ui.HasUi(store, StoreUiKey.Key))
-            return;
-
         //this is the person who will be passed into logic for all listing filtering.
         if (user != null) //if we have no "buyer" for this update, then don't update the listings
         {
@@ -259,7 +255,8 @@ public sealed partial class StoreSystem
         }
 
         //log dat shit.
-        _admin.Add(LogType.StorePurchase, LogImpact.Low,
+        _admin.Add(LogType.StorePurchase,
+            LogImpact.Low,
             $"{ToPrettyString(buyer):player} purchased listing \"{ListingLocalisationHelpers.GetLocalisedNameOrEntityName(listing, _prototypeManager)}\" from {ToPrettyString(uid)}");
 
         listing.PurchaseAmount++; //track how many times something has been purchased
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index e310194778..0fd92cfb96 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -5,11 +5,10 @@ using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
-using Content.Shared.Store;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Content.Shared.Store.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Store.Systems;
@@ -44,7 +43,6 @@ public sealed partial class StoreSystem : EntitySystem
     private void OnMapInit(EntityUid uid, StoreComponent component, MapInitEvent args)
     {
         RefreshAllListings(component);
-        InitializeFromPreset(component.Preset, uid, component);
         component.StartingMap = Transform(uid).MapUid;
     }
 
@@ -54,7 +52,6 @@ public sealed partial class StoreSystem : EntitySystem
         if (MetaData(uid).EntityLifeStage == EntityLifeStage.MapInitialized)
         {
             RefreshAllListings(component);
-            InitializeFromPreset(component.Preset, uid, component);
         }
 
         var ev = new StoreAddedEvent();
@@ -167,43 +164,6 @@ public sealed partial class StoreSystem : EntitySystem
         UpdateUserInterface(null, uid, store);
         return true;
     }
-
-    /// <summary>
-    /// Initializes a store based on a preset ID
-    /// </summary>
-    /// <param name="preset">The ID of a store preset prototype</param>
-    /// <param name="uid"></param>
-    /// <param name="component">The store being initialized</param>
-    public void InitializeFromPreset(string? preset, EntityUid uid, StoreComponent component)
-    {
-        if (preset == null)
-            return;
-
-        if (!_proto.TryIndex<StorePresetPrototype>(preset, out var proto))
-            return;
-
-        InitializeFromPreset(proto, uid, component);
-    }
-
-    /// <summary>
-    /// Initializes a store based on a given preset
-    /// </summary>
-    /// <param name="preset">The StorePresetPrototype</param>
-    /// <param name="uid"></param>
-    /// <param name="component">The store being initialized</param>
-    public void InitializeFromPreset(StorePresetPrototype preset, EntityUid uid, StoreComponent component)
-    {
-        component.Preset = preset.ID;
-        component.CurrencyWhitelist.UnionWith(preset.CurrencyWhitelist);
-        component.Categories.UnionWith(preset.Categories);
-        if (component.Balance == new Dictionary<string, FixedPoint2>() && preset.InitialBalance != null) //if we don't have a value stored, use the preset
-            TryAddCurrency(preset.InitialBalance, uid, component);
-
-        if (_ui.HasUi(uid, StoreUiKey.Key))
-        {
-            _ui.SetUiState(uid, StoreUiKey.Key, new StoreInitializeState(preset.StoreName));
-        }
-    }
 }
 
 public sealed class CurrencyInsertAttemptEvent : CancellableEntityEventArgs
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
index f411001bd3..1adab9930d 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
@@ -16,10 +16,10 @@ public sealed class SurveillanceCameraMicrophoneSystem : EntitySystem
         SubscribeLocalEvent<SurveillanceCameraMicrophoneComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<SurveillanceCameraMicrophoneComponent, ListenEvent>(RelayEntityMessage);
         SubscribeLocalEvent<SurveillanceCameraMicrophoneComponent, ListenAttemptEvent>(CanListen);
-        SubscribeLocalEvent<ExpandICChatRecipientstEvent>(OnExpandRecipients);
+        SubscribeLocalEvent<ExpandICChatRecipientsEvent>(OnExpandRecipients);
     }
 
-    private void OnExpandRecipients(ExpandICChatRecipientstEvent ev)
+    private void OnExpandRecipients(ExpandICChatRecipientsEvent ev)
     {
         var xformQuery = GetEntityQuery<TransformComponent>();
         var sourceXform = Transform(ev.Source);
diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs
index 4376ec4bc6..caa319a0b7 100644
--- a/Content.Server/Tabletop/TabletopSystem.cs
+++ b/Content.Server/Tabletop/TabletopSystem.cs
@@ -141,6 +141,9 @@ namespace Content.Server.Tabletop
 
         private void OnTabletopActivate(EntityUid uid, TabletopGameComponent component, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             // Check that a player is attached to the entity.
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
diff --git a/Content.Server/Teleportation/HandTeleporterSystem.cs b/Content.Server/Teleportation/HandTeleporterSystem.cs
index 3d988b0916..d4c6753c4b 100644
--- a/Content.Server/Teleportation/HandTeleporterSystem.cs
+++ b/Content.Server/Teleportation/HandTeleporterSystem.cs
@@ -1,7 +1,9 @@
 using Content.Server.Administration.Logs;
+using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.Database;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Popups;
 using Content.Shared.Teleportation.Components;
 using Content.Shared.Teleportation.Systems;
 using Robust.Server.Audio;
@@ -18,6 +20,7 @@ public sealed class HandTeleporterSystem : EntitySystem
     [Dependency] private readonly LinkedEntitySystem _link = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doafter = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -92,6 +95,16 @@ public sealed class HandTeleporterSystem : EntitySystem
         }
         else if (Deleted(component.SecondPortal))
         {
+            if (xform.ParentUid != xform.GridUid) // Still, don't portal.
+                return;
+
+            if (xform.ParentUid != Transform(component.FirstPortal!.Value).ParentUid)
+            {
+                // Whoops. Fizzle time. Crime time too because yippee I'm not refactoring this logic right now (I started to, I'm not going to.)
+                FizzlePortals(uid, component, user, true);
+                return;
+            }
+
             var timeout = EnsureComp<PortalTimeoutComponent>(user);
             timeout.EnteredPortal = null;
             component.SecondPortal = Spawn(component.SecondPortalPrototype, Transform(user).Coordinates);
@@ -101,22 +114,32 @@ public sealed class HandTeleporterSystem : EntitySystem
         }
         else
         {
-            // Logging
-            var portalStrings = "";
-            portalStrings += ToPrettyString(component.FirstPortal!.Value);
-            if (portalStrings != "")
-                portalStrings += " and ";
-            portalStrings += ToPrettyString(component.SecondPortal!.Value);
-            if (portalStrings != "")
-                _adminLogger.Add(LogType.EntityDelete, LogImpact.Low, $"{ToPrettyString(user):player} closed {portalStrings} with {ToPrettyString(uid)}");
-
-            // Clear both portals
-            QueueDel(component.FirstPortal!.Value);
-            QueueDel(component.SecondPortal!.Value);
-
-            component.FirstPortal = null;
-            component.SecondPortal = null;
-            _audio.PlayPvs(component.ClearPortalsSound, uid);
+            FizzlePortals(uid, component, user, false);
         }
     }
+
+    private void FizzlePortals(EntityUid uid, HandTeleporterComponent component, EntityUid user, bool instability)
+    {
+        // Logging
+        var portalStrings = "";
+        portalStrings += ToPrettyString(component.FirstPortal);
+        if (portalStrings != "")
+            portalStrings += " and ";
+        portalStrings += ToPrettyString(component.SecondPortal);
+        if (portalStrings != "")
+            _adminLogger.Add(LogType.EntityDelete, LogImpact.Low, $"{ToPrettyString(user):player} closed {portalStrings} with {ToPrettyString(uid)}");
+
+        // Clear both portals
+        if (!Deleted(component.FirstPortal))
+            QueueDel(component.FirstPortal.Value);
+        if (!Deleted(component.SecondPortal))
+            QueueDel(component.SecondPortal.Value);
+
+        component.FirstPortal = null;
+        component.SecondPortal = null;
+        _audio.PlayPvs(component.ClearPortalsSound, uid);
+
+        if (instability)
+            _popup.PopupEntity(Loc.GetString("handheld-teleporter-instability-fizzle"), uid, user, PopupType.MediumCaution);
+    }
 }
diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs
index 168f11de8f..2f7edd45d6 100644
--- a/Content.Server/Tips/TipsSystem.cs
+++ b/Content.Server/Tips/TipsSystem.cs
@@ -185,11 +185,11 @@ public sealed class TipsSystem : EntitySystem
 
     private void AnnounceRandomTip()
     {
-        if (!_prototype.TryIndex<DatasetPrototype>(_tipsDataset, out var tips))
+        if (!_prototype.TryIndex<LocalizedDatasetPrototype>(_tipsDataset, out var tips))
             return;
 
         var tip = _random.Pick(tips.Values);
-        var msg = Loc.GetString("tips-system-chat-message-wrap", ("tip", tip));
+        var msg = Loc.GetString("tips-system-chat-message-wrap", ("tip", Loc.GetString(tip)));
 
         if (_random.Prob(_tipTippyChance))
         {
diff --git a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
index 1b11dffeea..5c1bac6c93 100644
--- a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
+++ b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Toolshed.TypeParsers;
 
 namespace Content.Server.Toolshed.Commands.Verbs;
 
-[ToolshedCommand, AdminCommand(AdminFlags.Admin)]
+[ToolshedCommand, AdminCommand(AdminFlags.Moderator)]
 public sealed class RunVerbAsCommand : ToolshedCommand
 {
     private SharedVerbSystem? _verb;
diff --git a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs
index 47ce68625a..120581cf82 100644
--- a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs
+++ b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs
@@ -1,6 +1,3 @@
-using Content.Shared.Store;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
 namespace Content.Server.Traitor.Uplink.SurplusBundle;
 
 /// <summary>
@@ -12,14 +9,6 @@ public sealed partial class SurplusBundleComponent : Component
     /// <summary>
     ///     Total price of all content inside bundle.
     /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    [DataField("totalPrice")]
+    [DataField]
     public int TotalPrice = 20;
-
-    /// <summary>
-    ///     The preset that will be used to get all the listings.
-    ///     Currently just defaults to the basic uplink.
-    /// </summary>
-    [DataField("storePreset", customTypeSerializer: typeof(PrototypeIdSerializer<StorePresetPrototype>))]
-    public string StorePreset = "StorePresetUplink";
 }
diff --git a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs
index 5c0a56d346..759cad5ded 100644
--- a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs
+++ b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs
@@ -3,76 +3,67 @@ using Content.Server.Storage.EntitySystems;
 using Content.Server.Store.Systems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
-using Robust.Shared.Prototypes;
+using Content.Shared.Store.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.Traitor.Uplink.SurplusBundle;
 
 public sealed class SurplusBundleSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly EntityStorageSystem _entityStorage = default!;
     [Dependency] private readonly StoreSystem _store = default!;
 
-    private ListingData[] _listings = default!;
-
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<SurplusBundleComponent, MapInitEvent>(OnMapInit);
-
-        SubscribeLocalEvent<SurplusBundleComponent, ComponentInit>(OnInit);
-    }
-
-    private void OnInit(EntityUid uid, SurplusBundleComponent component, ComponentInit args)
-    {
-        var storePreset = _prototypeManager.Index<StorePresetPrototype>(component.StorePreset);
-
-        _listings = _store.GetAvailableListings(uid, null, storePreset.Categories).ToArray();
-
-        Array.Sort(_listings, (a, b) => (int) (b.Cost.Values.Sum() - a.Cost.Values.Sum())); //this might get weird with multicurrency but don't think about it
     }
 
     private void OnMapInit(EntityUid uid, SurplusBundleComponent component, MapInitEvent args)
     {
-        FillStorage(uid, component);
-    }
-
-    private void FillStorage(EntityUid uid, SurplusBundleComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
+        if (!TryComp<StoreComponent>(uid, out var store))
             return;
 
-        var cords = Transform(uid).Coordinates;
+        FillStorage((uid, component, store));
+    }
 
-        var content = GetRandomContent(component.TotalPrice);
+    private void FillStorage(Entity<SurplusBundleComponent, StoreComponent> ent)
+    {
+        var cords = Transform(ent).Coordinates;
+        var content = GetRandomContent(ent);
         foreach (var item in content)
         {
-            var ent = EntityManager.SpawnEntity(item.ProductEntity, cords);
-            _entityStorage.Insert(ent, uid);
+            var dode = Spawn(item.ProductEntity, cords);
+            _entityStorage.Insert(dode, ent);
         }
     }
 
     // wow, is this leetcode reference?
-    private List<ListingData> GetRandomContent(FixedPoint2 targetCost)
+    private List<ListingData> GetRandomContent(Entity<SurplusBundleComponent, StoreComponent> ent)
     {
         var ret = new List<ListingData>();
-        if (_listings.Length == 0)
+
+        var listings = _store.GetAvailableListings(ent, null, ent.Comp2.Categories)
+            .OrderBy(p => p.Cost.Values.Sum())
+            .ToList();
+
+        if (listings.Count == 0)
             return ret;
 
         var totalCost = FixedPoint2.Zero;
         var index = 0;
-        while (totalCost < targetCost)
+        while (totalCost < ent.Comp1.TotalPrice)
         {
             // All data is sorted in price descending order
             // Find new item with the lowest acceptable price
             // All expansive items will be before index, all acceptable after
-            var remainingBudget = targetCost - totalCost;
-            while (_listings[index].Cost.Values.Sum() > remainingBudget)
+            var remainingBudget = ent.Comp1.TotalPrice - totalCost;
+            while (listings[index].Cost.Values.Sum() > remainingBudget)
             {
                 index++;
-                if (index >= _listings.Length)
+                if (index >= listings.Count)
                 {
                     // Looks like no cheap items left
                     // It shouldn't be case for ss14 content
@@ -82,8 +73,8 @@ public sealed class SurplusBundleSystem : EntitySystem
             }
 
             // Select random listing and add into crate
-            var randomIndex = _random.Next(index, _listings.Length);
-            var randomItem = _listings[randomIndex];
+            var randomIndex = _random.Next(index, listings.Count);
+            var randomItem = listings[randomIndex];
             ret.Add(randomItem);
             totalCost += randomItem.Cost.Values.Sum();
         }
diff --git a/Content.Server/Traitor/Uplink/UplinkComponent.cs b/Content.Server/Traitor/Uplink/UplinkComponent.cs
new file mode 100644
index 0000000000..35f11ce9ef
--- /dev/null
+++ b/Content.Server/Traitor/Uplink/UplinkComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.Traitor.Uplink;
+
+/// <summary>
+/// This is used for identifying something as a hidden uplink and showing the UI.
+/// </summary>
+[RegisterComponent]
+public sealed partial class UplinkComponent : Component;
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 5670e28ec9..7c39f1ed66 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -5,6 +5,7 @@ using Content.Shared.PDA;
 using Content.Server.Store.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
 
 namespace Content.Server.Traitor.Uplink
 {
@@ -17,18 +18,6 @@ namespace Content.Server.Traitor.Uplink
         [ValidatePrototypeId<CurrencyPrototype>]
         public const string TelecrystalCurrencyPrototype = "Telecrystal";
 
-        /// <summary>
-        ///     Gets the amount of TC on an "uplink"
-        ///     Mostly just here for legacy systems based on uplink.
-        /// </summary>
-        /// <param name="component"></param>
-        /// <returns>the amount of TC</returns>
-        public int GetTCBalance(StoreComponent component)
-        {
-            FixedPoint2? tcBalance = component.Balance.GetValueOrDefault(TelecrystalCurrencyPrototype);
-            return tcBalance?.Int() ?? 0;
-        }
-
         /// <summary>
         /// Adds an uplink to the target
         /// </summary>
@@ -37,7 +26,7 @@ namespace Content.Server.Traitor.Uplink
         /// <param name="uplinkPresetId">The id of the storepreset</param>
         /// <param name="uplinkEntity">The entity that will actually have the uplink functionality. Defaults to the PDA if null.</param>
         /// <returns>Whether or not the uplink was added successfully</returns>
-        public bool AddUplink(EntityUid user, FixedPoint2? balance, string uplinkPresetId = "StorePresetUplink", EntityUid? uplinkEntity = null)
+        public bool AddUplink(EntityUid user, FixedPoint2? balance, EntityUid? uplinkEntity = null)
         {
             // Try to find target item
             if (uplinkEntity == null)
@@ -47,11 +36,10 @@ namespace Content.Server.Traitor.Uplink
                     return false;
             }
 
+            EnsureComp<UplinkComponent>(uplinkEntity.Value);
             var store = EnsureComp<StoreComponent>(uplinkEntity.Value);
-            _store.InitializeFromPreset(uplinkPresetId, uplinkEntity.Value, store);
             store.AccountOwner = user;
             store.Balance.Clear();
-
             if (balance != null)
             {
                 store.Balance.Clear();
diff --git a/Content.Server/Verbs/Commands/ListVerbsCommand.cs b/Content.Server/Verbs/Commands/ListVerbsCommand.cs
index 7b541afa66..1c80edb82a 100644
--- a/Content.Server/Verbs/Commands/ListVerbsCommand.cs
+++ b/Content.Server/Verbs/Commands/ListVerbsCommand.cs
@@ -1,11 +1,12 @@
 using Content.Server.Administration;
+using Content.Server.Database;
 using Content.Shared.Administration;
 using Content.Shared.Verbs;
 using Robust.Shared.Console;
 
 namespace Content.Server.Verbs.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class ListVerbsCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs
index 5bd18cd8c4..edb11f0bdb 100644
--- a/Content.Server/Voting/Managers/VoteManager.cs
+++ b/Content.Server/Voting/Managers/VoteManager.cs
@@ -316,7 +316,7 @@ namespace Content.Server.Voting.Managers
             timeSpan = default;
 
             // Admins can always call votes.
-            if (_adminMgr.HasAdminFlag(initiator, AdminFlags.Admin))
+            if (_adminMgr.HasAdminFlag(initiator, AdminFlags.Moderator))
             {
                 isAdmin = true;
                 return true;
@@ -370,7 +370,7 @@ namespace Content.Server.Voting.Managers
                 .Select(e => e.Data)
                 .ToImmutableArray();
             // Store all votes in order for webhooks
-            var voteTally = new List<int>(); 
+            var voteTally = new List<int>();
             foreach(var entry in v.Entries)
             {
                 voteTally.Add(entry.Votes);
diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs
index 3c792dc625..a6cfb3e0b9 100644
--- a/Content.Server/Voting/VoteCommands.cs
+++ b/Content.Server/Voting/VoteCommands.cs
@@ -66,7 +66,7 @@ namespace Content.Server.Voting
         }
     }
 
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class CreateCustomCommand : IConsoleCommand
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
@@ -308,7 +308,7 @@ namespace Content.Server.Voting
         }
     }
 
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class CancelVoteCommand : IConsoleCommand
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 986cac98dd..cb893299a9 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -237,7 +237,7 @@ public sealed partial class GunSystem : SharedGunSystem
                         {
                             if (!Deleted(hitEntity))
                             {
-                                if (dmg.Any())
+                                if (dmg.AnyPositive())
                                 {
                                     _color.RaiseEffect(Color.Red, new List<EntityUid>() { hitEntity }, Filter.Pvs(hitEntity, entityManager: EntityManager));
                                 }
@@ -396,7 +396,7 @@ public sealed partial class GunSystem : SharedGunSystem
             var (_, gridRot, gridInvMatrix) = TransformSystem.GetWorldPositionRotationInvMatrix(gridXform, xformQuery);
 
             fromCoordinates = new EntityCoordinates(gridUid.Value,
-                gridInvMatrix.Transform(fromCoordinates.ToMapPos(EntityManager, TransformSystem)));
+                Vector2.Transform(fromCoordinates.ToMapPos(EntityManager, TransformSystem), gridInvMatrix));
 
             // Use the fallback angle I guess?
             angle -= gridRot;
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
index 895bb0217b..65aaabdf0e 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
@@ -1,15 +1,16 @@
 using System.Linq;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
+using Content.Shared.Whitelist;
 using Content.Shared.Xenoarchaeology.XenoArtifacts;
 using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization.Manager;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts;
 
 public sealed partial class ArtifactSystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
     private const int MaxEdgesPerNode = 4;
 
     private readonly HashSet<int> _usedNodeIds = new();
@@ -81,7 +82,8 @@ public sealed partial class ArtifactSystem
     private string GetRandomTrigger(EntityUid artifact, ref ArtifactNode node)
     {
         var allTriggers = _prototype.EnumeratePrototypes<ArtifactTriggerPrototype>()
-            .Where(x => (x.Whitelist?.IsValid(artifact, EntityManager) ?? true) && (!x.Blacklist?.IsValid(artifact, EntityManager) ?? true)).ToList();
+            .Where(x => _whitelistSystem.IsWhitelistPassOrNull(x.Whitelist, artifact) &&
+            _whitelistSystem.IsBlacklistFailOrNull(x.Blacklist, artifact)).ToList();
         var validDepth = allTriggers.Select(x => x.TargetDepth).Distinct().ToList();
 
         var weights = GetDepthWeights(validDepth, node.Depth);
@@ -95,7 +97,8 @@ public sealed partial class ArtifactSystem
     private string GetRandomEffect(EntityUid artifact, ref ArtifactNode node)
     {
         var allEffects = _prototype.EnumeratePrototypes<ArtifactEffectPrototype>()
-            .Where(x => (x.Whitelist?.IsValid(artifact, EntityManager) ?? true) && (!x.Blacklist?.IsValid(artifact, EntityManager) ?? true)).ToList();
+            .Where(x => _whitelistSystem.IsWhitelistPassOrNull(x.Whitelist, artifact) &&
+            _whitelistSystem.IsBlacklistFailOrNull(x.Blacklist, artifact)).ToList();
         var validDepth = allEffects.Select(x => x.TargetDepth).Distinct().ToList();
 
         var weights = GetDepthWeights(validDepth, node.Depth);
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index a2c13ed71c..0a745d5fc7 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -21,6 +21,7 @@ using Content.Shared.Damage;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Humanoid;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -106,6 +107,7 @@ namespace Content.Server.Zombies
             RemComp<ReproductiveComponent>(target);
             RemComp<ReproductivePartnerComponent>(target);
             RemComp<LegsParalyzedComponent>(target);
+            RemComp<ComplexInteractionComponent>(target);
 
             //funny voice
             var accentType = "zombie";
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index 47b3997806..d2883b5ef5 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -96,9 +96,9 @@ namespace Content.Shared.ActionBlocker
         ///     involve using a held entity. In the majority of cases, systems that provide interactions will not need
         ///     to check this themselves.
         /// </remarks>
-        public bool CanUseHeldEntity(EntityUid user)
+        public bool CanUseHeldEntity(EntityUid user, EntityUid used)
         {
-            var ev = new UseAttemptEvent(user);
+            var ev = new UseAttemptEvent(user, used);
             RaiseLocalEvent(user, ev);
 
             return !ev.Cancelled;
diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs
index 57c145a0ec..9156f747f5 100644
--- a/Content.Shared/Actions/BaseActionComponent.cs
+++ b/Content.Shared/Actions/BaseActionComponent.cs
@@ -1,14 +1,16 @@
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Actions;
 
-// TODO ACTIONS make this a seprate component and remove the inheritance stuff.
+// TODO ACTIONS make this a separate component and remove the inheritance stuff.
 // TODO ACTIONS convert to auto comp state?
 
 // TODO add access attribute. Need to figure out what to do with decal & mapping actions.
 // [Access(typeof(SharedActionsSystem))]
+[EntityCategory("Actions")]
 public abstract partial class BaseActionComponent : Component
 {
     public abstract BaseActionEvent? BaseEvent { get; }
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index c92d67ba81..bf86d2c1e4 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -112,7 +112,7 @@ public abstract class SharedActionsSystem : EntitySystem
         bool logError = true)
     {
         result = null;
-        if (!Exists(uid))
+        if (uid == null || TerminatingOrDeleted(uid.Value))
             return false;
 
         var ev = new GetActionDataEvent();
diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs
index 571982b548..02db1cf394 100644
--- a/Content.Shared/Administration/AdminFlags.cs
+++ b/Content.Shared/Administration/AdminFlags.cs
@@ -104,6 +104,26 @@
 		///</summary>
 		Adminchat = 1 << 17,
 
+        ///<summary>
+        /// Permits the visibility of Pii in game and on SS14 Admin
+        ///</summary>
+        Pii = 1 << 18,
+
+        /// <summary>
+        ///     Lets you take moderator actions on the game server.
+        /// </summary>
+        Moderator = 1 << 19,
+
+        /// <summary>
+        ///     Lets you check currently online admins.
+        /// </summary>
+        AdminWho = 1 << 20,
+
+        /// <summary>
+        ///     Lets you set the color of your OOC name.
+        /// </summary>
+        NameColor = 1 << 21,
+
         /// <summary>
         ///     Dangerous host permissions like scsi.
         /// </summary>
diff --git a/Content.Shared/Advertise/MessagePackPrototype.cs b/Content.Shared/Advertise/MessagePackPrototype.cs
deleted file mode 100644
index f7495d7e46..0000000000
--- a/Content.Shared/Advertise/MessagePackPrototype.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Advertise;
-
-[Serializable, Prototype("messagePack")]
-public sealed partial class MessagePackPrototype : IPrototype
-{
-    [ViewVariables]
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    [DataField]
-    public List<LocId> Messages { get; private set; } = [];
-}
diff --git a/Content.Shared/Atmos/GasMixture.cs b/Content.Shared/Atmos/GasMixture.cs
index a676ed6720..0f1efba976 100644
--- a/Content.Shared/Atmos/GasMixture.cs
+++ b/Content.Shared/Atmos/GasMixture.cs
@@ -96,6 +96,11 @@ namespace Content.Shared.Atmos
             Volume = volume;
         }
 
+        public GasMixture(GasMixture toClone)
+        {
+            CopyFrom(toClone);
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void MarkImmutable()
         {
@@ -197,9 +202,12 @@ namespace Content.Shared.Atmos
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void CopyFromMutable(GasMixture sample)
+        public void CopyFrom(GasMixture sample)
         {
-            if (Immutable) return;
+            if (Immutable)
+                return;
+
+            Volume = sample.Volume;
             sample.Moles.CopyTo(Moles, 0);
             Temperature = sample.Temperature;
         }
diff --git a/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs b/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs
index e2b54bf951..ae09976704 100644
--- a/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs
+++ b/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs
@@ -182,7 +182,7 @@ public sealed class BodyPrototypeSerializer : ITypeReader<BodyPrototype, Mapping
 
         foreach (var (slotId, (part, connections, organs)) in allConnections)
         {
-            var slot = new BodyPrototypeSlot(part != null ? new EntProtoId(part) : null!, connections ?? new HashSet<string>(), organs ?? new Dictionary<string, string>());
+            var slot = new BodyPrototypeSlot(part, connections ?? new HashSet<string>(), organs ?? new Dictionary<string, string>());
             slots.Add(slotId, slot);
         }
 
diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs
index 326272cc7d..45a89f3be9 100644
--- a/Content.Shared/Burial/BurialSystem.cs
+++ b/Content.Shared/Burial/BurialSystem.cs
@@ -83,10 +83,11 @@ public sealed class BurialSystem : EntitySystem
 
     private void OnActivate(EntityUid uid, GraveComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         _popupSystem.PopupClient(Loc.GetString("grave-digging-requires-tool", ("grave", args.Target)), uid, args.User);
+        args.Handled = true;
     }
 
     private void OnGraveDigging(EntityUid uid, GraveComponent component, GraveDiggingDoAfterEvent args)
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 5ea9b697ff..72a0e53537 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -225,6 +225,12 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<bool>
             GameRoleTimers = CVarDef.Create("game.role_timers", true, CVar.SERVER | CVar.REPLICATED);
 
+        /// <summary>
+        /// If roles should be restricted based on whether or not they are whitelisted.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameRoleWhitelist = CVarDef.Create("game.role_whitelist", true, CVar.SERVER | CVar.REPLICATED);
+
         /// <summary>
         /// Whether or not disconnecting inside of a cryopod should remove the character or just store them until they reconnect.
         /// </summary>
diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs
index f7311d2dc8..85367ffb73 100644
--- a/Content.Shared/Chat/MsgChatMessage.cs
+++ b/Content.Shared/Chat/MsgChatMessage.cs
@@ -11,8 +11,19 @@ namespace Content.Shared.Chat
     public sealed class ChatMessage
     {
         public ChatChannel Channel;
+
+        /// <summary>
+        /// This is the text spoken by the entity, after accents and such were applied.
+        /// This should have <see cref="FormattedMessage.EscapeText"/> applied before using it in any rich text box.
+        /// </summary>
         public string Message;
+
+        /// <summary>
+        /// This is the <see cref="Message"/> but with special characters escaped and wrapped in some rich text
+        /// formatting tags.
+        /// </summary>
         public string WrappedMessage;
+
         public NetEntity SenderEntity;
 
         /// <summary>
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs
index 8795706612..c8e8e89ce5 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs
@@ -31,7 +31,11 @@ public abstract class SharedSolutionContainerMixerSystem : EntitySystem
 
     private void OnActivateInWorld(Entity<SolutionContainerMixerComponent> entity, ref ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         TryStartMix(entity, args.User);
+        args.Handled = true;
     }
 
     private void OnRemoveAttempt(Entity<SolutionContainerMixerComponent> ent, ref ContainerIsRemovingAttemptEvent args)
diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
index a447a54df1..fced03bfab 100644
--- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
@@ -12,9 +12,10 @@ public abstract class SharedChameleonClothingSystem : EntitySystem
 {
     [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
     [Dependency] private readonly ClothingSystem _clothingSystem = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     public override void Initialize()
     {
@@ -81,7 +82,7 @@ public abstract class SharedChameleonClothingSystem : EntitySystem
             return false;
 
         // check if it is marked as valid chameleon target
-        if (!proto.TryGetComponent(out TagComponent? tags, _factory) || !tags.Tags.Contains("WhitelistChameleon"))
+        if (!proto.TryGetComponent(out TagComponent? tag, _factory) || !_tag.HasTag(tag, "WhitelistChameleon"))
             return false;
 
         // check if it's valid clothing
diff --git a/Content.Shared/Construction/Conditions/NoWindowsInTile.cs b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
index be6bc2cfac..3ae3b59362 100644
--- a/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
+++ b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
@@ -12,13 +12,12 @@ namespace Content.Shared.Construction.Conditions
         public bool Condition(EntityUid user, EntityCoordinates location, Direction direction)
         {
             var entManager = IoCManager.Resolve<IEntityManager>();
-            var tagQuery = entManager.GetEntityQuery<TagComponent>();
             var sysMan = entManager.EntitySysManager;
             var tagSystem = sysMan.GetEntitySystem<TagSystem>();
 
             foreach (var entity in location.GetEntitiesInTile(LookupFlags.Static))
             {
-                if (tagSystem.HasTag(entity, "Window", tagQuery))
+                if (tagSystem.HasTag(entity, "Window"))
                     return false;
             }
 
diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
index c041cf1ba0..e9ef053f62 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -15,6 +15,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
@@ -32,16 +33,14 @@ public sealed partial class AnchorableSystem : EntitySystem
     [Dependency] private   readonly TagSystem _tagSystem = default!;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
-    private EntityQuery<TagComponent> _tagQuery;
 
-    public const string Unstackable = "Unstackable";
+    public readonly ProtoId<TagPrototype> Unstackable = "Unstackable";
 
     public override void Initialize()
     {
         base.Initialize();
 
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
-        _tagQuery = GetEntityQuery<TagComponent>();
 
         SubscribeLocalEvent<AnchorableComponent, InteractUsingEvent>(OnInteractUsing,
             before: new[] { typeof(ItemSlotsSystem) }, after: new[] { typeof(SharedConstructionSystem) });
@@ -312,7 +311,7 @@ public sealed partial class AnchorableSystem : EntitySystem
         DebugTools.Assert(!Transform(uid).Anchored);
 
         // If we are unstackable, iterate through any other entities anchored on the current square
-        return _tagSystem.HasTag(uid, Unstackable, _tagQuery) && AnyUnstackablesAnchoredAt(location);
+        return _tagSystem.HasTag(uid, Unstackable) && AnyUnstackablesAnchoredAt(location);
     }
 
     public bool AnyUnstackablesAnchoredAt(EntityCoordinates location)
@@ -327,10 +326,8 @@ public sealed partial class AnchorableSystem : EntitySystem
         while (enumerator.MoveNext(out var entity))
         {
             // If we find another unstackable here, return true.
-            if (_tagSystem.HasTag(entity.Value, Unstackable, _tagQuery))
-            {
+            if (_tagSystem.HasTag(entity.Value, Unstackable))
                 return true;
-            }
         }
 
         return false;
diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs
index 1a19040b41..359b58c881 100644
--- a/Content.Shared/Construction/MachinePartSystem.cs
+++ b/Content.Shared/Construction/MachinePartSystem.cs
@@ -87,9 +87,9 @@ namespace Content.Shared.Construction
             foreach (var (stackId, amount) in comp.MaterialIdRequirements)
             {
                 var stackProto = _prototype.Index<StackPrototype>(stackId);
+                var defaultProto = _prototype.Index(stackProto.Spawn);
 
-                if (_prototype.TryIndex(stackProto.Spawn, out var defaultProto) &&
-                    defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp))
+                if (defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp))
                 {
                     foreach (var (mat, matAmount) in physComp.MaterialComposition)
                     {
diff --git a/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
index 668952dac2..07ba46946a 100644
--- a/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
@@ -1,14 +1,15 @@
 using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Construction.Steps
 {
     public sealed partial class MultipleTagsConstructionGraphStep : ArbitraryInsertConstructionGraphStep
     {
         [DataField("allTags")]
-        private List<string>? _allTags;
+        private List<ProtoId<TagPrototype>>? _allTags;
 
         [DataField("anyTags")]
-        private List<string>? _anyTags;
+        private List<ProtoId<TagPrototype>>? _anyTags;
 
         private static bool IsNullOrEmpty<T>(ICollection<T>? list)
         {
@@ -21,16 +22,12 @@ namespace Content.Shared.Construction.Steps
             if (IsNullOrEmpty(_allTags) && IsNullOrEmpty(_anyTags))
                 return false; // Step is somehow invalid, we return.
 
-            // No tags at all.
-            if (!entityManager.TryGetComponent(uid, out TagComponent? tags))
-                return false;
-
             var tagSystem = entityManager.EntitySysManager.GetEntitySystem<TagSystem>();
 
-            if (_allTags != null && !tagSystem.HasAllTags(tags, _allTags))
+            if (_allTags != null && !tagSystem.HasAllTags(uid, _allTags))
                 return false; // We don't have all the tags needed.
 
-            if (_anyTags != null && !tagSystem.HasAnyTag(tags, _anyTags))
+            if (_anyTags != null && !tagSystem.HasAnyTag(uid, _anyTags))
                 return false; // We don't have any of the tags needed.
 
             // This entity is valid!
diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
index 2e3f9ed461..48f4f07cbe 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -31,6 +32,7 @@ namespace Content.Shared.Containers.ItemSlots
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+        [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
         public override void Initialize()
         {
@@ -266,8 +268,7 @@ namespace Content.Shared.Containers.ItemSlots
             if (slot.ContainerSlot == null)
                 return false;
 
-            if ((!slot.Whitelist?.IsValid(usedUid) ?? false) ||
-                (slot.Blacklist?.IsValid(usedUid) ?? false))
+            if (_whitelistSystem.IsWhitelistFail(slot.Whitelist, usedUid) || _whitelistSystem.IsBlacklistPass(slot.Blacklist, usedUid))
             {
                 if (popup.HasValue && slot.WhitelistFailPopup.HasValue)
                     _popupSystem.PopupClient(Loc.GetString(slot.WhitelistFailPopup), uid, popup.Value);
diff --git a/Content.Shared/Damage/DamageSpecifier.cs b/Content.Shared/Damage/DamageSpecifier.cs
index 8ab9116a97..7f505b807f 100644
--- a/Content.Shared/Damage/DamageSpecifier.cs
+++ b/Content.Shared/Damage/DamageSpecifier.cs
@@ -43,7 +43,7 @@ namespace Content.Shared.Damage
         /// </summary>
         /// <remarks>
         ///     Note that this being zero does not mean this damage has no effect. Healing in one type may cancel damage
-        ///     in another. Consider using <see cref="Any()"/> or <see cref="Empty"/> instead.
+        ///     in another. Consider using <see cref="AnyPositive"/> or <see cref="Empty"/> instead.
         /// </remarks>
         public FixedPoint2 GetTotal()
         {
@@ -60,7 +60,7 @@ namespace Content.Shared.Damage
         /// Differs from <see cref="Empty"/> as a damage specifier might contain entries with zeroes.
         /// This also returns false if the specifier only contains negative values.
         /// </summary>
-        public bool Any()
+        public bool AnyPositive()
         {
             foreach (var value in DamageDict.Values)
             {
diff --git a/Content.Shared/Damage/Systems/DamageContactsSystem.cs b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
index aec3d0766a..b08ef77fed 100644
--- a/Content.Shared/Damage/Systems/DamageContactsSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Damage.Components;
+using Content.Shared.Whitelist;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
@@ -11,6 +12,7 @@ public sealed class DamageContactsSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -63,7 +65,7 @@ public sealed class DamageContactsSystem : EntitySystem
         if (HasComp<DamagedByContactComponent>(otherUid))
             return;
 
-        if (component.IgnoreWhitelist?.IsValid(otherUid) ?? false)
+        if (_whitelistSystem.IsWhitelistFail(component.IgnoreWhitelist, otherUid))
             return;
 
         var damagedByContact = EnsureComp<DamagedByContactComponent>(otherUid);
diff --git a/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
index c8783b05fc..7e665dc190 100644
--- a/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
+++ b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
@@ -28,7 +28,7 @@ namespace Content.Shared.DeviceLinking.Systems
 
         private void OnActivated(EntityUid uid, TwoWayLeverComponent component, ActivateInWorldEvent args)
         {
-            if (args.Handled)
+            if (args.Handled || !args.Complex)
                 return;
 
             component.State = component.State switch
diff --git a/Content.Shared/Devour/SharedDevourSystem.cs b/Content.Shared/Devour/SharedDevourSystem.cs
index 3d73b14dd3..14047fba7d 100644
--- a/Content.Shared/Devour/SharedDevourSystem.cs
+++ b/Content.Shared/Devour/SharedDevourSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.DoAfter;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -18,6 +19,7 @@ public abstract class SharedDevourSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -41,7 +43,7 @@ public abstract class SharedDevourSystem : EntitySystem
     /// </summary>
     protected void OnDevourAction(EntityUid uid, DevourerComponent component, DevourActionEvent args)
     {
-        if (args.Handled || component.Whitelist?.IsValid(args.Target, EntityManager) != true)
+        if (args.Handled || _whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, args.Target))
             return;
 
         args.Handled = true;
diff --git a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
index c39139f9a5..9fdb4a6a80 100644
--- a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
@@ -6,6 +6,7 @@ using Content.Shared.DragDrop;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Item;
 using Content.Shared.Throwing;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -25,6 +26,7 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
     [Dependency] protected readonly IGameTiming GameTiming = default!;
     [Dependency] protected readonly MetaDataSystem Metadata = default!;
     [Dependency] protected readonly SharedJointSystem Joints = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     protected static TimeSpan ExitAttemptDelay = TimeSpan.FromSeconds(0.5);
 
@@ -113,10 +115,8 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
         if (!storable && !HasComp<BodyComponent>(entity))
             return false;
 
-        if (component.Blacklist?.IsValid(entity, EntityManager) == true)
-            return false;
-
-        if (component.Whitelist != null && component.Whitelist?.IsValid(entity, EntityManager) != true)
+        if (_whitelistSystem.IsBlacklistPass(component.Blacklist, entity) ||
+            _whitelistSystem.IsWhitelistFail(component.Whitelist, entity))
             return false;
 
         if (TryComp<PhysicsComponent>(entity, out var physics) && (physics.CanCollide) || storable)
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index 20456c1477..ab2df72568 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -215,7 +215,7 @@ public abstract partial class SharedDoorSystem : EntitySystem
     #region Interactions
     protected void OnActivate(EntityUid uid, DoorComponent door, ActivateInWorldEvent args)
     {
-        if (args.Handled || !door.ClickOpen)
+        if (args.Handled || !args.Complex || !door.ClickOpen)
             return;
 
         if (!TryToggleDoor(uid, door, args.User, predicted: true))
diff --git a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
index 4afe26039b..03350d2e64 100644
--- a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
@@ -56,25 +56,36 @@ public abstract class SharedFirelockSystem : EntitySystem
 
         if (!component.Powered || (!overrideAccess && component.IsLocked))
             args.Cancel();
+        else if (args.User != null)
+            WarnPlayer((uid, component), args.User.Value);
     }
 
     private void OnDoorGetPryTimeModifier(EntityUid uid, FirelockComponent component, ref GetPryTimeModifierEvent args)
     {
-        if (component.Temperature)
-        {
-            _popupSystem.PopupClient(Loc.GetString("firelock-component-is-holding-fire-message"),
-                uid, args.User, PopupType.MediumCaution);
-        }
-        else if (component.Pressure)
-        {
-            _popupSystem.PopupClient(Loc.GetString("firelock-component-is-holding-pressure-message"),
-                uid, args.User, PopupType.MediumCaution);
-        }
+        WarnPlayer((uid, component), args.User);
 
         if (component.IsLocked)
             args.PryTimeModifier *= component.LockedPryTimeModifier;
     }
 
+    private void WarnPlayer(Entity<FirelockComponent> ent, EntityUid user)
+    {
+        if (ent.Comp.Temperature)
+        {
+            _popupSystem.PopupClient(Loc.GetString("firelock-component-is-holding-fire-message"),
+                ent.Owner,
+                user,
+                PopupType.MediumCaution);
+        }
+        else if (ent.Comp.Pressure)
+        {
+            _popupSystem.PopupClient(Loc.GetString("firelock-component-is-holding-pressure-message"),
+                ent.Owner,
+                user,
+                PopupType.MediumCaution);
+        }
+    }
+
     private void OnAfterPried(EntityUid uid, FirelockComponent component, ref PriedEvent args)
     {
         component.EmergencyCloseCooldown = _gameTiming.CurTime + component.EmergencyCloseCooldownDuration;
diff --git a/Content.Shared/Dragon/SharedDragonRiftComponent.cs b/Content.Shared/Dragon/SharedDragonRiftComponent.cs
index 0d2bf44018..8377dbfee7 100644
--- a/Content.Shared/Dragon/SharedDragonRiftComponent.cs
+++ b/Content.Shared/Dragon/SharedDragonRiftComponent.cs
@@ -1,9 +1,10 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Dragon;
 
-[NetworkedComponent]
+[NetworkedComponent, EntityCategory("Spawner")]
 public abstract partial class SharedDragonRiftComponent : Component
 {
     [DataField("state")]
diff --git a/Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs b/Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs
index 7477b6c26e..88e81c93c5 100644
--- a/Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs
+++ b/Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
@@ -15,7 +16,7 @@ public sealed partial class ExplosionVisualsComponent : Component
     public Dictionary<EntityUid, Dictionary<int, List<Vector2i>>> Tiles = new();
     public List<float> Intensity = new();
     public string ExplosionType = string.Empty;
-    public Matrix3 SpaceMatrix;
+    public Matrix3x2 SpaceMatrix;
     public ushort SpaceTileSize;
 }
 
@@ -27,7 +28,7 @@ public sealed class ExplosionVisualsState : ComponentState
     public Dictionary<NetEntity, Dictionary<int, List<Vector2i>>> Tiles;
     public List<float> Intensity;
     public string ExplosionType = string.Empty;
-    public Matrix3 SpaceMatrix;
+    public Matrix3x2 SpaceMatrix;
     public ushort SpaceTileSize;
 
     public ExplosionVisualsState(
@@ -36,7 +37,7 @@ public sealed class ExplosionVisualsState : ComponentState
         List<float> intensity,
         Dictionary<int, List<Vector2i>>? spaceTiles,
         Dictionary<NetEntity, Dictionary<int, List<Vector2i>>> tiles,
-        Matrix3 spaceMatrix,
+        Matrix3x2 spaceMatrix,
         ushort spaceTileSize)
     {
         Epicenter = epicenter;
diff --git a/Content.Shared/Flash/Components/FlashComponent.cs b/Content.Shared/Flash/Components/FlashComponent.cs
index a9098bc85a..29f92eb94f 100644
--- a/Content.Shared/Flash/Components/FlashComponent.cs
+++ b/Content.Shared/Flash/Components/FlashComponent.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Flash;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Flash.Components
 {
@@ -43,4 +43,13 @@ namespace Content.Shared.Flash.Components
         [DataField]
         public float Probability = 1f;
     }
+
+    [Serializable, NetSerializable]
+    public enum FlashVisuals : byte
+    {
+        BaseLayer,
+        LightLayer,
+        Burnt,
+        Flashing,
+    }
 }
diff --git a/Content.Shared/Flash/Components/FlashedComponent.cs b/Content.Shared/Flash/Components/FlashedComponent.cs
new file mode 100644
index 0000000000..75bbb12304
--- /dev/null
+++ b/Content.Shared/Flash/Components/FlashedComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Flash.Components;
+
+/// <summary>
+///     Exists for use as a status effect. Adds a shader to the client that obstructs vision.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class FlashedComponent : Component { }
diff --git a/Content.Shared/Flash/FlashableComponent.cs b/Content.Shared/Flash/FlashableComponent.cs
deleted file mode 100644
index c4f8074cea..0000000000
--- a/Content.Shared/Flash/FlashableComponent.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared.Physics;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Flash
-{
-    [RegisterComponent, NetworkedComponent]
-    public sealed partial class FlashableComponent : Component
-    {
-        public float Duration;
-        public TimeSpan LastFlash;
-
-        [DataField]
-        public CollisionGroup CollisionGroup = CollisionGroup.Opaque;
-
-        public override bool SendOnlyToOwner => true;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class FlashableComponentState : ComponentState
-    {
-        public float Duration { get; }
-        public TimeSpan Time { get; }
-
-        public FlashableComponentState(float duration, TimeSpan time)
-        {
-            Duration = duration;
-            Time = time;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public enum FlashVisuals : byte
-    {
-        BaseLayer,
-        LightLayer,
-        Burnt,
-        Flashing,
-    }
-}
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index 16fdbfc2f3..f83f02a310 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -1,19 +1,10 @@
-using Robust.Shared.GameStates;
+using Content.Shared.StatusEffect;
 
 namespace Content.Shared.Flash
 {
     public abstract class SharedFlashSystem : EntitySystem
     {
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<FlashableComponent, ComponentGetState>(OnFlashableGetState);
-        }
-
-        private static void OnFlashableGetState(EntityUid uid, FlashableComponent component, ref ComponentGetState args)
-        {
-            args.State = new FlashableComponentState(component.Duration, component.LastFlash);
-        }
+        [ValidatePrototypeId<StatusEffectPrototype>]
+        public const string FlashedKey = "Flashed";
     }
 }
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
index 6d4d332479..ae22efcd6a 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
@@ -3,6 +3,7 @@ using Content.Shared.Examine;
 using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
+using Content.Shared.Interaction;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Localizations;
 using Robust.Shared.Input.Binding;
@@ -23,6 +24,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
         SubscribeAllEvent<RequestMoveHandItemEvent>(HandleMoveItemFromHand);
         SubscribeAllEvent<RequestHandAltInteractEvent>(HandleHandAltInteract);
 
+        SubscribeLocalEvent<HandsComponent, GetUsedEntityEvent>(OnGetUsedEntity);
         SubscribeLocalEvent<HandsComponent, ExaminedEvent>(HandleExamined);
 
         CommandBinds.Builder
@@ -181,6 +183,18 @@ public abstract partial class SharedHandsSystem : EntitySystem
         return true;
     }
 
+    private void OnGetUsedEntity(EntityUid uid, HandsComponent component, ref GetUsedEntityEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // TODO: this pattern is super uncommon, but it might be worth changing GetUsedEntityEvent to be recursive.
+        if (TryComp<VirtualItemComponent>(component.ActiveHandEntity, out var virtualItem))
+            args.Used = virtualItem.BlockingEntity;
+        else
+            args.Used = component.ActiveHandEntity;
+    }
+
     //TODO: Actually shows all items/clothing/etc.
     private void HandleExamined(EntityUid examinedUid, HandsComponent handsComp, ExaminedEvent args)
     {
diff --git a/Content.Shared/Humanoid/Prototypes/RandomHumanoidSettingsPrototype.cs b/Content.Shared/Humanoid/Prototypes/RandomHumanoidSettingsPrototype.cs
index ec6818221a..a97c3134be 100644
--- a/Content.Shared/Humanoid/Prototypes/RandomHumanoidSettingsPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/RandomHumanoidSettingsPrototype.cs
@@ -15,6 +15,7 @@ public sealed partial class RandomHumanoidSettingsPrototype : IPrototype, IInher
     public string[]? Parents { get; }
 
     [AbstractDataField]
+    [NeverPushInheritance]
     public bool Abstract { get; }
 
     /// <summary>
@@ -32,6 +33,7 @@ public sealed partial class RandomHumanoidSettingsPrototype : IPrototype, IInher
     /// <summary>
     ///     Extra components to add to this entity.
     /// </summary>
-    [DataField("components")]
+    [DataField]
+    [AlwaysPushInheritance]
     public ComponentRegistry? Components { get; private set; }
 }
diff --git a/Content.Shared/IdentityManagement/Identity.cs b/Content.Shared/IdentityManagement/Identity.cs
index 20220e0326..2fb53e3d5a 100644
--- a/Content.Shared/IdentityManagement/Identity.cs
+++ b/Content.Shared/IdentityManagement/Identity.cs
@@ -15,7 +15,11 @@ public static class Identity
     /// </summary>
     public static string Name(EntityUid uid, IEntityManager ent, EntityUid? viewer=null)
     {
-        var uidName = ent.GetComponent<MetaDataComponent>(uid).EntityName;
+        var meta = ent.GetComponent<MetaDataComponent>(uid);
+        if (meta.EntityLifeStage <= EntityLifeStage.Initializing)
+            return meta.EntityName; // Identity component and such will not yet have initialized and may throw NREs
+
+        var uidName = meta.EntityName;
 
         if (!ent.TryGetComponent<IdentityComponent>(uid, out var identity))
             return uidName;
@@ -34,7 +38,7 @@ public static class Identity
             return uidName;
         }
 
-        return uidName + $" ({identName})";
+        return $"{uidName} ({identName})";
     }
 
     /// <summary>
diff --git a/Content.Shared/Implants/SharedImplanterSystem.cs b/Content.Shared/Implants/SharedImplanterSystem.cs
index d78522b56c..44803e721c 100644
--- a/Content.Shared/Implants/SharedImplanterSystem.cs
+++ b/Content.Shared/Implants/SharedImplanterSystem.cs
@@ -20,6 +20,7 @@ public abstract class SharedImplanterSystem : EntitySystem
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -105,8 +106,8 @@ public abstract class SharedImplanterSystem : EntitySystem
 
     protected bool CheckTarget(EntityUid target, EntityWhitelist? whitelist, EntityWhitelist? blacklist)
     {
-        return whitelist?.IsValid(target, EntityManager) != false &&
-            blacklist?.IsValid(target, EntityManager) != true;
+        return _whitelistSystem.IsWhitelistPassOrNull(whitelist, target) &&
+            _whitelistSystem.IsBlacklistFailOrNull(blacklist, target);
     }
 
     //Draw the implant out of the target
diff --git a/Content.Shared/Interaction/ActivateInWorldEvent.cs b/Content.Shared/Interaction/ActivateInWorldEvent.cs
index 9dbd636c48..f7a1b7a799 100644
--- a/Content.Shared/Interaction/ActivateInWorldEvent.cs
+++ b/Content.Shared/Interaction/ActivateInWorldEvent.cs
@@ -18,14 +18,49 @@ public sealed class ActivateInWorldEvent : HandledEntityEventArgs, ITargetedInte
     /// </summary>
     public EntityUid Target { get; }
 
+    /// <summary>
+    ///     Whether or not <see cref="User"/> can perform complex interactions or only basic ones.
+    /// </summary>
+    public bool Complex;
+
     /// <summary>
     ///     Set to true when the activation is logged by a specific logger.
     /// </summary>
     public bool WasLogged { get; set; }
 
-    public ActivateInWorldEvent(EntityUid user, EntityUid target)
+    public ActivateInWorldEvent(EntityUid user, EntityUid target, bool complex)
     {
         User = user;
         Target = target;
+        Complex = complex;
+    }
+}
+
+/// <summary>
+/// Event raised on the user when it activates something in the world
+/// </summary>
+[PublicAPI]
+public sealed class UserActivateInWorldEvent : HandledEntityEventArgs, ITargetedInteractEventArgs
+{
+    /// <summary>
+    ///     Entity that activated the target world entity.
+    /// </summary>
+    public EntityUid User { get; }
+
+    /// <summary>
+    ///     Entity that was activated in the world.
+    /// </summary>
+    public EntityUid Target { get; }
+
+    /// <summary>
+    ///     Whether or not <see cref="User"/> can perform complex interactions or only basic ones.
+    /// </summary>
+    public bool Complex;
+
+    public UserActivateInWorldEvent(EntityUid user, EntityUid target, bool complex)
+    {
+        User = user;
+        Target = target;
+        Complex = complex;
     }
 }
diff --git a/Content.Shared/Interaction/Components/ComplexInteractionComponent.cs b/Content.Shared/Interaction/Components/ComplexInteractionComponent.cs
new file mode 100644
index 0000000000..ae7d65de36
--- /dev/null
+++ b/Content.Shared/Interaction/Components/ComplexInteractionComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Interaction.Components;
+
+/// <summary>
+/// This is used for identifying entities as being able to use complex interactions with the environment.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedInteractionSystem))]
+public sealed partial class ComplexInteractionComponent : Component;
diff --git a/Content.Server/Interaction/Components/InteractionPopupComponent.cs b/Content.Shared/Interaction/Components/InteractionPopupComponent.cs
similarity index 98%
rename from Content.Server/Interaction/Components/InteractionPopupComponent.cs
rename to Content.Shared/Interaction/Components/InteractionPopupComponent.cs
index 000344e61c..4ef5a1d180 100644
--- a/Content.Server/Interaction/Components/InteractionPopupComponent.cs
+++ b/Content.Shared/Interaction/Components/InteractionPopupComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Interaction.Components;
+namespace Content.Shared.Interaction.Components;
 
 [RegisterComponent, Access(typeof(InteractionPopupSystem))]
 public sealed partial class InteractionPopupComponent : Component
diff --git a/Content.Shared/Interaction/Events/UseAttemptEvent.cs b/Content.Shared/Interaction/Events/UseAttemptEvent.cs
index 3db185ed17..c28f2b6517 100644
--- a/Content.Shared/Interaction/Events/UseAttemptEvent.cs
+++ b/Content.Shared/Interaction/Events/UseAttemptEvent.cs
@@ -1,12 +1,9 @@
 namespace Content.Shared.Interaction.Events
 {
-    public sealed class UseAttemptEvent : CancellableEntityEventArgs
+    public sealed class UseAttemptEvent(EntityUid uid, EntityUid used) : CancellableEntityEventArgs
     {
-        public UseAttemptEvent(EntityUid uid)
-        {
-            Uid = uid;
-        }
+        public EntityUid Uid { get; } = uid;
 
-        public EntityUid Uid { get; }
+        public EntityUid Used = used;
     }
 }
diff --git a/Content.Shared/Interaction/InteractHand.cs b/Content.Shared/Interaction/InteractHand.cs
index 63ea3b6f30..1d2df4c28b 100644
--- a/Content.Shared/Interaction/InteractHand.cs
+++ b/Content.Shared/Interaction/InteractHand.cs
@@ -51,58 +51,4 @@ namespace Content.Shared.Interaction
             Target = target;
         }
     }
-
-    /// <summary>
-    /// Low-level interaction event used for entities without hands.
-    /// </summary>
-    /// <remarks>
-    /// SHIT IS CURSED.
-    /// </remarks>
-    //TODO: KILLLLLLL
-    public sealed class InteractNoHandEvent : HandledEntityEventArgs
-    {
-        /// <summary>
-        ///     Entity that triggered the interaction.
-        /// </summary>
-        public EntityUid User;
-
-        /// <summary>
-        ///     Entity that was interacted on.
-        /// </summary>
-        public EntityUid? Target;
-
-        public EntityCoordinates ClickLocation;
-
-        public InteractNoHandEvent(EntityUid user, EntityUid? target, EntityCoordinates clickLocation)
-        {
-            User = user;
-            Target = target;
-            ClickLocation = clickLocation;
-        }
-    }
-
-    /// <summary>
-    /// Reverse of the InteractNoHandEvent - raised on what was interacted on, rather than the other way around.
-    /// </summary>
-    public sealed class InteractedNoHandEvent : HandledEntityEventArgs
-    {
-        /// <summary>
-        /// Entity that was interacted on
-        /// </summary>
-        public EntityUid Target;
-
-        /// <summary>
-        /// Entity that triggered this interaction
-        /// </summary>
-        public EntityUid User;
-
-        public EntityCoordinates ClickLocation;
-
-        public InteractedNoHandEvent(EntityUid target, EntityUid user, EntityCoordinates clickLocation)
-        {
-            Target = target;
-            User = user;
-            ClickLocation = clickLocation;
-        }
-    }
 }
diff --git a/Content.Server/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs
similarity index 75%
rename from Content.Server/Interaction/InteractionPopupSystem.cs
rename to Content.Shared/Interaction/InteractionPopupSystem.cs
index 77b76f898a..d956ff3d95 100644
--- a/Content.Server/Interaction/InteractionPopupSystem.cs
+++ b/Content.Shared/Interaction/InteractionPopupSystem.cs
@@ -1,26 +1,27 @@
-using Content.Server.Interaction.Components;
-using Content.Server.Popups;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Interaction;
+namespace Content.Shared.Interaction;
 
 public sealed class InteractionPopupSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly INetManager _netMan = default!;
 
     public override void Initialize()
     {
@@ -31,6 +32,9 @@ public sealed class InteractionPopupSystem : EntitySystem
 
     private void OnActivateInWorld(EntityUid uid, InteractionPopupComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!component.OnActivate)
             return;
 
@@ -53,28 +57,39 @@ public sealed class InteractionPopupSystem : EntitySystem
             return;
 
         //Handling does nothing and this thing annoyingly plays way too often.
+        // HUH? What does this comment even mean?
+
         if (HasComp<SleepingComponent>(uid))
             return;
 
-        args.Handled = true;
-
-        var curTime = _gameTiming.CurTime;
-
-        if (curTime < component.LastInteractTime + component.InteractDelay)
-            return;
-
         if (TryComp<MobStateComponent>(uid, out var state)
             && !_mobStateSystem.IsAlive(uid, state))
         {
             return;
         }
 
+        args.Handled = true;
+
+        var curTime = _gameTiming.CurTime;
+
+        if (curTime < component.LastInteractTime + component.InteractDelay)
+            return;
+
+        component.LastInteractTime = curTime;
+
         // TODO: Should be an attempt event
         // TODO: Need to handle pausing with an accumulator.
 
-        string msg = ""; // Stores the text to be shown in the popup message
+        var msg = ""; // Stores the text to be shown in the popup message
         SoundSpecifier? sfx = null; // Stores the filepath of the sound to be played
 
+        var predict = component.SuccessChance is 0 or 1
+                      && component.InteractSuccessSpawn == null
+                      && component.InteractFailureSpawn == null;
+
+        if (_netMan.IsClient && !predict)
+            return;
+
         if (_random.Prob(component.SuccessChance))
         {
             if (component.InteractSuccessString != null)
@@ -102,20 +117,39 @@ public sealed class InteractionPopupSystem : EntitySystem
         {
             var msgOthers = Loc.GetString(component.MessagePerceivedByOthers,
                 ("user", Identity.Entity(user, EntityManager)), ("target", Identity.Entity(uid, EntityManager)));
-            _popupSystem.PopupEntity(msg, uid, user);
             _popupSystem.PopupEntity(msgOthers, uid, Filter.PvsExcept(user, entityManager: EntityManager), true);
         }
-        else
-            _popupSystem.PopupEntity(msg, uid, user); //play only for the initiating entity.
 
-        if (sfx is not null) //not all cases will have sound.
+        if (!predict)
         {
+            _popupSystem.PopupEntity(msg, uid, user);
+
             if (component.SoundPerceivedByOthers)
-                _audio.PlayPvs(sfx, target); //play for everyone in range
+                _audio.PlayPvs(sfx, target);
             else
-                _audio.PlayEntity(sfx, Filter.Entities(user, target), target, true); //play only for the initiating entity and its target.
+                _audio.PlayEntity(sfx, Filter.Entities(user, target), target, false);
+            return;
         }
 
-        component.LastInteractTime = curTime;
+        _popupSystem.PopupPredicted(msg, uid, user);
+
+        if (sfx == null)
+            return;
+
+        if (component.SoundPerceivedByOthers)
+        {
+            _audio.PlayPredicted(sfx, target, user);
+            return;
+        }
+
+        if (_netMan.IsClient)
+        {
+            if (_gameTiming.IsFirstTimePredicted)
+                _audio.PlayEntity(sfx, Filter.Local(), target, true);
+        }
+        else
+        {
+            _audio.PlayEntity(sfx, Filter.Empty().FromEntities(target), target, false);
+        }
     }
 }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index bcde27ceba..1e4c49211f 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -76,6 +76,7 @@ namespace Content.Shared.Interaction
         private EntityQuery<WallMountComponent> _wallMountQuery;
         private EntityQuery<UseDelayComponent> _delayQuery;
         private EntityQuery<ActivatableUIComponent> _uiQuery;
+        private EntityQuery<ComplexInteractionComponent> _complexInteractionQuery;
 
         private const CollisionGroup InRangeUnobstructedMask = CollisionGroup.Impassable | CollisionGroup.InteractImpassable;
 
@@ -98,6 +99,7 @@ namespace Content.Shared.Interaction
             _wallMountQuery = GetEntityQuery<WallMountComponent>();
             _delayQuery = GetEntityQuery<UseDelayComponent>();
             _uiQuery = GetEntityQuery<ActivatableUIComponent>();
+            _complexInteractionQuery = GetEntityQuery<ComplexInteractionComponent>();
 
             SubscribeLocalEvent<BoundUserInterfaceCheckRangeEvent>(HandleUserInterfaceRangeCheck);
             SubscribeLocalEvent<BoundUserInterfaceMessageAttempt>(OnBoundInterfaceInteractAttempt);
@@ -360,8 +362,13 @@ namespace Content.Shared.Interaction
                 // TODO this needs to be handled better. This probably bypasses many complex can-interact checks in weird roundabout ways.
                 if (_actionBlockerSystem.CanInteract(user, target))
                 {
-                    UserInteraction(relay.RelayEntity.Value, coordinates, target, altInteract, checkCanInteract,
-                        checkAccess, checkCanUse);
+                    UserInteraction(relay.RelayEntity.Value,
+                        coordinates,
+                        target,
+                        altInteract,
+                        checkCanInteract,
+                        checkAccess,
+                        checkCanUse);
                     return;
                 }
             }
@@ -398,25 +405,10 @@ namespace Content.Shared.Interaction
                 ? !checkAccess || InRangeUnobstructed(user, coordinates)
                 : !checkAccess || InRangeUnobstructed(user, target.Value); // permits interactions with wall mounted entities
 
-            // Does the user have hands?
-            if (!_handsQuery.TryComp(user, out var hands) || hands.ActiveHand == null)
-            {
-                var ev = new InteractNoHandEvent(user, target, coordinates);
-                RaiseLocalEvent(user, ev);
-
-                if (target != null)
-                {
-                    var interactedEv = new InteractedNoHandEvent(target.Value, user, coordinates);
-                    RaiseLocalEvent(target.Value, interactedEv);
-                    DoContactInteraction(user, target.Value, ev);
-                }
-                return;
-            }
-
             // empty-hand interactions
             // combat mode hand interactions will always be true here -- since
             // they check this earlier before returning in
-            if (hands.ActiveHandEntity is not { } held)
+            if (!TryGetUsedEntity(user, out var used, checkCanUse))
             {
                 if (inRangeUnobstructed && target != null)
                     InteractHand(user, target.Value);
@@ -424,11 +416,7 @@ namespace Content.Shared.Interaction
                 return;
             }
 
-            // Can the user use the held entity?
-            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user))
-                return;
-
-            if (target == held)
+            if (target == used)
             {
                 UseInHandInteraction(user, target.Value, checkCanUse: false, checkCanInteract: false);
                 return;
@@ -438,7 +426,7 @@ namespace Content.Shared.Interaction
             {
                 InteractUsing(
                     user,
-                    held,
+                    used.Value,
                     target.Value,
                     coordinates,
                     checkCanInteract: false,
@@ -449,7 +437,7 @@ namespace Content.Shared.Interaction
 
             InteractUsingRanged(
                 user,
-                held,
+                used.Value,
                 target,
                 coordinates,
                 inRangeUnobstructed);
@@ -457,6 +445,18 @@ namespace Content.Shared.Interaction
 
         public void InteractHand(EntityUid user, EntityUid target)
         {
+            var complexInteractions = SupportsComplexInteractions(user);
+            if (!complexInteractions)
+            {
+                InteractionActivate(user,
+                    target,
+                    checkCanInteract: false,
+                    checkUseDelay: true,
+                    checkAccess: false,
+                    complexInteractions: complexInteractions);
+                return;
+            }
+
             // allow for special logic before main interaction
             var ev = new BeforeInteractHandEvent(target);
             RaiseLocalEvent(user, ev);
@@ -475,10 +475,12 @@ namespace Content.Shared.Interaction
                 return;
 
             // Else we run Activate.
-            InteractionActivate(user, target,
+            InteractionActivate(user,
+                target,
                 checkCanInteract: false,
                 checkUseDelay: true,
-                checkAccess: false);
+                checkAccess: false,
+                complexInteractions: complexInteractions);
         }
 
         public void InteractUsingRanged(EntityUid user, EntityUid used, EntityUid? target,
@@ -921,7 +923,7 @@ namespace Content.Shared.Interaction
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target))
                 return;
 
-            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user))
+            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user, used))
                 return;
 
             if (RangedInteractDoBefore(user, used, target, clickLocation, true))
@@ -1001,7 +1003,8 @@ namespace Content.Shared.Interaction
             EntityUid used,
             bool checkCanInteract = true,
             bool checkUseDelay = true,
-            bool checkAccess = true)
+            bool checkAccess = true,
+            bool? complexInteractions = null)
         {
             _delayQuery.TryComp(used, out var delayComponent);
             if (checkUseDelay && delayComponent != null && _useDelay.IsDelayed((used, delayComponent)))
@@ -1018,13 +1021,12 @@ namespace Content.Shared.Interaction
             if (checkAccess && !IsAccessible(user, used))
                 return false;
 
-            // Does the user have hands?
-            if (!_handsQuery.HasComp(user))
-                return false;
-
-            var activateMsg = new ActivateInWorldEvent(user, used);
+            complexInteractions ??= SupportsComplexInteractions(user);
+            var activateMsg = new ActivateInWorldEvent(user, used, complexInteractions.Value);
             RaiseLocalEvent(used, activateMsg, true);
-            if (!activateMsg.Handled)
+            var userEv = new UserActivateInWorldEvent(user, used, complexInteractions.Value);
+            RaiseLocalEvent(user, userEv, true);
+            if (!activateMsg.Handled && !userEv.Handled)
                 return false;
 
             DoContactInteraction(user, used, activateMsg);
@@ -1059,7 +1061,7 @@ namespace Content.Shared.Interaction
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, used))
                 return false;
 
-            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user))
+            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user, used))
                 return false;
 
             var useMsg = new UseInHandEvent(user);
@@ -1259,6 +1261,39 @@ namespace Content.Shared.Interaction
                     ? BoundUserInterfaceRangeResult.Pass
                     : BoundUserInterfaceRangeResult.Fail;
         }
+
+        /// <summary>
+        /// Gets the entity that is currently being "used" for the interaction.
+        /// In most cases, this refers to the entity in the character's active hand.
+        /// </summary>
+        /// <returns>If there is an entity being used.</returns>
+        public bool TryGetUsedEntity(EntityUid user, [NotNullWhen(true)] out EntityUid? used, bool checkCanUse = true)
+        {
+            var ev = new GetUsedEntityEvent();
+            RaiseLocalEvent(user, ref ev);
+
+            used = ev.Used;
+            if (!ev.Handled)
+                return false;
+
+            // Can the user use the held entity?
+            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user, ev.Used!.Value))
+            {
+                used = null;
+                return false;
+            }
+
+            return ev.Handled;
+        }
+
+        /// <summary>
+        /// Checks if a given entity is able to do specific complex interactions.
+        /// This is used to gate manipulation to general humanoids. If a mouse shouldn't be able to do something, then it's complex.
+        /// </summary>
+        public bool SupportsComplexInteractions(EntityUid user)
+        {
+            return _complexInteractionQuery.HasComp(user);
+        }
     }
 
     /// <summary>
@@ -1284,6 +1319,24 @@ namespace Content.Shared.Interaction
         }
     }
 
+    /// <summary>
+    ///     Raised directed by-ref on an entity to determine what item will be used in interactions.
+    /// </summary>
+    [ByRefEvent]
+    public record struct GetUsedEntityEvent()
+    {
+        public EntityUid? Used = null;
+
+        public bool Handled => Used != null;
+    };
+
+    /// <summary>
+    ///     Raised directed by-ref on an item and a user to determine if interactions can occur.
+    /// </summary>
+    /// <param name="Cancelled">Whether the hand interaction should be cancelled.</param>
+    [ByRefEvent]
+    public record struct AttemptUseInteractEvent(EntityUid User, EntityUid Used, bool Cancelled = false);
+
     /// <summary>
     ///     Raised directed by-ref on an item to determine if hand interactions should go through.
     ///     Defaults to allowing hand interactions to go through. Cancel to force the item to be attacked instead.
diff --git a/Content.Shared/Interaction/SmartEquipSystem.cs b/Content.Shared/Interaction/SmartEquipSystem.cs
index fb2bc3c460..bba294db28 100644
--- a/Content.Shared/Interaction/SmartEquipSystem.cs
+++ b/Content.Shared/Interaction/SmartEquipSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.ActionBlocker;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -7,6 +7,7 @@ using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
@@ -25,6 +26,7 @@ public sealed class SmartEquipSystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -182,7 +184,7 @@ public sealed class SmartEquipSystem : EntitySystem
             foreach (var slot in slots.Slots.Values)
             {
                 if (!slot.HasItem
-                    && (slot.Whitelist?.IsValid(handItem.Value, EntityManager) ?? true)
+                    && _whitelistSystem.IsWhitelistPassOrNull(slot.Whitelist, handItem.Value)
                     && slot.Priority > (toInsertTo?.Priority ?? int.MinValue))
                 {
                     toInsertTo = slot;
diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs
index 29e82f8ade..5eaa25f484 100644
--- a/Content.Shared/Item/SharedItemSystem.cs
+++ b/Content.Shared/Item/SharedItemSystem.cs
@@ -192,7 +192,7 @@ public abstract class SharedItemSystem : EntitySystem
         var shapes = GetItemShape(entity);
         var boundingShape = shapes.GetBoundingBox();
         var boundingCenter = ((Box2) boundingShape).Center;
-        var matty = Matrix3.CreateTransform(boundingCenter, rotation);
+        var matty = Matrix3Helpers.CreateTransform(boundingCenter, rotation);
         var drift = boundingShape.BottomLeft - matty.TransformBox(boundingShape).BottomLeft;
 
         var adjustedShapes = new List<Box2i>();
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 9a57f65e39..6099f57924 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -66,7 +66,7 @@ public sealed class LockSystem : EntitySystem
 
     private void OnActivated(EntityUid uid, LockComponent lockComp, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         //CrystallPunk LockSystem Adapt
diff --git a/Content.Shared/Maps/TurfSystem.cs b/Content.Shared/Maps/TurfSystem.cs
index ad8b3ddea8..8a4bbf68be 100644
--- a/Content.Shared/Maps/TurfSystem.cs
+++ b/Content.Shared/Maps/TurfSystem.cs
@@ -44,7 +44,7 @@ public sealed class TurfSystem : EntitySystem
 
         var size = grid.TileSize;
         var localPos = new Vector2(indices.X * size + (size / 2f), indices.Y * size + (size / 2f));
-        var worldPos = matrix.Transform(localPos);
+        var worldPos = Vector2.Transform(localPos, matrix);
 
         // This is scaled to 95 % so it doesn't encompass walls on other tiles.
         var tileAabb = Box2.UnitCentered.Scale(0.95f * size);
diff --git a/Content.Shared/Materials/MaterialPrototype.cs b/Content.Shared/Materials/MaterialPrototype.cs
index 905a2359d3..5adf13213e 100644
--- a/Content.Shared/Materials/MaterialPrototype.cs
+++ b/Content.Shared/Materials/MaterialPrototype.cs
@@ -29,7 +29,7 @@ namespace Content.Shared.Materials
         ///     include which stack we should spawn by default.
         /// </summary>
         [DataField]
-        public ProtoId<EntityPrototype>? StackEntity;
+        public EntProtoId? StackEntity;
 
         [DataField]
         public string Name = string.Empty;
diff --git a/Content.Shared/Materials/SharedMaterialStorageSystem.cs b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
index b1de77d971..a27e0fb9cf 100644
--- a/Content.Shared/Materials/SharedMaterialStorageSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Stacks;
+using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -17,6 +18,7 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     /// <summary>
     /// Default volume for a sheet if the material's entity prototype has no material composition.
@@ -121,7 +123,7 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
         if (!CanTakeVolume(uid, volume, component))
             return false;
 
-        if (component.MaterialWhiteList != null && !component.MaterialWhiteList.Contains(materialId))
+        if (component.MaterialWhiteList == null ? false : !component.MaterialWhiteList.Contains(materialId))
             return false;
 
         var amount = component.Storage.GetValueOrDefault(materialId);
@@ -239,7 +241,7 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
         if (!Resolve(toInsert, ref material, ref composition, false))
             return false;
 
-        if (storage.Whitelist?.IsValid(toInsert) == false)
+        if (_whitelistSystem.IsWhitelistFail(storage.Whitelist, toInsert))
             return false;
 
         if (HasComp<UnremoveableComponent>(toInsert))
diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
index 97b5bfeba6..73b7c0847f 100644
--- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
+++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
@@ -43,7 +43,7 @@ public abstract class SharedMechSystem : EntitySystem
     {
         SubscribeLocalEvent<MechComponent, MechToggleEquipmentEvent>(OnToggleEquipmentAction);
         SubscribeLocalEvent<MechComponent, MechEjectPilotEvent>(OnEjectPilotEvent);
-        SubscribeLocalEvent<MechComponent, InteractNoHandEvent>(RelayInteractionEvent);
+        SubscribeLocalEvent<MechComponent, UserActivateInWorldEvent>(RelayInteractionEvent);
         SubscribeLocalEvent<MechComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<MechComponent, DestructionEventArgs>(OnDestruction);
         SubscribeLocalEvent<MechComponent, GetAdditionalAccessEvent>(OnGetAdditionalAccess);
@@ -71,7 +71,7 @@ public abstract class SharedMechSystem : EntitySystem
         TryEject(uid, component);
     }
 
-    private void RelayInteractionEvent(EntityUid uid, MechComponent component, InteractNoHandEvent args)
+    private void RelayInteractionEvent(EntityUid uid, MechComponent component, UserActivateInWorldEvent args)
     {
         var pilot = component.PilotSlot.ContainedEntity;
         if (pilot == null)
diff --git a/Content.Shared/Pinpointer/SharedNavMapSystem.cs b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
index 7c12321b5d..3ced5f3c9e 100644
--- a/Content.Shared/Pinpointer/SharedNavMapSystem.cs
+++ b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
@@ -3,6 +3,7 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using Content.Shared.Tag;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -24,7 +25,7 @@ public abstract class SharedNavMapSystem : EntitySystem
 
     [Robust.Shared.IoC.Dependency] private readonly TagSystem _tagSystem = default!;
 
-    private readonly string[] _wallTags = ["Wall", "Window"];
+    private static readonly ProtoId<TagPrototype>[] WallTags = {"Wall", "Window"};
     private EntityQuery<NavMapDoorComponent> _doorQuery;
 
     public override void Initialize()
@@ -58,7 +59,7 @@ public abstract class SharedNavMapSystem : EntitySystem
         if (_doorQuery.HasComp(uid))
             return  NavMapChunkType.Airlock;
 
-        if (_tagSystem.HasAnyTag(uid, _wallTags))
+        if (_tagSystem.HasAnyTag(uid, WallTags))
             return NavMapChunkType.Wall;
 
         return NavMapChunkType.Invalid;
diff --git a/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs b/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs
new file mode 100644
index 0000000000..8347e2d706
--- /dev/null
+++ b/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs
@@ -0,0 +1,33 @@
+using Lidgren.Network;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Players.JobWhitelist;
+
+public sealed class MsgJobWhitelist : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.EntityEvent;
+
+    public HashSet<string> Whitelist = new();
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
+    {
+        var count = buffer.ReadVariableInt32();
+        Whitelist.EnsureCapacity(count);
+
+        for (var i = 0; i < count; i++)
+        {
+            Whitelist.Add(buffer.ReadString());
+        }
+    }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
+    {
+        buffer.WriteVariableInt32(Whitelist.Count);
+
+        foreach (var ban in Whitelist)
+        {
+            buffer.Write(ban);
+        }
+    }
+}
diff --git a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
index c1abfc526f..00096b7d40 100644
--- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
+++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
@@ -6,6 +6,7 @@ using Content.Shared.Popups;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Prototypes;
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Whitelist;
 
 namespace Content.Shared.Polymorph.Systems;
 
@@ -18,6 +19,7 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly ISerializationManager _serMan = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -49,8 +51,8 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
     /// </summary>
     public bool IsInvalid(ChameleonProjectorComponent comp, EntityUid target)
     {
-        return (comp.Whitelist?.IsValid(target, EntityManager) == false)
-            || (comp.Blacklist?.IsValid(target, EntityManager) == true);
+        return _whitelistSystem.IsWhitelistFail(comp.Whitelist, target)
+            || _whitelistSystem.IsBlacklistPass(comp.Blacklist, target);
     }
 
     /// <summary>
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 372dc8a75d..b718c3a690 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -47,7 +47,7 @@ public abstract partial class SharedProjectileSystem : EntitySystem
         if (component.RemovalTime == null)
             return;
 
-        if (args.Handled || !TryComp<PhysicsComponent>(uid, out var physics) || physics.BodyType != BodyType.Static)
+        if (args.Handled || !args.Complex || !TryComp<PhysicsComponent>(uid, out var physics) || physics.BodyType != BodyType.Static)
             return;
 
         args.Handled = true;
diff --git a/Content.Shared/Roles/DepartmentPrototype.cs b/Content.Shared/Roles/DepartmentPrototype.cs
index 024eca37fa..d6288bec90 100644
--- a/Content.Shared/Roles/DepartmentPrototype.cs
+++ b/Content.Shared/Roles/DepartmentPrototype.cs
@@ -1,28 +1,27 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Roles;
 
 [Prototype("department")]
 public sealed partial class DepartmentPrototype : IPrototype
 {
-    [IdDataField] public string ID { get; } = default!;
+    [IdDataField]
+    public string ID { get; } = string.Empty;
 
     /// <summary>
-    ///     A description string to display in the character menu as an explanation of the department's function.
+    /// A description string to display in the character menu as an explanation of the department's function.
     /// </summary>
-    [DataField("description", required: true)]
-    public string Description = default!;
+    [DataField(required: true)]
+    public string Description = string.Empty;
 
     /// <summary>
-    ///     A color representing this department to use for text.
+    /// A color representing this department to use for text.
     /// </summary>
-    [DataField("color", required: true)]
-    public Color Color = default!;
+    [DataField(required: true)]
+    public Color Color;
 
-    [ViewVariables(VVAccess.ReadWrite),
-     DataField("roles", customTypeSerializer: typeof(PrototypeIdListSerializer<JobPrototype>))]
-    public List<string> Roles = new();
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public List<ProtoId<JobPrototype>> Roles = new();
 
     /// <summary>
     /// Whether this is a primary department or not.
@@ -34,8 +33,14 @@ public sealed partial class DepartmentPrototype : IPrototype
     /// <summary>
     /// Departments with a higher weight sorted before other departments in UI.
     /// </summary>
-    [DataField("weight")]
-    public int Weight { get; private set; } = 0;
+    [DataField]
+    public int Weight { get; private set; }
+
+    /// <summary>
+    /// Toggles the display of the department in the priority setting menu in the character editor.
+    /// </summary>
+    [DataField]
+    public bool EditorHidden;
 }
 
 /// <summary>
@@ -50,14 +55,14 @@ public sealed class DepartmentUIComparer : IComparer<DepartmentPrototype>
     {
         if (ReferenceEquals(x, y))
             return 0;
+
         if (ReferenceEquals(null, y))
             return 1;
+
         if (ReferenceEquals(null, x))
             return -1;
 
         var cmp = -x.Weight.CompareTo(y.Weight);
-        if (cmp != 0)
-            return cmp;
-        return string.Compare(x.ID, y.ID, StringComparison.Ordinal);
+        return cmp != 0 ? cmp : string.Compare(x.ID, y.ID, StringComparison.Ordinal);
     }
 }
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 34a8ce64bf..2959b56497 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -1,10 +1,8 @@
 using Content.Shared.Access;
 using Content.Shared.Players.PlayTimeTracking;
-using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Roles
 {
@@ -116,6 +114,9 @@ namespace Content.Shared.Roles
 
         [DataField("extendedAccessGroups")]
         public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> ExtendedAccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
+
+        [DataField]
+        public bool Whitelisted;
     }
 
     /// <summary>
diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
index b355ae5873..f94558b0b3 100644
--- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
+++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
@@ -6,6 +6,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -30,6 +31,7 @@ public abstract partial class SharedFultonSystem : EntitySystem
     [Dependency] private   readonly SharedPopupSystem _popup = default!;
     [Dependency] private   readonly SharedStackSystem _stack = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     [ValidatePrototypeId<EntityPrototype>] public const string EffectProto = "FultonEffect";
     protected static readonly Vector2 EffectOffset = Vector2.Zero;
@@ -176,7 +178,7 @@ public abstract partial class SharedFultonSystem : EntitySystem
         if (!CanFulton(targetUid))
             return false;
 
-        if (component.Whitelist?.IsValid(targetUid, EntityManager) != true)
+        if (_whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, targetUid))
             return false;
 
         return true;
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
index d859d9f485..a382e943ff 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
@@ -2,6 +2,7 @@ using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.UI.MapObjects;
+using Content.Shared.Whitelist;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Collision.Shapes;
@@ -15,6 +16,7 @@ public abstract partial class SharedShuttleSystem : EntitySystem
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] protected readonly SharedMapSystem Maps = default!;
     [Dependency] protected readonly SharedTransformSystem XformSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const float FTLRange = 512f;
     public const float FTLBufferRange = 8f;
@@ -83,7 +85,7 @@ public abstract partial class SharedShuttleSystem : EntitySystem
         if (HasComp<FTLMapComponent>(mapUid))
             return false;
 
-        return destination.Whitelist?.IsValid(shuttleUid, EntityManager) != false;
+        return _whitelistSystem.IsWhitelistPassOrNull(destination.Whitelist, shuttleUid);
     }
 
     /// <summary>
diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index 28b7da8f2a..f108419a9e 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Utility;
 
 namespace Content.Shared.Stacks;
 
-[Prototype("stack")]
+[Prototype]
 public sealed partial class StackPrototype : IPrototype
 {
     [ViewVariables]
@@ -15,33 +15,26 @@ public sealed partial class StackPrototype : IPrototype
     ///     Human-readable name for this stack type e.g. "Steel"
     /// </summary>
     /// <remarks>This is a localization string ID.</remarks>
-    [DataField("name")]
+    [DataField]
     public string Name { get; private set; } = string.Empty;
 
     /// <summary>
     ///     An icon that will be used to represent this stack type.
     /// </summary>
-    [DataField("icon")]
+    [DataField]
     public SpriteSpecifier? Icon { get; private set; }
 
     /// <summary>
     ///     The entity id that will be spawned by default from this stack.
     /// </summary>
-    [DataField("spawn", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string Spawn { get; private set; } = string.Empty;
+    [DataField(required: true)]
+    public EntProtoId Spawn { get; private set; } = string.Empty;
 
     /// <summary>
     ///     The maximum amount of things that can be in a stack.
     ///     Can be overriden on <see cref="StackComponent"/>
     ///     if null, simply has unlimited max count.
     /// </summary>
-    [DataField("maxCount")]
+    [DataField]
     public int? MaxCount { get; private set; }
-
-    /// <summary>
-    /// The size of an individual unit of this stack.
-    /// </summary>
-    [DataField("itemSize")]
-    public int? ItemSize;
 }
-
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index acf00f7c6b..f352c9db63 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -142,7 +142,7 @@ public abstract class SharedStationSpawningSystem : EntitySystem
         if (raiseEvent)
         {
             var ev = new StartingGearEquippedEvent(entity);
-            RaiseLocalEvent(entity, ref ev, true);
+            RaiseLocalEvent(entity, ref ev);
         }
     }
 }
diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
index 03da2d09b0..7a8961485d 100644
--- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Storage.Components;
 using Content.Shared.Inventory;
+using Content.Shared.Whitelist;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
@@ -16,6 +17,8 @@ public sealed class MagnetPickupSystem : EntitySystem
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedStorageSystem _storage = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
 
     private static readonly TimeSpan ScanDelay = TimeSpan.FromSeconds(1);
 
@@ -63,7 +66,7 @@ public sealed class MagnetPickupSystem : EntitySystem
 
             foreach (var near in _lookup.GetEntitiesInRange(uid, comp.Range, LookupFlags.Dynamic | LookupFlags.Sundries))
             {
-                if (storage.Whitelist?.IsValid(near, EntityManager) == false)
+                if (_whitelistSystem.IsWhitelistFail(storage.Whitelist, near))
                     continue;
 
                 if (!_physicsQuery.TryGetComponent(near, out var physics) || physics.BodyStatus != BodyStatus.OnGround)
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index 636c603834..bb49725e04 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -15,6 +15,7 @@ using Content.Shared.Storage.Components;
 using Content.Shared.Tools.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Wall;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -45,6 +46,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private   readonly WeldableSystem _weldable = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const string ContainerName = "entity_storage";
 
@@ -89,7 +91,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     protected void OnInteract(EntityUid uid, SharedEntityStorageComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         args.Handled = true;
@@ -432,7 +434,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
         var targetIsMob = HasComp<BodyComponent>(toInsert);
         var storageIsItem = HasComp<ItemComponent>(container);
-        var allowedToEat = component.Whitelist?.IsValid(toInsert) ?? HasComp<ItemComponent>(toInsert);
+        var allowedToEat = component.Whitelist == null ? HasComp<ItemComponent>(toInsert) : _whitelistSystem.IsValid(component.Whitelist, toInsert);
 
         // BEFORE REPLACING THIS WITH, I.E. A PROPERTY:
         // Make absolutely 100% sure you have worked out how to stop people ending up in backpacks.
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index af5a282a59..3210d2b929 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -59,6 +59,7 @@ public abstract class SharedStorageSystem : EntitySystem
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private   readonly SharedUserInterfaceSystem _ui = default!;
     [Dependency] protected readonly UseDelaySystem UseDelay = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private EntityQuery<ItemComponent> _itemQuery;
     private EntityQuery<StackComponent> _stackQuery;
@@ -373,7 +374,7 @@ public abstract class SharedStorageSystem : EntitySystem
     /// </summary>
     private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInWorldEvent args)
     {
-        if (args.Handled || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert))
+        if (args.Handled || !args.Complex || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert))
             return;
 
         // Toggle
@@ -869,13 +870,8 @@ public abstract class SharedStorageSystem : EntitySystem
             return false;
         }
 
-        if (storageComp.Whitelist?.IsValid(insertEnt, EntityManager) == false)
-        {
-            reason = "comp-storage-invalid-container";
-            return false;
-        }
-
-        if (storageComp.Blacklist?.IsValid(insertEnt, EntityManager) == true)
+        if (_whitelistSystem.IsWhitelistFail(storageComp.Whitelist, insertEnt) ||
+            _whitelistSystem.IsBlacklistPass(storageComp.Blacklist, insertEnt))
         {
             reason = "comp-storage-invalid-container";
             return false;
diff --git a/Content.Server/Store/Components/StoreComponent.cs b/Content.Shared/Store/Components/StoreComponent.cs
similarity index 72%
rename from Content.Server/Store/Components/StoreComponent.cs
rename to Content.Shared/Store/Components/StoreComponent.cs
index 0b7dbbea09..223f507971 100644
--- a/Content.Server/Store/Components/StoreComponent.cs
+++ b/Content.Shared/Store/Components/StoreComponent.cs
@@ -1,46 +1,41 @@
 using Content.Shared.FixedPoint;
-using Content.Shared.Store;
 using Robust.Shared.Audio;
-using Robust.Shared.Map;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
-namespace Content.Server.Store.Components;
+namespace Content.Shared.Store.Components;
 
 /// <summary>
 /// This component manages a store which players can use to purchase different listings
 /// through the ui. The currency, listings, and categories are defined in yaml.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class StoreComponent : Component
 {
-    /// <summary>
-    /// The default preset for the store. Is overriden by default values specified on the component.
-    /// </summary>
-    [DataField("preset", customTypeSerializer: typeof(PrototypeIdSerializer<StorePresetPrototype>))]
-    public string? Preset;
+    [DataField]
+    public LocId Name = "store-ui-default-title";
 
     /// <summary>
     /// All the listing categories that are available on this store.
     /// The available listings are partially based on the categories.
     /// </summary>
-    [DataField("categories", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<StoreCategoryPrototype>))]
-    public HashSet<string> Categories = new();
+    [DataField]
+    public HashSet<ProtoId<StoreCategoryPrototype>> Categories = new();
 
     /// <summary>
     /// The total amount of currency that can be used in the store.
     /// The string represents the ID of te currency prototype, where the
     /// float is that amount.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("balance", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<FixedPoint2, CurrencyPrototype>))]
-    public Dictionary<string, FixedPoint2> Balance = new();
+    [DataField]
+    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> Balance = new();
 
     /// <summary>
     /// The list of currencies that can be inserted into this store.
     /// </summary>
-    [ViewVariables(VVAccess.ReadOnly), DataField("currencyWhitelist", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<CurrencyPrototype>))]
-    public HashSet<string> CurrencyWhitelist = new();
+    [DataField]
+    public HashSet<ProtoId<CurrencyPrototype>> CurrencyWhitelist = new();
 
     /// <summary>
     /// The person who "owns" the store/account. Used if you want the listings to be fixed
@@ -52,6 +47,7 @@ public sealed partial class StoreComponent : Component
     /// <summary>
     /// All listings, including those that aren't available to the buyer
     /// </summary>
+    [DataField]
     public HashSet<ListingData> Listings = new();
 
     /// <summary>
@@ -70,7 +66,7 @@ public sealed partial class StoreComponent : Component
     ///     The total balance spent in this store. Used for refunds.
     /// </summary>
     [ViewVariables, DataField]
-    public Dictionary<string, FixedPoint2> BalanceSpent = new();
+    public Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> BalanceSpent = new();
 
     /// <summary>
     ///     Controls if the store allows refunds
@@ -95,7 +91,7 @@ public sealed partial class StoreComponent : Component
     /// <summary>
     /// The sound played to the buyer when a purchase is succesfully made.
     /// </summary>
-    [DataField("buySuccessSound")]
+    [DataField]
     public SoundSpecifier BuySuccessSound = new SoundPathSpecifier("/Audio/Effects/kaching.ogg");
     #endregion
 }
diff --git a/Content.Shared/Store/StoreUi.cs b/Content.Shared/Store/StoreUi.cs
index ee4da6991f..59cf1bbbc8 100644
--- a/Content.Shared/Store/StoreUi.cs
+++ b/Content.Shared/Store/StoreUi.cs
@@ -30,20 +30,6 @@ public sealed class StoreUpdateState : BoundUserInterfaceState
     }
 }
 
-/// <summary>
-/// initializes miscellaneous data about the store.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class StoreInitializeState : BoundUserInterfaceState
-{
-    public readonly string Name;
-
-    public StoreInitializeState(string name)
-    {
-        Name = name;
-    }
-}
-
 [Serializable, NetSerializable]
 public sealed class StoreRequestUpdateInterfaceMessage : BoundUserInterfaceMessage
 {
diff --git a/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs b/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs
index 7f6afacccc..948c7b2dc0 100644
--- a/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs
+++ b/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs
@@ -24,10 +24,10 @@ public sealed partial class StoryTemplatePrototype : IPrototype
 
     /// <summary>
     /// Dictionary containing the name of each variable to pass to the template and the ID of the
-    /// <see cref="DatasetPrototype"/> from which a random entry will be selected as its value.
+    /// <see cref="LocalizedDatasetPrototype"/> from which a random entry will be selected as its value.
     /// For example, <c>name: book_character</c> will pick a random entry from the book_character
     /// dataset which can then be used in the template by <c>{$name}</c>.
     /// </summary>
     [DataField]
-    public Dictionary<string, ProtoId<DatasetPrototype>> Variables { get; } = default!;
+    public Dictionary<string, ProtoId<LocalizedDatasetPrototype>> Variables { get; } = default!;
 }
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index 075cf81a4c..38e2f9fd7a 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -21,7 +21,7 @@ public abstract class SharedStrippableSystem : EntitySystem
 
     private void OnActivateInWorld(EntityUid uid, StrippableComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled || args.Target == args.User)
+        if (args.Handled || !args.Complex || args.Target == args.User)
             return;
 
         if (TryOpenStrippingUi(args.User, (uid, component)))
diff --git a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
index 6e8393036d..8903747e43 100644
--- a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
+++ b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
@@ -26,7 +26,11 @@ public abstract class SharedTrayScannerSystem : EntitySystem
 
     private void OnTrayScannerActivate(EntityUid uid, TrayScannerComponent scanner, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         SetScannerEnabled(uid, !scanner.Enabled, scanner);
+        args.Handled = true;
     }
 
     private void SetScannerEnabled(EntityUid uid, bool enabled, TrayScannerComponent? scanner = null)
diff --git a/Content.Shared/Tag/TagComponent.cs b/Content.Shared/Tag/TagComponent.cs
index b5b8a48a44..ad4240ba06 100644
--- a/Content.Shared/Tag/TagComponent.cs
+++ b/Content.Shared/Tag/TagComponent.cs
@@ -1,13 +1,11 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
+using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Tag
+namespace Content.Shared.Tag;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(TagSystem))]
+public sealed partial class TagComponent : Component
 {
-    [RegisterComponent, NetworkedComponent, Access(typeof(TagSystem))]
-    public sealed partial class TagComponent : Component
-    {
-        [DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<TagPrototype>))]
-        [Access(typeof(TagSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-        public HashSet<string> Tags = new();
-    }
+    [DataField, ViewVariables, AutoNetworkedField]
+    public HashSet<ProtoId<TagPrototype>> Tags = new();
 }
diff --git a/Content.Shared/Tag/TagComponentState.cs b/Content.Shared/Tag/TagComponentState.cs
deleted file mode 100644
index 9919aba108..0000000000
--- a/Content.Shared/Tag/TagComponentState.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Tag
-{
-    [Serializable, NetSerializable]
-    public sealed class TagComponentState : ComponentState
-    {
-        public TagComponentState(string[] tags)
-        {
-            Tags = tags;
-        }
-
-        public string[] Tags { get; }
-    }
-}
diff --git a/Content.Shared/Tag/TagPrototype.cs b/Content.Shared/Tag/TagPrototype.cs
index 2a06e22cf9..97f8c1af7d 100644
--- a/Content.Shared/Tag/TagPrototype.cs
+++ b/Content.Shared/Tag/TagPrototype.cs
@@ -1,17 +1,15 @@
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Tag
+namespace Content.Shared.Tag;
+
+/// <summary>
+/// Prototype representing a tag in YAML.
+/// Meant to only have an ID property, as that is the only thing that
+/// gets saved in TagComponent.
+/// </summary>
+[Prototype("Tag")]
+public sealed partial class TagPrototype : IPrototype
 {
-    /// <summary>
-    ///     Prototype representing a tag in YAML.
-    ///     Meant to only have an ID property, as that is the only thing that
-    ///     gets saved in TagComponent.
-    /// </summary>
-    [Prototype("Tag")]
-    public sealed partial class TagPrototype : IPrototype
-    {
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-    }
+    [IdDataField, ViewVariables]
+    public string ID { get; } = string.Empty;
 }
diff --git a/Content.Shared/Tag/TagSystem.cs b/Content.Shared/Tag/TagSystem.cs
index 7bcb887a41..f1f620a694 100644
--- a/Content.Shared/Tag/TagSystem.cs
+++ b/Content.Shared/Tag/TagSystem.cs
@@ -1,11 +1,19 @@
-using System.Diagnostics;
-using System.Linq;
-using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Tag;
 
+/// <summary>
+/// The system that is responsible for working with tags.
+/// Checking the existence of the <see cref="TagPrototype"/> only happens in DEBUG builds,
+/// to improve performance, so don't forget to check it.
+/// </summary>
+/// <summary>
+/// The methods to add or remove a list of tags have only an implementation with the <see cref="IEnumerable{T}"/> type,
+/// it's not much, but it takes away performance,
+/// if you need to use them often, it's better to make a proper implementation,
+/// you can read more <a href="https://github.com/space-wizards/space-station-14/pull/28272">HERE</a>.
+/// </summary>
 public sealed class TagSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _proto = default!;
@@ -15,685 +23,693 @@ public sealed class TagSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         _tagQuery = GetEntityQuery<TagComponent>();
-        SubscribeLocalEvent<TagComponent, ComponentGetState>(OnTagGetState);
-        SubscribeLocalEvent<TagComponent, ComponentHandleState>(OnTagHandleState);
 
 #if DEBUG
         SubscribeLocalEvent<TagComponent, ComponentInit>(OnTagInit);
+#endif
     }
 
+#if DEBUG
     private void OnTagInit(EntityUid uid, TagComponent component, ComponentInit args)
     {
         foreach (var tag in component.Tags)
         {
             AssertValidTag(tag);
         }
+    }
 #endif
+
+    /// <summary>
+    /// Tries to add a tag to an entity if the tag doesn't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if it was added, false otherwise even if it already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool AddTag(EntityUid entityUid, ProtoId<TagPrototype> tag)
+    {
+        return AddTag((entityUid, EnsureComp<TagComponent>(entityUid)), tag);
     }
 
-
-    private void OnTagHandleState(EntityUid uid, TagComponent component, ref ComponentHandleState args)
+    /// <summary>
+    /// Tries to add the given tags to an entity if the tags don't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if any tags were added, false otherwise even if they all already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool AddTags(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
     {
-        if (args.Current is not TagComponentState state)
-            return;
+        return AddTags(entityUid,  (IEnumerable<ProtoId<TagPrototype>>)tags);
+    }
 
-        component.Tags.Clear();
+    /// <summary>
+    /// Tries to add the given tags to an entity if the tags don't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if any tags were added, false otherwise even if they all already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool AddTags(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        return AddTags((entityUid, EnsureComp<TagComponent>(entityUid)), tags);
+    }
 
-        foreach (var tag in state.Tags)
+    /// <summary>
+    /// Tries to add a tag to an entity if it has a <see cref="TagComponent"/>
+    /// and the tag doesn't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if it was added, false otherwise even if it already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool TryAddTag(EntityUid entityUid, ProtoId<TagPrototype> tag)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               AddTag((entityUid, component), tag);
+    }
+
+    /// <summary>
+    /// Tries to add the given tags to an entity if it has a
+    /// <see cref="TagComponent"/> and the tags don't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if any tags were added, false otherwise even if they all already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool TryAddTags(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
+    {
+        return TryAddTags(entityUid, (IEnumerable<ProtoId<TagPrototype>>)tags);
+    }
+
+    /// <summary>
+    /// Tries to add the given tags to an entity if it has a
+    /// <see cref="TagComponent"/> and the tags don't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if any tags were added, false otherwise even if they all already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool TryAddTags(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               AddTags((entityUid, component), tags);
+    }
+
+    /// <summary>
+    /// Checks if a tag has been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool HasTag(EntityUid entityUid, ProtoId<TagPrototype> tag)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasTag(component, tag);
+    }
+
+    /// <summary>
+    /// Checks if a tag has been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool HasAllTags(EntityUid entityUid, ProtoId<TagPrototype> tag) =>
+        HasTag(entityUid, tag);
+
+    /// <summary>
+    /// Checks if all of the given tags have been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAllTags(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAllTags(component, tags);
+    }
+
+    /// <summary>
+    /// Checks if all of the given tags have been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAllTags(EntityUid entityUid, HashSet<ProtoId<TagPrototype>> tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAllTags(component, tags);
+    }
+
+    /// <summary>
+    /// Checks if all of the given tags have been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAllTags(EntityUid entityUid, List<ProtoId<TagPrototype>> tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAllTags(component, tags);
+    }
+
+    /// <summary>
+    /// Checks if all of the given tags have been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAllTags(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAllTags(component, tags);
+    }
+
+    /// <summary>
+    /// Checks if a tag has been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool HasAnyTag(EntityUid entityUid, ProtoId<TagPrototype> tag) =>
+        HasTag(entityUid, tag);
+
+    /// <summary>
+    /// Checks if any of the given tags have been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAnyTag(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAnyTag(component, tags);
+    }
+
+    /// <summary>
+    /// Checks if any of the given tags have been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAnyTag(EntityUid entityUid, HashSet<ProtoId<TagPrototype>> tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAnyTag(component, tags);
+    }
+
+    /// <summary>
+    /// Checks if any of the given tags have been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAnyTag(EntityUid entityUid, List<ProtoId<TagPrototype>> tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAnyTag(component, tags);
+    }
+
+    /// <summary>
+    /// Checks if any of the given tags have been added to an entity.
+    /// </summary>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAnyTag(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               HasAnyTag(component, tags);
+    }
+
+    /// <summary>
+    /// Checks if a tag has been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool HasTag(TagComponent component, ProtoId<TagPrototype> tag)
+    {
+#if DEBUG
+        AssertValidTag(tag);
+#endif
+        return component.Tags.Contains(tag);
+    }
+
+    /// <summary>
+    /// Checks if a tag has been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool HasAllTags(TagComponent component, ProtoId<TagPrototype> tag) =>
+        HasTag(component, tag);
+
+    /// <summary>
+    /// Checks if all of the given tags have been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAllTags(TagComponent component, params ProtoId<TagPrototype>[] tags)
+    {
+        foreach (var tag in tags)
         {
+#if DEBUG
             AssertValidTag(tag);
-            component.Tags.Add(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
         }
+
+        return true;
     }
 
-    private static void OnTagGetState(EntityUid uid, TagComponent component, ref ComponentGetState args)
+    /// <summary>
+    /// Checks if all of the given tags have been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAllTagsArray(TagComponent component, ProtoId<TagPrototype>[] tags)
     {
-        var tags = new string[component.Tags.Count];
-        var i = 0;
-
-        foreach (var tag in component.Tags)
+        foreach (var tag in tags)
         {
-            tags[i] = tag;
-            i++;
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
         }
 
-        args.State = new TagComponentState(tags);
+        return true;
+    }
+
+    /// <summary>
+    /// Checks if all of the given tags have been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAllTags(TagComponent component, List<ProtoId<TagPrototype>> tags)
+    {
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Checks if all of the given tags have been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAllTags(TagComponent component, HashSet<ProtoId<TagPrototype>> tags)
+    {
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Checks if all of the given tags have been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if they all exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAllTags(TagComponent component, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (!component.Tags.Contains(tag))
+                return false;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Checks if a tag has been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if it exists, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool HasAnyTag(TagComponent component, ProtoId<TagPrototype> tag) =>
+        HasTag(component, tag);
+
+    /// <summary>
+    /// Checks if any of the given tags have been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAnyTag(TagComponent component, params ProtoId<TagPrototype>[] tags)
+    {
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (component.Tags.Contains(tag))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if any of the given tags have been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAnyTag(TagComponent component, HashSet<ProtoId<TagPrototype>> tags)
+    {
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (component.Tags.Contains(tag))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if any of the given tags have been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAnyTag(TagComponent component, List<ProtoId<TagPrototype>> tags)
+    {
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (component.Tags.Contains(tag))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if any of the given tags have been added to an component.
+    /// </summary>
+    /// <returns>
+    /// true if any of them exist, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool HasAnyTag(TagComponent component, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (component.Tags.Contains(tag))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Tries to remove a tag from an entity if it exists.
+    /// </summary>
+    /// <returns>
+    /// true if it was removed, false otherwise even if it didn't exist.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool RemoveTag(EntityUid entityUid, ProtoId<TagPrototype> tag)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               RemoveTag((entityUid, component), tag);
+    }
+
+    /// <summary>
+    /// Tries to remove a tag from an entity if it exists.
+    /// </summary>
+    /// <returns>
+    /// true if it was removed, false otherwise even if it didn't exist.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool RemoveTags(EntityUid entityUid, params ProtoId<TagPrototype>[] tags)
+    {
+        return RemoveTags(entityUid, (IEnumerable<ProtoId<TagPrototype>>)tags);
+    }
+
+    /// <summary>
+    /// Tries to remove a tag from an entity if it exists.
+    /// </summary>
+    /// <returns>
+    /// true if it was removed, false otherwise even if it didn't exist.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool RemoveTags(EntityUid entityUid, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        return _tagQuery.TryComp(entityUid, out var component) &&
+               RemoveTags((entityUid, component), tags);
+    }
+
+    /// <summary>
+    /// Tries to add a tag if it doesn't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if it was added, false if it already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool AddTag(Entity<TagComponent> entity, ProtoId<TagPrototype> tag)
+    {
+#if DEBUG
+        AssertValidTag(tag);
+#endif
+        if (!entity.Comp.Tags.Add(tag))
+            return false;
+
+        Dirty(entity);
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to add the given tags if they don't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if any tags were added, false if they all already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool AddTags(Entity<TagComponent> entity, params ProtoId<TagPrototype>[] tags)
+    {
+        return AddTags(entity, (IEnumerable<ProtoId<TagPrototype>>)tags);
+    }
+
+    /// <summary>
+    /// Tries to add the given tags if they don't already exist.
+    /// </summary>
+    /// <returns>
+    /// true if any tags were added, false if they all already existed.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool AddTags(Entity<TagComponent> entity, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        var update = false;
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (entity.Comp.Tags.Add(tag) && !update)
+                update = true;
+        }
+
+        if (!update)
+            return false;
+
+        Dirty(entity);
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to remove a tag if it exists.
+    /// </summary>
+    /// <returns>
+    /// true if it was removed, false otherwise even if it didn't exist.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if no <see cref="TagPrototype"/> exists with the given id.
+    /// </exception>
+    public bool RemoveTag(Entity<TagComponent> entity, ProtoId<TagPrototype> tag)
+    {
+#if DEBUG
+        AssertValidTag(tag);
+#endif
+
+        if (!entity.Comp.Tags.Remove(tag))
+            return false;
+
+        Dirty(entity);
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to remove all of the given tags if they exist.
+    /// </summary>
+    /// <returns>
+    /// true if any tag was removed, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool RemoveTags(Entity<TagComponent> entity, params ProtoId<TagPrototype>[] tags)
+    {
+        return RemoveTags(entity, (IEnumerable<ProtoId<TagPrototype>>)tags);
+    }
+
+    /// <summary>
+    /// Tries to remove all of the given tags if they exist.
+    /// </summary>
+    /// <returns>
+    /// true if any tag was removed, false otherwise.
+    /// </returns>
+    /// <exception cref="UnknownPrototypeException">
+    /// Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
+    /// </exception>
+    public bool RemoveTags(Entity<TagComponent> entity, IEnumerable<ProtoId<TagPrototype>> tags)
+    {
+        var update = false;
+        foreach (var tag in tags)
+        {
+#if DEBUG
+            AssertValidTag(tag);
+#endif
+            if (entity.Comp.Tags.Remove(tag) && !update)
+                update = true;
+        }
+
+        if (!update)
+            return false;
+
+        Dirty(entity);
+        return true;
     }
 
     private void AssertValidTag(string id)
     {
         DebugTools.Assert(_proto.HasIndex<TagPrototype>(id), $"Unknown tag: {id}");
     }
-
-    /// <summary>
-    ///     Tries to add a tag to an entity if the tag doesn't already exist.
-    /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="id">The tag to add.</param>
-    /// <returns>
-    ///     true if it was added, false otherwise even if it already existed.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
-    /// </exception>
-    public bool AddTag(EntityUid entity, string id)
-    {
-        return AddTag(entity, EnsureComp<TagComponent>(entity), id);
-    }
-
-    /// <summary>
-    ///     Tries to add the given tags to an entity if the tags don't already exist.
-    /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="ids">The tags to add.</param>
-    /// <returns>
-    ///     true if any tags were added, false otherwise even if they all already existed.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool AddTags(EntityUid entity, params string[] ids)
-    {
-        return AddTags(entity, EnsureComp<TagComponent>(entity), ids);
-    }
-
-    /// <summary>
-    ///     Tries to add the given tags to an entity if the tags don't already exist.
-    /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="ids">The tags to add.</param>
-    /// <returns>
-    ///     true if any tags were added, false otherwise even if they all already existed.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool AddTags(EntityUid entity, IEnumerable<string> ids)
-    {
-        return AddTags(entity, EnsureComp<TagComponent>(entity), ids);
-    }
-
-    /// <summary>
-    ///     Tries to add a tag to an entity if it has a <see cref="TagComponent"/>
-    ///     and the tag doesn't already exist.
-    /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="id">The tag to add.</param>
-    /// <returns>
-    ///     true if it was added, false otherwise even if it already existed.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
-    /// </exception>
-    public bool TryAddTag(EntityUid entity, string id)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               AddTag(entity, component, id);
-    }
-
-    /// <summary>
-    ///     Tries to add the given tags to an entity if it has a
-    ///     <see cref="TagComponent"/> and the tags don't already exist.
-    /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="ids">The tags to add.</param>
-    /// <returns>
-    ///     true if any tags were added, false otherwise even if they all already existed.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool TryAddTags(EntityUid entity, params string[] ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               AddTags(entity, component, ids);
-    }
-
-    /// <summary>
-    ///     Tries to add the given tags to an entity if it has a
-    ///     <see cref="TagComponent"/> and the tags don't already exist.
-    /// </summary>
-    /// <param name="entity">The entity to add the tag to.</param>
-    /// <param name="ids">The tags to add.</param>
-    /// <returns>
-    ///     true if any tags were added, false otherwise even if they all already existed.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool TryAddTags(EntityUid entity, IEnumerable<string> ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               AddTags(entity, component, ids);
-    }
-
-    /// <summary>
-    ///     Checks if a tag has been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if it exists, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
-    /// </exception>
-    public bool HasTag(EntityUid entity, string id)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasTag(component, id);
-    }
-
-    /// <summary>
-    ///     Checks if a tag has been added to an entity.
-    /// </summary>
-    [Obsolete]
-    public bool HasTag(EntityUid entity, string id, EntityQuery<TagComponent> tagQuery)
-    {
-        return tagQuery.TryGetComponent(entity, out var component) &&
-               HasTag(component, id);
-    }
-
-    /// <summary>
-    ///     Checks if all of the given tags have been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="id">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAllTags(EntityUid entity, string id) => HasTag(entity, id);
-
-    /// <summary>
-    ///     Checks if all of the given tags have been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAllTags(EntityUid entity, List<string> ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAllTags(component, ids);
-    }
-
-    /// <summary>
-    ///     Checks if all of the given tags have been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAllTags(EntityUid entity, IEnumerable<string> ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAllTags(component, ids);
-    }
-
-    /// <summary>
-    ///     Checks if all of the given tags have been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAllTags(EntityUid entity, List<ProtoId<TagPrototype>> ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAllTags(component, ids);
-    }
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(EntityUid entity, params string[] ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAnyTag(component, ids);
-    }
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(EntityUid entity, string id) => HasTag(entity, id);
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(EntityUid entity, List<string> ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAnyTag(component, ids);
-    }
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(EntityUid entity, List<ProtoId<TagPrototype>> ids)
-    {
-        return TryComp<TagComponent>(entity, out var component) &&
-               HasAnyTag(component, ids);
-    }
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added to an entity.
-    /// </summary>
-    /// <param name="entity">The entity to check.</param>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(EntityUid entity, IEnumerable<string> ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               HasAnyTag(component, ids);
-    }
-
-    /// <summary>
-    ///     Tries to remove a tag from an entity if it exists.
-    /// </summary>
-    /// <param name="entity">The entity to remove the tag from.</param>
-    /// <param name="id">The tag to remove.</param>
-    /// <returns>
-    ///     true if it was removed, false otherwise even if it didn't exist.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
-    /// </exception>
-    public bool RemoveTag(EntityUid entity, string id)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               RemoveTag(entity, component, id);
-    }
-
-    /// <summary>
-    ///     Tries to remove a tag from an entity if it exists.
-    /// </summary>
-    /// <param name="entity">The entity to remove the tag from.</param>
-    /// <param name="ids">The tag to remove.</param>
-    /// <returns>
-    ///     true if it was removed, false otherwise even if it didn't exist.
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    /// </returns>
-    public bool RemoveTags(EntityUid entity, params string[] ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               RemoveTags(entity, component, ids);
-    }
-
-    /// <summary>
-    ///     Tries to remove a tag from an entity if it exists.
-    /// </summary>
-    /// <param name="entity">The entity to remove the tag from.</param>
-    /// <param name="ids">The tag to remove.</param>
-    /// <returns>
-    ///     true if it was removed, false otherwise even if it didn't exist.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool RemoveTags(EntityUid entity, IEnumerable<string> ids)
-    {
-        return _tagQuery.TryComp(entity, out var component) &&
-               RemoveTags(entity, component, ids);
-    }
-
-    /// <summary>
-    ///     Tries to add a tag if it doesn't already exist.
-    /// </summary>
-    /// <param name="id">The tag to add.</param>
-    /// <returns>true if it was added, false if it already existed.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
-    /// </exception>
-    public bool AddTag(EntityUid uid, TagComponent component, string id)
-    {
-        AssertValidTag(id);
-        var added = component.Tags.Add(id);
-
-        if (added)
-        {
-            Dirty(uid, component);
-            return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Tries to add the given tags if they don't already exist.
-    /// </summary>
-    /// <param name="ids">The tags to add.</param>
-    /// <returns>true if any tags were added, false if they all already existed.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool AddTags(EntityUid uid, TagComponent component, params string[] ids)
-    {
-        return AddTags(uid, component, ids.AsEnumerable());
-    }
-
-    /// <summary>
-    ///     Tries to add the given tags if they don't already exist.
-    /// </summary>
-    /// <param name="ids">The tags to add.</param>
-    /// <returns>true if any tags were added, false if they all already existed.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool AddTags(EntityUid uid, TagComponent component, IEnumerable<string> ids)
-    {
-        var count = component.Tags.Count;
-
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-            component.Tags.Add(id);
-        }
-
-        if (component.Tags.Count > count)
-        {
-            Dirty(uid, component);
-            return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Checks if a tag has been added.
-    /// </summary>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if it exists, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
-    /// </exception>
-    public bool HasTag(TagComponent component, string id)
-    {
-        AssertValidTag(id);
-        return component.Tags.Contains(id);
-    }
-
-    /// <summary>
-    ///     Checks if all of the given tags have been added.
-    /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAllTags(TagComponent component, params string[] ids)
-    {
-        return HasAllTags(component, ids.AsEnumerable());
-    }
-
-    /// <summary>
-    ///     Checks if all of the given tags have been added.
-    /// </summary>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAllTags(TagComponent component, string id) => HasTag(component, id);
-
-    /// <summary>
-    ///     Checks if all of the given tags have been added.
-    /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAllTags(TagComponent component, List<string> ids)
-    {
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-
-            if (!component.Tags.Contains(id))
-                return false;
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Checks if all of the given tags have been added.
-    /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAllTags(TagComponent component, IEnumerable<string> ids)
-    {
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-
-            if (!component.Tags.Contains(id))
-                return false;
-
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Checks if all of the given tags have been added.
-    /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if they all exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAllTags(TagComponent component, List<ProtoId<TagPrototype>> ids)
-    {
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-
-            if (!component.Tags.Contains(id))
-                return false;
-
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added.
-    /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(TagComponent component, params string[] ids)
-    {
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-
-            if (component.Tags.Contains(id))
-                return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added.
-    /// </summary>
-    /// <param name="id">The tag to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(TagComponent component, string id) => HasTag(component, id);
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added.
-    /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(TagComponent component, List<string> ids)
-    {
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-
-            if (component.Tags.Contains(id))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added.
-    /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(TagComponent component, IEnumerable<string> ids)
-    {
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-
-            if (component.Tags.Contains(id))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Checks if any of the given tags have been added.
-    /// </summary>
-    /// <param name="ids">The tags to check for.</param>
-    /// <returns>true if any of them exist, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool HasAnyTag(TagComponent comp, List<ProtoId<TagPrototype>> ids)
-    {
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-
-            if (comp.Tags.Contains(id))
-                return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Tries to remove a tag if it exists.
-    /// </summary>
-    /// <returns>
-    ///     true if it was removed, false otherwise even if it didn't exist.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if no <see cref="TagPrototype"/> exists with the given id.
-    /// </exception>
-    public bool RemoveTag(EntityUid uid, TagComponent component, string id)
-    {
-        AssertValidTag(id);
-
-        if (component.Tags.Remove(id))
-        {
-            Dirty(uid, component);
-            return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    ///     Tries to remove all of the given tags if they exist.
-    /// </summary>
-    /// <param name="ids">The tags to remove.</param>
-    /// <returns>
-    ///     true if it was removed, false otherwise even if they didn't exist.
-    /// </returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool RemoveTags(EntityUid uid, TagComponent component, params string[] ids)
-    {
-        return RemoveTags(uid, component, ids.AsEnumerable());
-    }
-
-    /// <summary>
-    ///     Tries to remove all of the given tags if they exist.
-    /// </summary>
-    /// <param name="ids">The tags to remove.</param>
-    /// <returns>true if any tag was removed, false otherwise.</returns>
-    /// <exception cref="UnknownPrototypeException">
-    ///     Thrown if one of the ids represents an unregistered <see cref="TagPrototype"/>.
-    /// </exception>
-    public bool RemoveTags(EntityUid uid, TagComponent component, IEnumerable<string> ids)
-    {
-        var count = component.Tags.Count;
-
-        foreach (var id in ids)
-        {
-            AssertValidTag(id);
-            component.Tags.Remove(id);
-        }
-
-        if (component.Tags.Count < count)
-        {
-            Dirty(uid, component);
-            return true;
-        }
-
-        return false;
-    }
 }
diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
index 62c0b0f44e..bc73baa61a 100644
--- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
@@ -101,6 +101,9 @@ public sealed class SwapTeleporterSystem : EntitySystem
 
     private void OnActivateInWorld(Entity<SwapTeleporterComponent> ent, ref ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         var (uid, comp) = ent;
         var user = args.User;
         if (comp.TeleportTime != null)
@@ -130,6 +133,7 @@ public sealed class SwapTeleporterSystem : EntitySystem
         comp.NextTeleportUse = _timing.CurTime + comp.Cooldown;
         comp.TeleportTime = _timing.CurTime + comp.TeleportDelay;
         Dirty(uid, comp);
+        args.Handled = true;
     }
 
     public void DoTeleport(Entity<SwapTeleporterComponent, TransformComponent> ent)
diff --git a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
index 87df69e88d..f11af33552 100644
--- a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
+++ b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
@@ -79,7 +79,7 @@ namespace Content.Shared.Toilet.Systems
 
         private void OnActivateInWorld(EntityUid uid, ToiletComponent comp, ActivateInWorldEvent args)
         {
-            if (args.Handled)
+            if (args.Handled || !args.Complex)
                 return;
 
             args.Handled = true;
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
index 9114c62ade..d69f01d762 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
@@ -28,7 +28,7 @@ public abstract partial class SharedToolSystem
 
     private void OnMultipleToolActivated(EntityUid uid, MultipleToolComponent multiple, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         args.Handled = CycleMultipleTool(uid, multiple, args.User);
diff --git a/Content.Shared/UserInterface/ActivatableUISystem.cs b/Content.Shared/UserInterface/ActivatableUISystem.cs
index c1822c4ee3..1bb11f337f 100644
--- a/Content.Shared/UserInterface/ActivatableUISystem.cs
+++ b/Content.Shared/UserInterface/ActivatableUISystem.cs
@@ -133,7 +133,7 @@ public sealed partial class ActivatableUISystem : EntitySystem
 
     private void OnActivate(EntityUid uid, ActivatableUIComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         if (component.VerbOnly)
diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs
index e78fe98f4c..319f927c7b 100644
--- a/Content.Shared/Verbs/SharedVerbSystem.cs
+++ b/Content.Shared/Verbs/SharedVerbSystem.cs
@@ -78,28 +78,8 @@ namespace Content.Shared.Verbs
             // call ActionBlocker checks, just cache it for the verb request.
             var canInteract = force || _actionBlockerSystem.CanInteract(user, target);
 
-            EntityUid? @using = null;
-            if (TryComp(user, out HandsComponent? hands) && (force || _actionBlockerSystem.CanUseHeldEntity(user)))
-            {
-                // if we don't actually have any hands, pass in a null value for the events.
-                if (hands.Count == 0)
-                {
-                    hands = null;
-                }
-                else
-                {
-                    @using = hands.ActiveHandEntity;
-
-                    // Check whether the "Held" entity is a virtual pull entity. If yes, set that as the entity being "Used".
-                    // This allows you to do things like buckle a dragged person onto a surgery table, without click-dragging
-                    // their sprite.
-
-                    if (TryComp(@using, out VirtualItemComponent? pull))
-                    {
-                        @using = pull.BlockingEntity;
-                    }
-                }
-            }
+            _interactionSystem.TryGetUsedEntity(user, out var @using);
+            TryComp<HandsComponent>(user, out var hands);
 
             // TODO: fix this garbage and use proper generics or reflection or something else, not this.
             if (types.Contains(typeof(InteractionVerb)))
diff --git a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
index d1814020e6..eab638a9fc 100644
--- a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
+++ b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
@@ -15,6 +16,7 @@ public abstract class SharedDamageMarkerSystem : EntitySystem
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -58,7 +60,7 @@ public abstract class SharedDamageMarkerSystem : EntitySystem
         if (!args.OtherFixture.Hard ||
             args.OurFixtureId != SharedProjectileSystem.ProjectileFixture ||
             component.Amount <= 0 ||
-            component.Whitelist?.IsValid(args.OtherEntity, EntityManager) == false ||
+            _whitelistSystem.IsWhitelistFail(component.Whitelist, args.OtherEntity) ||
             !TryComp<ProjectileComponent>(uid, out var projectile) ||
             projectile.Weapon == null)
         {
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 9f4d2cddce..a777b12b7d 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -504,7 +504,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
         var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user);
 
-        if (damageResult != null && damageResult.Any())
+        if (damageResult is {Empty: false})
         {
             // If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
             if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage))
@@ -756,7 +756,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
             return;
 
         var invMatrix = TransformSystem.GetInvWorldMatrix(userXform);
-        var localPos = invMatrix.Transform(coordinates.Position);
+        var localPos = Vector2.Transform(coordinates.Position, invMatrix);
 
         if (localPos.LengthSquared() <= 0f)
             return;
diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index 41e1895da2..6feffffbe3 100644
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -116,7 +116,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
 
     private void OnGunActivate(EntityUid uid, GrapplingGunComponent component, ActivateInWorldEvent args)
     {
-        if (!Timing.IsFirstTimePredicted || args.Handled)
+        if (!Timing.IsFirstTimePredicted || args.Handled || !args.Complex)
             return;
 
         if (Deleted(component.Projectile))
diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.Force.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.Force.cs
index eec115b02d..932ef70460 100644
--- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.Force.cs
+++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.Force.cs
@@ -14,6 +14,9 @@ public abstract partial class SharedTetherGunSystem
 
     private void OnForceActivate(EntityUid uid, ForceGunComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         StopTether(uid, component);
     }
 
diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
index ad2249bfdd..3d7f9df458 100644
--- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
@@ -152,6 +152,9 @@ public abstract partial class SharedTetherGunSystem : EntitySystem
 
     private void OnTetherActivate(EntityUid uid, TetherGunComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         StopTether(uid, component);
     }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
index 68fb2f27c9..8e44576d28 100644
--- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
@@ -75,6 +75,9 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
 
     private void OnInteractHandEvent(EntityUid uid, BatteryWeaponFireModesComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (component.FireModes.Count < 2)
             return;
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs
index a014f8e5c7..ee5ca2174f 100644
--- a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs
@@ -18,6 +18,9 @@ public sealed class RechargeCycleAmmoSystem : EntitySystem
 
     private void OnRechargeCycled(EntityUid uid, RechargeCycleAmmoComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!TryComp<BasicEntityAmmoProviderComponent>(uid, out var basic) || args.Handled)
             return;
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 6242312b07..1f9e6cee76 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -41,7 +41,10 @@ public abstract partial class SharedGunSystem
 
     private void OnBallisticInteractUsing(EntityUid uid, BallisticAmmoProviderComponent component, InteractUsingEvent args)
     {
-        if (args.Handled || component.Whitelist?.IsValid(args.Used, EntityManager) != true)
+        if (args.Handled)
+            return;
+
+        if (_whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, args.Used))
             return;
 
         if (GetBallisticShots(component) >= component.Capacity)
@@ -186,6 +189,7 @@ public abstract partial class SharedGunSystem
             !Paused(uid))
         {
             gunComp.NextFire = Timing.CurTime + TimeSpan.FromSeconds(1 / gunComp.FireRateModified);
+            Dirty(uid, gunComp);
         }
 
         Dirty(uid, component);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
index c421c92a9f..adae26a223 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
@@ -51,7 +51,7 @@ public abstract partial class SharedGunSystem
     /// </summary>
     private void OnChamberActivate(EntityUid uid, ChamberMagazineAmmoProviderComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         args.Handled = true;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
index b8b00799c1..14aaff5bf7 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
@@ -89,7 +89,7 @@ public partial class SharedGunSystem
 
     public bool TryRevolverInsert(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid uid, EntityUid? user)
     {
-        if (component.Whitelist?.IsValid(uid, EntityManager) == false)
+        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, uid))
             return false;
 
         // If it's a speedloader try to get ammo from it.
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 4debc289be..47648a07ad 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -21,6 +21,7 @@ using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -63,6 +64,7 @@ public abstract partial class SharedGunSystem : EntitySystem
     [Dependency] protected readonly TagSystem TagSystem = default!;
     [Dependency] protected readonly ThrowingSystem ThrowingSystem = default!;
     [Dependency] private   readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private const float InteractNextFire = 0.3f;
     private const double SafetyNextFire = 0.5;
diff --git a/Content.Shared/Whitelist/EntityWhitelistSystem.cs b/Content.Shared/Whitelist/EntityWhitelistSystem.cs
index d73646b7e9..f311946cf9 100644
--- a/Content.Shared/Whitelist/EntityWhitelistSystem.cs
+++ b/Content.Shared/Whitelist/EntityWhitelistSystem.cs
@@ -60,6 +60,90 @@ public sealed class EntityWhitelistSystem : EntitySystem
 
         return list.RequireAll;
     }
+    /// The following are a list of "helper functions" that are basically the same as each other
+    /// to help make code that uses EntityWhitelist a bit more readable because at the moment
+    /// it is quite clunky having to write out component.Whitelist == null ? true : _whitelist.IsValid(component.Whitelist, uid)
+    /// several times in a row and makes comparisons easier to read
+
+    /// <summary>
+    /// Helper function to determine if Whitelist is not null and entity is on list
+    /// </summary>
+    public bool IsWhitelistPass(EntityWhitelist? whitelist, EntityUid uid)
+    {
+        if (whitelist == null)
+            return false;
+
+        return IsValid(whitelist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Whitelist is not null and entity is not on the list
+    /// </summary>
+    public bool IsWhitelistFail(EntityWhitelist? whitelist, EntityUid uid)
+    {
+        if (whitelist == null)
+            return false;
+
+        return !IsValid(whitelist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Whitelist is either null or the entity is on the list
+    /// </summary>
+    public bool IsWhitelistPassOrNull(EntityWhitelist? whitelist, EntityUid uid)
+    {
+        if (whitelist == null)
+            return true;
+
+        return IsValid(whitelist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Whitelist is either null or the entity is not on the list
+    /// </summary>
+    public bool IsWhitelistFailOrNull(EntityWhitelist? whitelist, EntityUid uid)
+    {
+        if (whitelist == null)
+            return true;
+
+        return !IsValid(whitelist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Blacklist is not null and entity is on list
+    /// Duplicate of equivalent Whitelist function
+    /// </summary>
+    public bool IsBlacklistPass(EntityWhitelist? blacklist, EntityUid uid)
+    {
+        return IsWhitelistPass(blacklist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Blacklist is not null and entity is not on the list
+    /// Duplicate of equivalent Whitelist function
+    /// </summary>
+    public bool IsBlacklistFail(EntityWhitelist? blacklist, EntityUid uid)
+    {
+        return IsWhitelistFail(blacklist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Blacklist is either null or the entity is on the list
+    /// Duplicate of equivalent Whitelist function
+    /// </summary>
+    public bool IsBlacklistPassOrNull(EntityWhitelist? blacklist, EntityUid uid)
+    {
+        return IsWhitelistPassOrNull(blacklist, uid);
+    }
+
+    /// <summary>                                        
+    /// Helper function to determine if Blacklist is either null or the entity is not on the list
+    /// Duplicate of equivalent Whitelist function
+    /// </summary>
+    public bool IsBlacklistFailOrNull(EntityWhitelist? blacklist, EntityUid uid)
+    {
+        return IsWhitelistFailOrNull(blacklist, uid);
+    }
 
     private void EnsureRegistrations(EntityWhitelist list)
     {
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 0c0c7aece8..2964e8c11b 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -255,5 +255,31 @@ Entries:
   id: 31
   time: '2024-05-28T18:00:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28319
+- author: ShadowCommander
+  changes:
+  - message: Added a search bar to the admin menu player tab.
+    type: Add
+  - message: Changed the player tab entry tooltip to be the player name, character
+      name, identity, and job. Moved the time tooltip to the header.
+    type: Tweak
+  id: 32
+  time: '2024-05-31T06:28:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28030
+- author: Geekyhobo
+  changes:
+  - message: Added a PII admin flag to hide personal identification information.
+    type: Add
+  id: 33
+  time: '2024-06-01T07:23:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27776
+- author: ShadowCommander, EmoGarbage
+  changes:
+  - message: 'Added new permissions: moderator, adminwho, and namecolor'
+    type: Add
+  - message: Changed various command perms from admin to moderator & fun.
+    type: Tweak
+  id: 34
+  time: '2024-06-01T08:14:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28451
 Name: Admin
 Order: 1
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7bbc12d0b9..a6e7cbbc71 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,171 +1,4 @@
 Entries:
-- author: 778b
-  changes:
-  - message: Guns which use battery as magazines now display ammo. Like Svalinn pistol.
-    type: Fix
-  id: 6144
-  time: '2024-03-13T11:13:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26009
-- author: icekot8
-  changes:
-  - message: Foxes are now neutral and deal 8 piercing damage
-    type: Tweak
-  id: 6145
-  time: '2024-03-13T15:02:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25992
-- author: Mangohydra
-  changes:
-  - message: The lawyer now spawns with their own lawyer stamp for stamping very important
-      documents.
-    type: Add
-  id: 6146
-  time: '2024-03-13T15:05:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26012
-- author: Errant
-  changes:
-  - message: Clothes with alternate sprites for vox once again show the alternate
-      sprites, instead of the defaults.
-    type: Fix
-  id: 6147
-  time: '2024-03-13T15:06:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25989
-- author: Gyrandola
-  changes:
-  - message: Fireaxe and Shotgun cabinets can now be destroyed.
-    type: Add
-  id: 6148
-  time: '2024-03-13T15:09:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25962
-- author: lzk228
-  changes:
-  - message: Surgery tools can be placed in medical belt.
-    type: Tweak
-  - message: Lantern can be placed in utility belt.
-    type: Tweak
-  - message: Hand labeler can be placed in utility and botanical belt
-    type: Tweak
-  id: 6149
-  time: '2024-03-13T18:55:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26085
-- author: wafehling
-  changes:
-  - message: The trading outpost now has dedicated buy-only and sell-only pallets.
-      No more accidentally selling orders you just bought. Cargonians rejoice!
-    type: Tweak
-  id: 6150
-  time: '2024-03-13T23:26:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25955
-- author: maylokana
-  changes:
-  - message: Entities can no longer drink from closed containers
-    type: Fix
-  id: 6151
-  time: '2024-03-14T04:10:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26103
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Gunpowder can now be made by chemists with 6 parts potassium, 2 parts
-      sulfur and charcoal.
-    type: Add
-  - message: Pipebombs may now be crafted with a pipe, gunpowder and LV cable.
-    type: Add
-  - message: IEDs have been reworked, they are now called "fire bombs" and generate
-      a weak explosion that ignites nearby objects.
-    type: Tweak
-  id: 6152
-  time: '2024-03-14T04:27:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25705
-- author: PJB3005
-  changes:
-  - message: You must now wait 30 seconds before attempting to reconnect to a full
-      server.
-    type: Tweak
-  id: 6153
-  time: '2024-03-14T08:00:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/20972
-- author: Crotalus
-  changes:
-  - message: Sort agents by success rate in end game summary
-    type: Tweak
-  id: 6154
-  time: '2024-03-14T15:52:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26058
-- author: nikthechampiongr
-  changes:
-  - message: The radio jammer is now able to jam the signal of suit sensors.
-    type: Tweak
-  id: 6155
-  time: '2024-03-14T15:55:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26046
-- author: deltanedas
-  changes:
-  - message: Holocarp and Magicarp plushies can now be found in maintenance.
-    type: Add
-  id: 6156
-  time: '2024-03-15T02:58:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26081
-- author: TheShuEd
-  changes:
-  - message: Added random colored jumpsuits to the mixed wardrobes. Each costume is
-      randomly generated from parts painted in random colors, which gives a huge number
-      of combinations of the appearance of such costumes.
-    type: Add
-  id: 6157
-  time: '2024-03-15T07:37:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25888
-- author: Nopey
-  changes:
-  - message: Dead players can no longer spin on a bar stool.
-    type: Fix
-  id: 6158
-  time: '2024-03-15T10:03:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24308
-- author: Nairodian
-  changes:
-  - message: Added a new red neck gaiter to the AutoDrobe.
-    type: Add
-  id: 6159
-  time: '2024-03-15T10:11:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25891
-- author: Tayrtahn
-  changes:
-  - message: Reflected tranquilizer rounds no longer inject the character who reflected
-      them.
-    type: Fix
-  id: 6160
-  time: '2024-03-15T13:57:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26141
-- author: lzk228
-  changes:
-  - message: Refill light replacer from box popup now shows properly.
-    type: Fix
-  id: 6161
-  time: '2024-03-15T15:23:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26136
-- author: FairlySadPanda
-  changes:
-  - message: Food and drink stocks in vending machines has been reduced to encourage
-      people to use the kitchen and bar.
-    type: Tweak
-  id: 6162
-  time: '2024-03-15T23:28:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25999
-- author: Plykiya
-  changes:
-  - message: Ion storms now have a chance of happening from the start of shift.
-    type: Tweak
-  id: 6163
-  time: '2024-03-16T03:47:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26165
-- author: Krunk
-  changes:
-  - message: Zombies and animals can be stripped once again.
-    type: Fix
-  - message: Dead or critical mobs can no longer be stripped instantly.
-    type: Fix
-  id: 6164
-  time: '2024-03-16T03:50:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26166
 - author: metalgearsloth
   changes:
   - message: Fix store refunds.
@@ -3863,3 +3696,160 @@
   id: 6643
   time: '2024-05-30T07:32:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28405
+- author: ShadowCommander
+  changes:
+  - message: Fixed firelocks with warnings enabled opening immediately for characters
+      without engineering access.
+    type: Fix
+  id: 6644
+  time: '2024-05-30T17:25:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28415
+- author: moonheart08
+  changes:
+  - message: The hand teleporter can no longer create portal links between grids.
+    type: Remove
+  id: 6645
+  time: '2024-05-30T20:45:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28423
+- author: Ghagliiarghii
+  changes:
+  - message: Cargo Sale Computer now correctly uses its own computer board
+    type: Fix
+  id: 6646
+  time: '2024-05-31T00:28:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28425
+- author: metalgearsloth
+  changes:
+  - message: Fix verb categories shuffling around.
+    type: Fix
+  id: 6647
+  time: '2024-05-31T01:55:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28368
+- author: ShadowCommander
+  changes:
+  - message: Tweaked the player tab column widths so that usernames and character
+      names are more visible.
+    type: Tweak
+  id: 6648
+  time: '2024-05-31T01:59:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28029
+- author: EmoGarbage404
+  changes:
+  - message: Fixed latejoin antagonists not respecting antag preferences (for real
+      this time)
+    type: Fix
+  id: 6649
+  time: '2024-05-31T02:06:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28430
+- author: Ubaser
+  changes:
+  - message: Botanists now spawn with a plant clipper.
+    type: Tweak
+  id: 6650
+  time: '2024-05-31T07:37:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28439
+- author: Ubaser
+  changes:
+  - message: Janitors now spawn with a light replacer.
+    type: Tweak
+  id: 6651
+  time: '2024-05-31T08:44:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28441
+- author: NazrinNya
+  changes:
+  - message: Disposal pipes are now blocked from constructing underneath impassable
+      objects.
+    type: Fix
+  id: 6652
+  time: '2024-05-31T14:49:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28447
+- author: ShadowCommander
+  changes:
+  - message: Opening a firelock when temperature or pressure warnings are active,
+      now always shows the warning popup.
+    type: Tweak
+  id: 6653
+  time: '2024-05-31T14:56:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28420
+- author: ElectroJr
+  changes:
+  - message: Hugging a player no longer briefly opens the mugging UI
+    type: Fix
+  id: 6654
+  time: '2024-05-31T17:25:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28432
+- author: aspiringLich
+  changes:
+  - message: Some chemicals have been made more colorful and child-friendly.
+    type: Tweak
+  id: 6655
+  time: '2024-05-31T19:44:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28367
+- author: Vermidia
+  changes:
+  - message: Many more ghost roles have a random appearance, including ERT and shuttle
+      roles.
+    type: Tweak
+  id: 6656
+  time: '2024-06-01T04:51:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27997
+- author: Cojoke-dot
+  changes:
+  - message: Medical Borgs now have medical huds
+    type: Add
+  id: 6657
+  time: '2024-06-01T04:54:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28391
+- author: beck-thompson
+  changes:
+  - message: You can now remove evidence from containers using the verb menu.
+    type: Fix
+  id: 6658
+  time: '2024-06-01T04:58:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28101
+- author: notafet
+  changes:
+  - message: Increase power output from Tesla coils.
+    type: Tweak
+  id: 6659
+  time: '2024-06-01T05:51:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28424
+- author: Beck Thompson
+  changes:
+  - message: ID computer will now select passenger as the default id icon instead
+      of atmospheric technician.
+    type: Fix
+  id: 6660
+  time: '2024-06-01T17:29:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28462
+- author: AJCM-git
+  changes:
+  - message: Machine parts are now stackable
+    type: Tweak
+  id: 6661
+  time: '2024-06-01T17:49:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28434
+- author: DrSmugleaf
+  changes:
+  - message: Disabled the seeing rainbows screen effect when reduced motion is enabled
+      in the options menu.
+    type: Tweak
+  id: 6662
+  time: '2024-06-02T01:41:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28496
+- author: Cojoke-dot
+  changes:
+  - message: Lasers now pass through Glass External Airlocks and Glass Shuttle Airlocks
+    type: Fix
+  id: 6663
+  time: '2024-06-02T04:13:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28065
+- author: slarticodefast
+  changes:
+  - message: Fixed the flash effect getting darker with each appearence.
+    type: Fix
+  - message: Fixed short-sightedness making you immune to flashes.
+    type: Fix
+  id: 6664
+  time: '2024-06-02T04:17:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27369
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index b7ec22c0b0..b3627580b1 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, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, KEEYNy, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Locale/en-US/administration/bwoink.ftl b/Resources/Locale/en-US/administration/bwoink.ftl
index 94d3328bde..474af89c26 100644
--- a/Resources/Locale/en-US/administration/bwoink.ftl
+++ b/Resources/Locale/en-US/administration/bwoink.ftl
@@ -12,3 +12,5 @@ bwoink-system-typing-indicator = {$players} {$count ->
 } typing...
 
 admin-bwoink-play-sound = Bwoink?
+
+bwoink-title-none-selected = None selected
diff --git a/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
index e0dd7a03b1..f9f9f6b5c9 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
@@ -6,3 +6,6 @@ player-tab-playtime = Playtime
 player-tab-show-disconnected = Show Disconnected
 player-tab-overlay = Overlay
 player-tab-entry-tooltip = Playtime is displayed in days:hours:minutes.
+player-tab-filter-line-edit-placeholder = Filter
+player-tab-is-antag-yes = YES
+player-tab-is-antag-no = NO
diff --git a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
index 74e38f00ab..601392069b 100644
--- a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
@@ -5,8 +5,8 @@ comp-solution-transfer-fill-fully = You fill {THE($target)} to the brim with {$a
 comp-solution-transfer-transfer-solution = You transfer {$amount}u to {THE($target)}.
 
 ## Displayed when trying to transfer to a solution, but either the giver is empty or the taker is full
-comp-solution-transfer-is-empty = {THE($target)} is empty!
-comp-solution-transfer-is-full = {THE($target)} is full!
+comp-solution-transfer-is-empty = {CAPITALIZE(THE($target))} is empty!
+comp-solution-transfer-is-full = {CAPITALIZE(THE($target))} is full!
 
 ## Displayed in change transfer amount verb's name
 comp-solution-transfer-verb-custom-amount = Custom
diff --git a/Resources/Locale/en-US/commands/job-whitelist-command.ftl b/Resources/Locale/en-US/commands/job-whitelist-command.ftl
new file mode 100644
index 0000000000..7fa20f03de
--- /dev/null
+++ b/Resources/Locale/en-US/commands/job-whitelist-command.ftl
@@ -0,0 +1,20 @@
+cmd-jobwhitelist-job-does-not-exist = Job {$job} does not exist.
+cmd-jobwhitelist-player-not-found = Player {$player} not found.
+cmd-jobwhitelist-hint-player = [player]
+cmd-jobwhitelist-hint-job = [job]
+
+cmd-jobwhitelistadd-desc = Lets a player play a whitelisted job.
+cmd-jobwhitelistadd-help = Usage: jobwhitelistadd <username> <job>
+cmd-jobwhitelistadd-already-whitelisted = {$player} is already whitelisted to play as {$jobId} .({$jobName}).
+cmd-jobwhitelistadd-added = Added {$player} to the {$jobId} ({$jobName}) whitelist.
+
+cmd-jobwhitelistget-desc = Gets all the jobs that a player has been whitelisted for.
+cmd-jobwhitelistget-help = Usage: jobwhitelistadd <username>
+cmd-jobwhitelistget-whitelisted-none = Player {$player} is not whitelisted for any jobs.
+cmd-jobwhitelistget-whitelisted-for = "Player {$player} is whitelisted for:
+{$jobs}"
+
+cmd-jobwhitelistremove-desc = Removes a player's ability to play a whitelisted job.
+cmd-jobwhitelistremove-help = Usage: jobwhitelistadd <username> <job>
+cmd-jobwhitelistremove-was-not-whitelisted = {$player} was not whitelisted to play as {$jobId} ({$jobName}).
+cmd-jobwhitelistremove-removed = Removed {$player} from the whitelist for {$jobId} ({$jobName}).
diff --git a/Resources/Locale/en-US/components/power-monitoring-component.ftl b/Resources/Locale/en-US/components/power-monitoring-component.ftl
index e84c09e60d..9433c9ea9e 100644
--- a/Resources/Locale/en-US/components/power-monitoring-component.ftl
+++ b/Resources/Locale/en-US/components/power-monitoring-component.ftl
@@ -14,6 +14,7 @@ power-monitoring-window-total-sources = Total generator output
 power-monitoring-window-total-battery-usage = Total battery usage
 power-monitoring-window-total-loads = Total network loads
 power-monitoring-window-value = { POWERWATTS($value) }
+power-monitoring-window-button-value = {$value} W
 power-monitoring-window-show-inactive-consumers = Show Inactive Consumers
 
 power-monitoring-window-show-cable-networks = Toggle cable networks
diff --git a/Resources/Locale/en-US/entity-categories.ftl b/Resources/Locale/en-US/entity-categories.ftl
new file mode 100644
index 0000000000..190fe5713a
--- /dev/null
+++ b/Resources/Locale/en-US/entity-categories.ftl
@@ -0,0 +1 @@
+entity-category-name-actions = Actions
diff --git a/Resources/Locale/en-US/forensics/forensics.ftl b/Resources/Locale/en-US/forensics/forensics.ftl
index 957cc444a8..29e2db8f78 100644
--- a/Resources/Locale/en-US/forensics/forensics.ftl
+++ b/Resources/Locale/en-US/forensics/forensics.ftl
@@ -20,9 +20,11 @@ forensic-scanner-printer-not-ready = Printer is not ready yet.
 forensic-scanner-verb-text = Scan
 forensic-scanner-verb-message = Perform a forensic scan
 
-
-
 forensic-pad-fingerprint-name = {$entity}'s fingerprints
 forensic-pad-gloves-name = fibers from {$entity}
 
-forensics-cleaning = You begin cleaning the evidence off of {THE($target)}...
\ No newline at end of file
+forensics-verb-text = Remove evidence
+forensics-verb-message = Remove fingerprints and DNA residues from the object!
+forensics-cleaning = You begin cleaning the evidence off of {THE($target)}...
+
+forensics-cleaning-cannot-clean = There is nothing cleanable on {THE($target)}!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index 1dacebd134..ba005e6bf9 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -373,10 +373,10 @@ reagent-effect-guidebook-plant-diethylamine =
     { $chance ->
         [1] Increases
         *[other] increase
-    } the plant's lifespan and/or base health with 10% chance for each.
+    } the plant's lifespan and/or base health with 10% chance for each
 
 reagent-effect-guidebook-plant-robust-harvest =
     { $chance ->
         [1] Increases
         *[other] increase
-    } the plant's potency by {$increase} up to a maximum of {$limit}. Causes the plant to lose its seeds once the potency reaches {$seedlesstreshold}. Trying to add potency over {$limit} may cause decrease in yield at a 10% chance.
+    } the plant's potency by {$increase} up to a maximum of {$limit}. Causes the plant to lose its seeds once the potency reaches {$seedlesstreshold}. Trying to add potency over {$limit} may cause decrease in yield at a 10% chance
diff --git a/Resources/Locale/en-US/job/role-whitelist.ftl b/Resources/Locale/en-US/job/role-whitelist.ftl
new file mode 100644
index 0000000000..3149f182b6
--- /dev/null
+++ b/Resources/Locale/en-US/job/role-whitelist.ftl
@@ -0,0 +1 @@
+role-not-whitelisted = You are not whitelisted to play this role.
diff --git a/Resources/Locale/en-US/prototypes/roles/antags.ftl b/Resources/Locale/en-US/prototypes/roles/antags.ftl
index 5c514dba8e..f0038b0eb9 100644
--- a/Resources/Locale/en-US/prototypes/roles/antags.ftl
+++ b/Resources/Locale/en-US/prototypes/roles/antags.ftl
@@ -30,3 +30,6 @@ roles-antag-space-ninja-objective = Use your stealth to sabotage the station, no
 
 roles-antag-thief-name = Thief
 roles-antag-thief-objective = Add some NT property to your personal collection without using violence.
+
+roles-antag-dragon-name = Space Dragon
+roles-antag-dragon-objective = Create a carp army to take over this quadrant.
diff --git a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
index 0e4b5f6e39..907c14ce56 100644
--- a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
+++ b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
@@ -1,4 +1,4 @@
-anomaly-spawn-event-announcement = Our readings have detected a dangerous interspacial anomaly. Please inform the research team of { $sighting }.
+anomaly-spawn-event-announcement = Our readings have detected a dangerous interspacial anomaly. Please inform the research team about { $sighting }.
 
 anomaly-spawn-sighting-1 = low pulsating sounds heard throughout the station
 anomaly-spawn-sighting-2 = strange sources of light
diff --git a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl
index 997afedfc0..5c1a46339e 100644
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -8,3 +8,6 @@ store-ui-traitor-warning = Operatives must lock their uplinks after use to avoid
 store-withdraw-button-ui = Withdraw {$currency}
 store-ui-button-out-of-stock = {""} (Out of Stock)
 store-not-account-owner = This {$store} is not bound to you!
+
+store-preset-name-uplink = Uplink
+store-preset-name-spellbook = Spellbook
diff --git a/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl b/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl
new file mode 100644
index 0000000000..28f526f0d5
--- /dev/null
+++ b/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl
@@ -0,0 +1 @@
+handheld-teleporter-instability-fizzle = The portal fizzles as you try to place it, destroying both ends!
diff --git a/Resources/Locale/en-US/tips.ftl b/Resources/Locale/en-US/tips.ftl
new file mode 100644
index 0000000000..52912d1ba4
--- /dev/null
+++ b/Resources/Locale/en-US/tips.ftl
@@ -0,0 +1,134 @@
+tips-dataset-1 = If you're on fire, you can click the alert on the right of your screen to stop, drop, and roll.
+tips-dataset-2 = You can view and edit all keybindings used in-game at any time through the Options menu.
+tips-dataset-3 = You can access the in-game guidebook through the escape menu, or by pressing Numpad 0 by default.
+tips-dataset-4 = Some entities ingame have guidebook entries associated with them, which you can view by examining the entity and clicking the question mark icon.
+tips-dataset-5 = Artifacts have the ability to gain permanent effects for some triggered nodes, including becoming an intercom or an extremely efficient generator.
+tips-dataset-6 = You can avoid slipping on most puddles by walking. However, some strong chemicals like space lube will slip people anyway.
+tips-dataset-7 = Some plants, such as galaxy thistle, can be ground up into extremely useful and potent medicines.
+tips-dataset-8 = Mopping up puddles and draining them into other containers conserves the reagents found in the puddle.
+tips-dataset-9 = Floor drains, usually found in the chef's freezer or janitor's office, rapidly consume reagent found in puddles around them--including blood.
+tips-dataset-10 = Cognizine, a hard to manufacture chemical, makes animals sentient when they are injected with it.
+tips-dataset-11 = Loaded mousetraps are incredibly effective at dealing with all manner of low-mass mobs--including Rat Servants.
+tips-dataset-12 = Fire extinguishers can be loaded with any reagent in the game.
+tips-dataset-13 = Some reagents, like chlorine trifluoride, have unique effects when applied by touch, such as through a spray bottle or foam.
+tips-dataset-14 = Remember to touch grass in between playing Space Station 14 every once in a while.
+tips-dataset-15 = You can use the Activate in World keybind, E by default, to interact with objects while your hands are full, or without picking them up.
+tips-dataset-16 = Common sense goes a long way to avoiding conflict.
+tips-dataset-17 = Every other player in game is a human being as well.
+tips-dataset-18 = When running the Singularity, make sure to check on it periodically. If sabotaged, it could put the entire station at risk.
+tips-dataset-19 = If the Singularity is up, make sure to refuel the radiation collectors once in a while.
+tips-dataset-20 = Chemicals don't react while inside the ChemMaster's buffer.
+tips-dataset-21 = Don't anger the bartender by throwing their glasses! Politely place them on the table by tapping Q.
+tips-dataset-22 = You can hold SPACE by default to slow the movement of the shuttle when piloting, to allow for precise movements--or even coming to a complete stop.
+tips-dataset-23 = Dexalin, Dexalin Plus, and Epinephrine will all purge heartbreaker toxin from your bloodstream while metabolizing.
+tips-dataset-24 = Every crewmember comes with an emergency medipen in their survival box containing epinephrine and tranexamic acid.
+tips-dataset-25 = The AME is a high-priority target and is easily sabotaged. Make sure to set up the Singularity or Solars so that you don't run out of power if it blows.
+tips-dataset-26 = During a teslaloose, make sure to get rid of all electronic items so you don't become a target.
+tips-dataset-27 = You can add labels to any item, including food or pill canisters, using a hand labeller.
+tips-dataset-28 = Riot armor is significantly more powerful against opponents that aren't using guns compared to regular armor.
+tips-dataset-29 = As a ghost, you can use the Verb Menu to orbit around and follow any entity in game automatically.
+tips-dataset-30 = As a Traitor, you may sometimes be assigned to hunt other traitors, and in turn be hunted by others.
+tips-dataset-31 = As a Traitor, the syndicate encryption key can be used to communicate through a secure channel with any other traitors who have purchased it.
+tips-dataset-32 = As a Traitor, compromising important communications channels like security or engineering can give valuable intelligence. Be aware that this goes in both ways - security can compromise syndicate communications as well!
+tips-dataset-33 = As a Traitor, the syndicate toolbox is extremely versatile. For only 2 telecrystals, you can get a full set of tools to help you in an emergency, insulated combat gloves and a syndicate gas mask.
+tips-dataset-34 = As a Traitor, never underestimate the web vest. It may not provide space protection, but its cheap cost and robust protection makes it handy for protecting against trigger-happy foes.
+tips-dataset-35 = As a Traitor, any purchased grenade penguins won't attack you, and will explode if killed.
+tips-dataset-36 = As a Traitor, be careful when using vestine from the chemical synthesis kit. If someone checks your station, they could easily out you.
+tips-dataset-37 = As a Traitor, remember that power sinks will create a loud sound and alert the crew after running for long enough. Try to hide them in a tricky-to-find spot, or reinforce the area around them so that they're harder to reach.
+tips-dataset-38 = As a Traitor, plasma gas is an excellent way to create chaos. It can be ignited to make an area extra-uninhabitable, and can cause toxin damage to those that inhale it.
+tips-dataset-39 = As a Traitor, dehydrated carps are useful for killing a large hoard of people. As long as you pat it before rehydrating it, it can be used as a great distraction.
+tips-dataset-40 = As a Traitor, have you tried injecting plasma into batteries? In the case of a defibrillator, it explodes on use; hurting the user and the patient!
+tips-dataset-41 = As a Nuclear Operative, stick together! While your equipment is robust, your fellow operatives are much better at saving your life: they can drag you away from danger while stunned and provide cover fire.
+tips-dataset-42 = As a Nuclear Operative, communication is key! Use your radio to speak to your fellow operatives and coordinate an attack plan.
+tips-dataset-43 = As a Nuclear Operative, remember that stealth is an option. It'll be hard for the captain to fight back if he gets caught off guard by what he thinks is just a regular passenger!
+tips-dataset-44 = As an antagonist, be mindful of the power of destroying telecommunications. It'll be a lot harder for people to call you out if they can't do so effectively!
+tips-dataset-45 = You can examine your headset to see which radio channels you have available and how to speak in them.
+tips-dataset-46 = As a Salvage Specialist, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space.
+tips-dataset-47 = As a Salvage Specialist, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective.
+tips-dataset-48 = As a Salvage Specialist, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology.
+tips-dataset-49 = As a Salvage Specialist, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!
+tips-dataset-50 = As a Salvage Specialist, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator.
+tips-dataset-52 = As a Salvage Specialist, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials.
+tips-dataset-53 = As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner.
+tips-dataset-54 = As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to.
+tips-dataset-55 = As a Cargo Technician, if you have a surplus of cash try gambling! Sometimes you gain more money than you begin with.
+tips-dataset-56 = As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying.
+tips-dataset-57 = As the Bartender, you can use a circular saw on your shotgun to make it easier to store.
+tips-dataset-58 = As the Bartender, try experimenting with unique drinks. Have you tried to make demon's blood yet?
+tips-dataset-59 = As a Botanist, you can mutate and crossbreed plants together to create more potent produce that also has higher yields.
+tips-dataset-60 = As the Clown, spice your gimmicks up! Nobody likes a one-trick pony.
+tips-dataset-61 = As the Clown, if you lose your banana peels and soap, you can still slip people with your PDA! Honk!
+tips-dataset-62 = As the Chef, your knife can act as a weapon in an emergency.
+tips-dataset-63 = As the Chef, you can sneak liquids into your foods. As a traitor, putting a little bit of amatoxin or other poison can greatly annoy the crew!
+tips-dataset-64 = As the Mime, your oath of silence is your source of power. Breaking it robs you of your powers and of your honor.
+tips-dataset-65 = As the Lawyer, try to negotiate with the Warden if sentences seem too high for the crime.
+tips-dataset-66 = As a Security Officer, communicate and coordinate with your fellow officers using the security radio channel to avoid confusion.
+tips-dataset-67 = As a Security Officer, remember that correlation does not equal causation. Someone may have just been at the wrong place at the wrong time!
+tips-dataset-68 = As a Detective, you can chase criminals more effectively by using fingerprint fiber data and DNA obtained from forensic scans of objects the perpetrator likely interacted with.
+tips-dataset-69 = As an Atmospheric Technician, your ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches.
+tips-dataset-70 = As an Atmospheric Technician, try to resist the temptation of making canister bombs for Nuclear Operatives, unless you're in a last-ditch scenario. They often lead to large amounts of unnecessary friendly fire!
+tips-dataset-71 = As an Engineer, you can repair cracked windows by using a lit welding tool on them while not in combat mode.
+tips-dataset-72 = As an Engineer, you can electrify grilles by placing powered cables beneath them.
+tips-dataset-73 = As an Engineer, always double check when you're setting up the singularity. It is easier than you think to loose it!
+tips-dataset-74 = As an Engineer, you can use plasma glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation.
+tips-dataset-75 = As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser pistol or your life are things to worry about.
+tips-dataset-76 = As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe.
+tips-dataset-77 = As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny.
+tips-dataset-78 = As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back!
+tips-dataset-79 = As a Scientist, you can try random things on an artifact while the scanner is on cooldown to speed up the point extraction process significantly.
+tips-dataset-80 = As a Scientist, you can utilize upgraded versions of machines to increase its effectiveness. This can make certain machines significantly better; salvage will love you if you upgrade their ore processor!
+tips-dataset-81 = As a Scientist, you can build cyborgs using positronic brains and a chassis, they are just as useful as a new crew member.
+tips-dataset-82 = As a Medical Doctor, try to be wary of overdosing your patients, especially if someone else has already been on the scene. Overdoses are often lethal to patients in crit!
+tips-dataset-83 = As a Medical Doctor, don't underestimate your cryo pods! They heal almost every type of damage, making them very useful when you are overloaded or need to heal someone in a pinch.
+tips-dataset-84 = As a Medical Doctor, exercise caution when putting reptilians in cryopods. They will take a lot of extra cold damage, but you can mitigate this with some burn medicine or leporazine.
+tips-dataset-85 = As a Medical Doctor, remember that the health analyzer can be used if you lose your PDA. However it has a battery, and if it drains too quickly for your taste you can ask science to print a better battery for you!
+tips-dataset-86 = As a Chemist, once you've made everything you've needed to, don't be afraid to make more silly reagents. Have you tried desoxyephedrine or licoxide?
+tips-dataset-87 = As a Medical Doctor, Chemist, or Chief Medical Officer, you can use chloral hydrate to non-lethally sedate unruly patients.
+tips-dataset-88 = Don't be afraid to ask for help, whether from your peers in character or through LOOC, or from admins!
+tips-dataset-89 = You'll quickly lose your interest in the game if you play to win and kill. If you find yourself doing this, take a step back and talk to people--it's a much better experience!
+tips-dataset-90 = If there's something you need from another department, try asking! This game isn't singleplayer and you'd be surprised what you can get accomplished together!
+tips-dataset-91 = The station's nuke is invincible. Go find the disk instead of trying to destroy it.
+tips-dataset-92 = Maintenance is full of equipment that is randomized every round. Look around and see if anything is worth using.
+tips-dataset-93 = We were all new once, be patient and guide new players, especially those playing intern roles, in the right direction.
+tips-dataset-94 = Firesuits, winter coats and emergency EVA suits offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all.
+tips-dataset-95 = In an emergency, you can always rely on firesuits and emergency EVA suits; they will always spawn in their respective lockers. They might be awkward to move around in, but can easily save your life in a dangerous situation.
+tips-dataset-96 = In an emergency, remember that you can craft improvised weapons! A baseball bat or spear could easily mean the difference between deterring an attacker or perishing from the hands of one.
+tips-dataset-97 = Spears can be tipped with chemicals, and will inject a few units every time you hit someone with them directly.
+tips-dataset-98 = You can make spears with reinforced glass, plasma glass, or uranium glass shards to enhance their damage.
+tips-dataset-99 = Thrown spears deal extra damage! Beware, however, as throwing them too much will end up breaking them.
+tips-dataset-100 = All forms of toxin damage are fairly difficult to treat, and usually involve the use of chemicals or other inconvenient methods. You can use this to your advantage in combat.
+tips-dataset-101 = You can throw crafted bolas at people to slow them down, letting you follow up on them for an easier kill or getaway.
+tips-dataset-102 = You can put napalm in a backpack water tank to make a flamethrower.
+tips-dataset-103 = Some jobs have alternate uniforms in their respective drobe vendors. Don't be afraid to try out a new look!
+tips-dataset-104 = Speed is almost everything in combat. Using hardsuits just for their armor is usually a terrible idea unless the resistances it provides are geared towards combat, or you're not planning to go head-first into the fray.
+tips-dataset-105 = Just because a job can't be a traitor at the beginning of a round doesn't mean that they'll never be a traitor.
+tips-dataset-106 = Syndicate gas masks will both provide welding protection and block flashes. Think twice before trying to flash a Nuclear Operative!
+tips-dataset-107 = Demoman takes skill.
+tips-dataset-108 = You can spray a fire extinguisher, throw items or fire a gun while floating through space to give yourself a minor boost. Simply fire opposite to where you want to go.
+tips-dataset-109 = You can drag other players onto yourself to open the strip menu, allowing you to remove their equipment or force them to wear something. Note that exosuits or helmets will block your access to the clothing beneath them, and that certain items take longer to strip or put on than others.
+tips-dataset-110 = You can climb onto a table by dragging yourself onto one.
+tips-dataset-111 = You can move an item out of the way by dragging it, and then holding CTRL + right click and moving your mouse into the direction you want it to go.
+tips-dataset-112 = When dealing with security, you can often get your sentence negated entirely through cooperation and deception.
+tips-dataset-113 = Fire can spread to other players through touch! Be careful around flaming bodies or large crowds with people on fire in them.
+tips-dataset-114 = Hull breaches take a few seconds to fully space an area. You can use this time to patch up the hole if you're confident enough, or just run away.
+tips-dataset-115 = Burn damage, such as that from a welding tool or lightbulb, can be used to cauterize wounds and stop bleeding.
+tips-dataset-116 = Bleeding is no joke! If you've been shot or acquired any other major injury, make sure to treat it quickly.
+tips-dataset-117 = In an emergency, you can butcher a jumpsuit with a sharp object to get cloth, which can be crafted into gauze.
+tips-dataset-118 = You can use sharp objects to butcher clothes or animals in the right click context menu. This includes glass shards.
+tips-dataset-119 = Most explosives have an adjustable timer that you can set in the right click menu. This includes grenade penguins!
+tips-dataset-120 = You can stun grenade penguins, which can bide valuable time for you to kill them.
+tips-dataset-121 = You can click on the names of items to pick them up in the right click menu, instead of hovering over the item and then selecting pick up.
+tips-dataset-122 = Space Station 14 is open source! If there's a change you want to make, or a simple item you want to add, then try contributing to the game. It's not as hard as you'd think it is.
+tips-dataset-123 = In a pinch, you can throw drinks or other reagent containers behind you to create a spill that can slip people chasing you.
+tips-dataset-124 = Some weapons, such as knives & shivs, have a fast attack speed.
+tips-dataset-125 = The jaws of life can be used to open powered doors.
+tips-dataset-126 = If you're not a human, you can drink blood to heal back some of your blood volume, albeit very inefficiently.
+tips-dataset-127 = If you're a human, don't drink blood! It makes you sick and you'll begin to take damage.
+tips-dataset-128 = There is a chemical metabolism limit that limits the amount of reagents of a certain type you can digest at once. Certain species have higher metabolism limits, such as slimes.
+tips-dataset-129 = Welding without proper eye protection can cause eye damage, which must be cured with oculine.
+tips-dataset-130 = Zombies are very vulnerable to heat damage, making welding tools and laser guns extremely effective against them.
+tips-dataset-131 = You can weld glass shards into glass sheets.
+tips-dataset-132 = By right clicking on a player, and then clicking the heart icon, you can quickly examine them to check for injuries or how badly they're bleeding. You can also do this to yourself.
+tips-dataset-133 = Monkeys and kobolds have a rare chance to be sentient. Ook!
+tips-dataset-134 = You can tell if an area with firelocks up is spaced by looking to see if the firelocks have lights beside them.
+tips-dataset-135 = Instead of picking it up, you can alt-click food to eat it. This also works for mice and other creatures without hands.
diff --git a/Resources/Locale/en-US/vending-machines/vending-machine.ftl b/Resources/Locale/en-US/vending-machines/vending-machine.ftl
index 637a9c7568..cb1dd3502f 100644
--- a/Resources/Locale/en-US/vending-machines/vending-machine.ftl
+++ b/Resources/Locale/en-US/vending-machines/vending-machine.ftl
@@ -1,3 +1,3 @@
-vending-machine-thanks = Thanks for using { $name }!
+vending-machine-thanks-1 = Thanks for using { $name }!
 vending-machine-flavor-left = Request refills at cargo
 vending-machine-flavor-right = v1.1
diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml
index cb7dc8e778..2db45c0308 100644
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
@@ -19143,35 +19143,6 @@ entities:
     - type: Transform
       pos: 13.450137,-7.468577
       parent: 30
-- proto: chem_master
-  entities:
-  - uid: 2470
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 30
-    - type: ContainerContainer
-      containers:
-        ChemMaster-beaker: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        beakerSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        outputSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: ChemDispenser
   entities:
   - uid: 2469
@@ -19204,6 +19175,35 @@ entities:
     - type: Transform
       pos: -3.5,-6.5
       parent: 30
+- proto: ChemMaster
+  entities:
+  - uid: 2470
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 30
+    - type: ContainerContainer
+      containers:
+        ChemMaster-beaker: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        beakerSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        outputSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: ChurchOrganInstrument
   entities:
   - uid: 1016
@@ -20881,10 +20881,10 @@ entities:
       parent: 30
 - proto: DefaultStationBeaconBridge
   entities:
-  - uid: 7515
+  - uid: 2719
     components:
     - type: Transform
-      pos: 32.5,2.5
+      pos: 38.5,2.5
       parent: 30
 - proto: DefaultStationBeaconBrig
   entities:
@@ -24002,8 +24002,6 @@ entities:
     - type: Transform
       pos: 33.5,0.5
       parent: 30
-    - type: ItemCabinet
-      opened: True
   - uid: 5936
     components:
     - type: Transform
@@ -41963,13 +41961,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -55.5,-1.5
       parent: 30
-  - uid: 2719
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 30
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 2920
     components:
     - type: Transform
@@ -42211,6 +42202,12 @@ entities:
     - type: Transform
       pos: -40.5,13.5
       parent: 30
+  - uid: 7515
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-14.5
+      parent: 30
   - uid: 7762
     components:
     - type: Transform
@@ -46055,7 +46052,7 @@ entities:
     - type: Transform
       pos: 23.41242,-1.4073458
       parent: 30
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 5622
     components:
@@ -47216,6 +47213,38 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: HoP Line
+  - uid: 8512
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,9.5
+      parent: 30
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: ce's room
+  - uid: 8513
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,22.5
+      parent: 30
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: hos' room
+  - uid: 8514
+    components:
+    - type: Transform
+      pos: -27.5,19.5
+      parent: 30
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: qm's room
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 574
@@ -54904,10 +54933,10 @@ entities:
   - uid: 7579
     components:
     - type: Transform
-      pos: 32.5,2.5
+      pos: 38.5,2.5
       parent: 30
     - type: WarpPoint
-      location: bridge
+      location: Bridge
   - uid: 7580
     components:
     - type: Transform
diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index ff45f58110..b94e800e41 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -28,10 +28,12 @@ tilemap:
   56: FloorGreenCircuit
   59: FloorHullReinforced
   60: FloorHydro
+  3: FloorJungleAstroGrass
   64: FloorLino
   66: FloorMetalDiamond
   67: FloorMime
   69: FloorMiningDark
+  4: FloorMowedAstroGrass
   78: FloorRGlass
   79: FloorReinforced
   91: FloorSnow
@@ -79,139 +81,139 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: DgAAAAABDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAAADgAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAABDgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAABegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAA
+          tiles: DgAAAAADDgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAADDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: bAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAABXQAAAAAAXQAAAAABaAAAAAABbAAAAAAAbAAAAAAAXQAAAAACaAAAAAADJAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADaAAAAAADJAAAAAADJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADXQAAAAABXQAAAAAAaAAAAAADbAAAAAAAbAAAAAAAXQAAAAAAaAAAAAAAJAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABaAAAAAABJAAAAAADJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: fgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAAAaAAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAJAAAAAADJAAAAAAAJAAAAAABXQAAAAABJAAAAAACXQAAAAACXQAAAAABaAAAAAADXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAADfgAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAABaAAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABaAAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAJAAAAAACJAAAAAACJAAAAAADXQAAAAACJAAAAAADXQAAAAABXQAAAAAAaAAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAADfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: XQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACaAAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADaAAAAAAAaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAABaAAAAAABaAAAAAACTgAAAAADTgAAAAAAaAAAAAADTgAAAAABTgAAAAABaAAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAHwAAAAADfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAaAAAAAACaAAAAAABXQAAAAAAXQAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABXQAAAAACfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfgAAAAAAaAAAAAACaAAAAAAAXQAAAAADJAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAABTgAAAAAATgAAAAADTgAAAAAAXQAAAAAAXQAAAAAATgAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAXQAAAAAAJAAAAAADJAAAAAACJAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAXQAAAAAAaAAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAADXQAAAAAC
+          tiles: XQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAAAaAAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABaAAAAAAAaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAABaAAAAAACTgAAAAAATgAAAAABaAAAAAABTgAAAAABTgAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAaAAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAACaAAAAAADXQAAAAACXQAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAAAJAAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACXQAAAAACTgAAAAACTgAAAAABTgAAAAABXQAAAAAAXQAAAAACTgAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAAAJAAAAAADJAAAAAADJAAAAAADfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABXQAAAAACaAAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAC
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: aAAAAAADaAAAAAADXQAAAAADXQAAAAACaAAAAAABXQAAAAAAXQAAAAADXQAAAAAAaAAAAAAAXQAAAAADaAAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAATgAAAAAATgAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAaAAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAADJAAAAAAAJAAAAAABJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAADegAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACJAAAAAACfgAAAAAAHwAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAegAAAAADegAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADJAAAAAADJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAHwAAAAACfgAAAAAAHwAAAAADJAAAAAADJAAAAAADJAAAAAADJAAAAAADXQAAAAADXQAAAAAAJAAAAAADfgAAAAAAJAAAAAAAaAAAAAADaAAAAAADaAAAAAABXQAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAATgAAAAADTgAAAAADJAAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAADXQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAACaAAAAAABXQAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAXQAAAAADXQAAAAADaAAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAABXQAAAAACHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAXQAAAAADXQAAAAADaAAAAAADHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABXQAAAAADfgAAAAAAJAAAAAACJAAAAAABJAAAAAAAXQAAAAABXQAAAAAAaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABfgAAAAAAJAAAAAACHwAAAAACHwAAAAABXQAAAAADXQAAAAAAaAAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAADXQAAAAACXQAAAAACaAAAAAAD
+          tiles: aAAAAAADaAAAAAAAXQAAAAAAXQAAAAADaAAAAAAAXQAAAAADXQAAAAAAXQAAAAACaAAAAAADXQAAAAABaAAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABTgAAAAABTgAAAAAAaAAAAAADaAAAAAADaAAAAAADaAAAAAAAaAAAAAACaAAAAAADaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAAAJAAAAAABJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAAAegAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACegAAAAACegAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABaAAAAAABXQAAAAACHwAAAAABfgAAAAAAHwAAAAAAJAAAAAABJAAAAAADJAAAAAAAJAAAAAAAXQAAAAAAXQAAAAACJAAAAAACfgAAAAAAJAAAAAAAaAAAAAACaAAAAAADaAAAAAAAXQAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAATgAAAAABTgAAAAACJAAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACXQAAAAAAXQAAAAABXQAAAAADaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAACXQAAAAADHwAAAAADHwAAAAADHwAAAAADHwAAAAACXQAAAAADXQAAAAAAaAAAAAACXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACaAAAAAAAXQAAAAACHwAAAAABHwAAAAACfgAAAAAAHwAAAAADXQAAAAADXQAAAAACaAAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAADXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACXQAAAAAAXQAAAAABaAAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAXQAAAAABXQAAAAACaAAAAAADXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAACXQAAAAAAXQAAAAABaAAAAAAC
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: XQAAAAABXQAAAAACaAAAAAADXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAHwAAAAACaAAAAAACaAAAAAACaAAAAAAAaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAABHwAAAAADfgAAAAAAHwAAAAADJAAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAHwAAAAABaAAAAAACaAAAAAACaAAAAAADXQAAAAAAaAAAAAABHwAAAAAAHwAAAAACHwAAAAABJAAAAAACHwAAAAABfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAHwAAAAACaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAABHwAAAAACfgAAAAAAHwAAAAAAJAAAAAACHwAAAAADfgAAAAAAaAAAAAACaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAADHwAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACJAAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAAAaAAAAAADaAAAAAABXQAAAAAAfgAAAAAAHwAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAACJAAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAHwAAAAABfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAaAAAAAAAXQAAAAACaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAADfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
+          tiles: XQAAAAACXQAAAAACaAAAAAAAXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAADHwAAAAACfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAHwAAAAACfgAAAAAAHwAAAAABJAAAAAADHwAAAAADfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAHwAAAAAAaAAAAAABaAAAAAAAaAAAAAAAXQAAAAABaAAAAAAAHwAAAAAAHwAAAAACHwAAAAACJAAAAAAAHwAAAAABfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAHwAAAAABaAAAAAAAaAAAAAABaAAAAAABaAAAAAABaAAAAAADHwAAAAADfgAAAAAAHwAAAAACJAAAAAABHwAAAAABfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAABHwAAAAABfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAJAAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAJAAAAAACHwAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAACHwAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAXQAAAAABfgAAAAAAHwAAAAABHwAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAABJAAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAHwAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAA
           version: 6
         -2,-2:
           ind: -2,-2
-          tiles: EgAAAAACXQAAAAADegAAAAABegAAAAACXQAAAAADfgAAAAAAJAAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAEgAAAAACXQAAAAAAegAAAAAAegAAAAAAXQAAAAACfgAAAAAAXQAAAAACTgAAAAAATgAAAAAAaAAAAAACTgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADEgAAAAAAXQAAAAACegAAAAAAegAAAAABXQAAAAADfgAAAAAAXQAAAAABTgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACaAAAAAADXQAAAAAAXQAAAAAAXQAAAAADEgAAAAADXQAAAAAAegAAAAABegAAAAADXQAAAAACaAAAAAAAXQAAAAADaAAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACEgAAAAAAXQAAAAACegAAAAABegAAAAABXQAAAAAAaAAAAAACXQAAAAACTgAAAAAAXQAAAAABXQAAAAAAaAAAAAADHwAAAAADHwAAAAAAJgAAAAADJgAAAAABJgAAAAAAEgAAAAACXQAAAAABegAAAAADegAAAAABXQAAAAABfgAAAAAAXQAAAAAATgAAAAACXQAAAAACXQAAAAADaAAAAAADHwAAAAADHwAAAAABTgAAAAABTgAAAAAATgAAAAABXQAAAAACXQAAAAABKAAAAAACKAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAXQAAAAADaAAAAAACHwAAAAADHwAAAAAAJgAAAAABJgAAAAAAJgAAAAABKAAAAAAAKAAAAAADKAAAAAAAKAAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAADaAAAAAABXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAADfgAAAAAAegAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAACegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACegAAAAACegAAAAADegAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAegAAAAACegAAAAACegAAAAABegAAAAAAegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAA
+          tiles: EgAAAAAAXQAAAAAAegAAAAADegAAAAACXQAAAAAAfgAAAAAAJAAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAaAAAAAABXQAAAAABXQAAAAACXQAAAAACEgAAAAACXQAAAAADegAAAAACegAAAAAAXQAAAAABfgAAAAAAXQAAAAABTgAAAAACTgAAAAAAaAAAAAAATgAAAAAAaAAAAAACaAAAAAABaAAAAAACaAAAAAABaAAAAAACEgAAAAADXQAAAAACegAAAAABegAAAAABXQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAaAAAAAABXQAAAAADXQAAAAABXQAAAAACEgAAAAADXQAAAAACegAAAAADegAAAAADXQAAAAACaAAAAAADXQAAAAACaAAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAEgAAAAABXQAAAAADegAAAAACegAAAAACXQAAAAABaAAAAAACXQAAAAACTgAAAAAAXQAAAAACXQAAAAABaAAAAAADHwAAAAADHwAAAAADJgAAAAADJgAAAAABJgAAAAAAEgAAAAADXQAAAAACegAAAAACegAAAAADXQAAAAABfgAAAAAAXQAAAAAATgAAAAABXQAAAAAAXQAAAAAAaAAAAAADHwAAAAAAHwAAAAADTgAAAAACTgAAAAACTgAAAAADXQAAAAAAXQAAAAADKAAAAAAAKAAAAAACXQAAAAABfgAAAAAAXQAAAAABaAAAAAABXQAAAAABXQAAAAABaAAAAAACHwAAAAADHwAAAAADJgAAAAABJgAAAAADJgAAAAACKAAAAAACKAAAAAADKAAAAAAAKAAAAAAAXQAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABaAAAAAABXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAADegAAAAABegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACegAAAAACegAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACegAAAAAAegAAAAACegAAAAACegAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: egAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAACaAAAAAABXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAegAAAAACegAAAAACegAAAAACewAAAAACewAAAAABfgAAAAAATgAAAAACTgAAAAABKAAAAAACTgAAAAADTgAAAAAAaAAAAAACXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAADewAAAAAAewAAAAABbAAAAAAATgAAAAABTgAAAAACKAAAAAAATgAAAAAATgAAAAABaAAAAAABXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADewAAAAACewAAAAACfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAADaAAAAAACXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAABewAAAAAAewAAAAADfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAewAAAAACewAAAAACewAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAADKAAAAAACKAAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAADXQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACQAAAAAAAQAAAAAAAXQAAAAABfgAAAAAAKAAAAAAAKAAAAAACKAAAAAACfgAAAAAAXQAAAAABXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAABXwAAAAABJAAAAAADXwAAAAADXwAAAAAAXwAAAAABXwAAAAAAXQAAAAADXQAAAAABXQAAAAADaAAAAAACegAAAAABegAAAAADegAAAAADegAAAAABegAAAAAAHwAAAAADHwAAAAABXwAAAAADHwAAAAACHwAAAAABHwAAAAADHwAAAAADXQAAAAACXQAAAAADXQAAAAACaAAAAAABegAAAAACegAAAAAAegAAAAADegAAAAADegAAAAABHwAAAAABHwAAAAAAXwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADXQAAAAADXQAAAAABXQAAAAADaAAAAAACegAAAAADegAAAAADegAAAAABegAAAAABegAAAAACHwAAAAACHwAAAAADXwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAABaAAAAAABegAAAAACegAAAAADegAAAAAAegAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACaAAAAAABegAAAAABegAAAAAAegAAAAACegAAAAADegAAAAAD
+          tiles: egAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAADaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAegAAAAAAegAAAAABegAAAAADewAAAAACewAAAAABfgAAAAAATgAAAAACTgAAAAACKAAAAAACTgAAAAABTgAAAAACaAAAAAADXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABewAAAAABewAAAAADbAAAAAAATgAAAAAATgAAAAABKAAAAAAATgAAAAABTgAAAAACaAAAAAABXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAACewAAAAADewAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAACegAAAAABaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAABewAAAAADewAAAAACfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAewAAAAACewAAAAAAewAAAAACfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAABQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAABKAAAAAACKAAAAAABfgAAAAAAXQAAAAABaAAAAAACaAAAAAABXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAQAAAAAAAQAAAAAAAXQAAAAACfgAAAAAAKAAAAAACKAAAAAACKAAAAAAAfgAAAAAAXQAAAAABXQAAAAABaAAAAAADXQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAABQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAAAaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAACXwAAAAABJAAAAAAAXwAAAAADXwAAAAACXwAAAAADXwAAAAACXQAAAAAAXQAAAAABXQAAAAAAaAAAAAADegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAADHwAAAAAAHwAAAAAAXwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABXQAAAAABXQAAAAADXQAAAAAAaAAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAACHwAAAAACHwAAAAACXwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAACegAAAAADegAAAAAAegAAAAABegAAAAABegAAAAADHwAAAAAAHwAAAAADXwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACXQAAAAABXQAAAAADXQAAAAABaAAAAAACegAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAaAAAAAACegAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAD
           version: 6
         1,0:
           ind: 1,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAaAAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAABTgAAAAACaAAAAAADaAAAAAACbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAXQAAAAABXQAAAAACJAAAAAAAJAAAAAAAJAAAAAABXQAAAAACXQAAAAACaAAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABfgAAAAAAJAAAAAAAJAAAAAADJAAAAAABXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAJAAAAAAAJAAAAAABJAAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAJAAAAAACJAAAAAABJAAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADaAAAAAAAaAAAAAAAfgAAAAAAaAAAAAADaAAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADaAAAAAAAaAAAAAAAHQAAAAADaAAAAAAAaAAAAAABXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACaAAAAAAAaAAAAAAAXQAAAAAAaAAAAAADaAAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADaAAAAAABaAAAAAAAXQAAAAADaAAAAAAAaAAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADaAAAAAABaAAAAAADfgAAAAAAaAAAAAADaAAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAC
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAADaAAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABTgAAAAAATgAAAAADaAAAAAADaAAAAAADbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAABaAAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAADXQAAAAACXQAAAAACXQAAAAABJAAAAAABJAAAAAACJAAAAAACXQAAAAACXQAAAAAAaAAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAADXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAJAAAAAABJAAAAAADJAAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABaAAAAAADaAAAAAADfgAAAAAAaAAAAAABaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADaAAAAAACaAAAAAACHQAAAAAAaAAAAAACaAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABaAAAAAACaAAAAAAAXQAAAAAAaAAAAAACaAAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACaAAAAAADaAAAAAADXQAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADaAAAAAACaAAAAAACfgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAA
           version: 6
         2,-2:
           ind: 2,-2
-          tiles: HwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAewAAAAACfgAAAAAAewAAAAABHwAAAAABHwAAAAABMwAAAAAAHwAAAAACHwAAAAACewAAAAABfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACewAAAAADewAAAAACewAAAAABHwAAAAADHwAAAAADMwAAAAAAHwAAAAADHwAAAAABewAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAACewAAAAACfgAAAAAAewAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAACewAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAADewAAAAAAewAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADXQAAAAAAegAAAAABegAAAAABegAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABXQAAAAADXQAAAAABegAAAAACJAAAAAABfgAAAAAAHwAAAAABXQAAAAAAXQAAAAACXQAAAAABegAAAAADegAAAAABegAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABTgAAAAABTgAAAAACaAAAAAACTgAAAAADTgAAAAADaAAAAAAAaAAAAAACTgAAAAACaAAAAAADTgAAAAACTgAAAAAATgAAAAADaAAAAAADTgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAACaAAAAAACXQAAAAADXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: HwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABewAAAAABfgAAAAAAewAAAAABHwAAAAACHwAAAAAAMwAAAAAAHwAAAAAAHwAAAAAAewAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAACewAAAAACewAAAAACewAAAAACHwAAAAACHwAAAAACMwAAAAAAHwAAAAACHwAAAAADewAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAADewAAAAAAfgAAAAAAewAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAABewAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADewAAAAACewAAAAABewAAAAACewAAAAACewAAAAAAewAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACXQAAAAAAegAAAAAAegAAAAAAegAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABXQAAAAACXQAAAAABegAAAAABJAAAAAADfgAAAAAAHwAAAAABXQAAAAACXQAAAAACXQAAAAAAegAAAAAAegAAAAACegAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAcAAAAAADcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAaAAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAaAAAAAABXQAAAAAATgAAAAADTgAAAAABaAAAAAACTgAAAAACTgAAAAACaAAAAAABaAAAAAADTgAAAAACaAAAAAABTgAAAAACTgAAAAABTgAAAAADaAAAAAADTgAAAAAAaAAAAAADaAAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABaAAAAAADXQAAAAACXQAAAAACXQAAAAABaAAAAAABXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         2,-1:
           ind: 2,-1
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAdQAAAAACdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAdQAAAAACdQAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAfgAAAAAAdQAAAAADdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAdQAAAAABdQAAAAADcAAAAAADJAAAAAADJAAAAAABJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAdQAAAAABdQAAAAACcAAAAAAC
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAADaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAdQAAAAABdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAdQAAAAABdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAdQAAAAABdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAACfgAAAAAAdQAAAAAAdQAAAAACcAAAAAACJAAAAAABJAAAAAACJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAACfgAAAAAAdQAAAAABdQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAABfgAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAdQAAAAACdQAAAAAAcAAAAAAD
           version: 6
         -2,0:
           ind: -2,0
-          tiles: aAAAAAACaAAAAAACaAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAaAAAAAABegAAAAACegAAAAABegAAAAACegAAAAAAegAAAAADaAAAAAADaAAAAAACXwAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAABaAAAAAACegAAAAACegAAAAABegAAAAABegAAAAABegAAAAABaAAAAAAAaAAAAAADXwAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAegAAAAABegAAAAABegAAAAABegAAAAABegAAAAABaAAAAAACaAAAAAAAaAAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADaAAAAAABegAAAAACegAAAAAAegAAAAACegAAAAABegAAAAADewAAAAAAewAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADMwAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAAAXQAAAAABXQAAAAAAXQAAAAABHwAAAAAAewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAACXQAAAAAAXQAAAAAAMwAAAAAAegAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAJAAAAAADHwAAAAABHwAAAAADewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAABXQAAAAACXQAAAAABMwAAAAAAegAAAAAAJAAAAAACJAAAAAACJAAAAAABfgAAAAAAJAAAAAADHwAAAAAAHwAAAAACewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAADXQAAAAAAMwAAAAAAegAAAAACJAAAAAABJAAAAAABJAAAAAACfgAAAAAAJAAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAADaAAAAAACaAAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAAAaAAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAeQAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAAAXQAAAAAAXQAAAAABXQAAAAABaAAAAAAAXQAAAAADeQAAAAACeQAAAAAAeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADLgAAAAAALgAAAAAAAQAAAAAAaAAAAAAAaAAAAAAAAQAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAJAAAAAABeQAAAAACeQAAAAACeQAAAAABeQAAAAACfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAAAXQAAAAADXQAAAAABaAAAAAADXQAAAAADXQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAfgAAAAAALgAAAAAAXQAAAAAAXQAAAAAAPAAAAAAAAQAAAAAAXQAAAAABXQAAAAADaAAAAAADXQAAAAADXQAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAABfgAAAAAAfgAAAAAA
+          tiles: aAAAAAABaAAAAAADaAAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACegAAAAABegAAAAABegAAAAADegAAAAABegAAAAACaAAAAAACaAAAAAAAXwAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAADegAAAAAAaAAAAAABaAAAAAAAXwAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAABegAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACaAAAAAACegAAAAAAegAAAAACegAAAAACegAAAAAAegAAAAACewAAAAABewAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAAwAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACXQAAAAADXQAAAAAAXQAAAAABHwAAAAACewAAAAACAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAADXQAAAAABAwAAAAAAegAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAJAAAAAACHwAAAAACHwAAAAACewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAAAXQAAAAABAwAAAAAAegAAAAAAJAAAAAADJAAAAAACJAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAABewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAABXQAAAAADAwAAAAAAegAAAAACJAAAAAACJAAAAAABJAAAAAACfgAAAAAAJAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAACaAAAAAACaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAAAaAAAAAACaAAAAAABaAAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAeQAAAAAAeQAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACXQAAAAACXQAAAAABXQAAAAAAaAAAAAABXQAAAAACeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADeQAAAAAAeQAAAAACLgAAAAAALgAAAAAAAQAAAAABaAAAAAAAaAAAAAABAQAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAJAAAAAACeQAAAAACeQAAAAACeQAAAAABeQAAAAACfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAACXQAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAADfgAAAAAALgAAAAAAXQAAAAACXQAAAAACPAAAAAAAAQAAAAABXQAAAAACXQAAAAACaAAAAAADXQAAAAABXQAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAADfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAABfgAAAAAAfgAAAAAA
           version: 6
         1,-3:
           ind: 1,-3
-          tiles: bQAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAJAAAAAACJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAABJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACJAAAAAABJAAAAAACJAAAAAADJAAAAAADfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAJAAAAAABfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAACXQAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAACHwAAAAACfgAAAAAAHwAAAAACTgAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAACXQAAAAABfgAAAAAAHwAAAAACaAAAAAADaAAAAAAAaAAAAAABaAAAAAAAaAAAAAACHwAAAAACfgAAAAAAHwAAAAAC
+          tiles: bQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABJAAAAAADJAAAAAABJAAAAAAAJAAAAAABfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAABJAAAAAAAJAAAAAACJAAAAAAAJAAAAAABJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACJAAAAAABJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAJAAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAABXQAAAAADaAAAAAADXQAAAAABXQAAAAADXQAAAAABfgAAAAAAHwAAAAABaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAHwAAAAACfgAAAAAAHwAAAAADTgAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAADXQAAAAABfgAAAAAAHwAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAADaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAA
           version: 6
         0,-3:
           ind: 0,-3
-          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADJAAAAAACJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABaAAAAAAAaAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADaAAAAAACaAAAAAACJAAAAAADfgAAAAAAXQAAAAAAXQAAAAACHwAAAAADHwAAAAAAHwAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABaAAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADaAAAAAADaAAAAAADaAAAAAADaAAAAAABTgAAAAABaAAAAAAATgAAAAACaAAAAAAB
+          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADJAAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABaAAAAAAAaAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACaAAAAAACaAAAAAADJAAAAAABfgAAAAAAXQAAAAABXQAAAAABHwAAAAADHwAAAAADHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAACHwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACaAAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAADaAAAAAABTgAAAAADaAAAAAACTgAAAAABaAAAAAAA
           version: 6
         1,1:
           ind: 1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAACJAAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAXQAAAAACaAAAAAAAaAAAAAADaAAAAAACXQAAAAABaAAAAAABaAAAAAAAaAAAAAACaAAAAAAAaAAAAAACXQAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAACaAAAAAACXQAAAAADaAAAAAACaAAAAAADaAAAAAACXQAAAAABXQAAAAADaAAAAAABXQAAAAACXQAAAAACXQAAAAAAJAAAAAACfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAAAXQAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACdQAAAAADdAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADJAAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAXQAAAAADXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAXQAAAAADaAAAAAADaAAAAAACaAAAAAABXQAAAAAAaAAAAAAAaAAAAAADaAAAAAADXQAAAAADaAAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAACXQAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAAAaAAAAAAAXQAAAAAAaAAAAAABaAAAAAADaAAAAAACXQAAAAADXQAAAAACaAAAAAACXQAAAAABXQAAAAAAXQAAAAABJAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAACaAAAAAADXQAAAAABaAAAAAABaAAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABdQAAAAABdAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,1:
           ind: 0,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAADaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAAAaAAAAAACaAAAAAADXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAAAcAAAAAADcAAAAAADdQAAAAAAdAAAAAAAdAAAAAAAdAAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABcAAAAAACdQAAAAABdAAAAAACdAAAAAAAdAAAAAACfgAAAAAAXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAABdAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdQAAAAACdQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAACcAAAAAAAaAAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADaAAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAaAAAAAACaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAAAaAAAAAADXQAAAAACXQAAAAACXQAAAAAAaAAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAACcAAAAAAAcAAAAAAAdQAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAAAcAAAAAAAdQAAAAACdAAAAAABdAAAAAADdAAAAAADfgAAAAAAXQAAAAAAXQAAAAABHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAABdAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAAAdQAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAABcAAAAAABaAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
           version: 6
         -1,1:
           ind: -1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABaAAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADaAAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAADaAAAAAABaAAAAAACaAAAAAABaAAAAAADaAAAAAABTgAAAAADTgAAAAABaAAAAAACTgAAAAACTgAAAAABaAAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABaAAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAABHwAAAAACHwAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAHwAAAAABHwAAAAACXQAAAAACfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAACJAAAAAADJAAAAAACXQAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAABTgAAAAADTgAAAAAAHwAAAAACTgAAAAABTgAAAAADTgAAAAADHwAAAAAATgAAAAACTgAAAAABHwAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABJAAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAABJAAAAAACJAAAAAABfgAAAAAAXQAAAAABXQAAAAACXQAAAAAC
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAABTgAAAAADTgAAAAABaAAAAAADTgAAAAABTgAAAAABaAAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABaAAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABHwAAAAADHwAAAAAAXQAAAAACfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXQAAAAADJAAAAAACJAAAAAAAXQAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAATgAAAAADTgAAAAACHwAAAAACTgAAAAAATgAAAAAATgAAAAABHwAAAAAATgAAAAADTgAAAAACHwAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAJAAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADJAAAAAADJAAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAAD
           version: 6
         -2,1:
           ind: -2,1
-          tiles: AQAAAAAAAQAAAAAAAQAAAAAAJAAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABKAAAAAADKAAAAAACKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABXwAAAAADXwAAAAAAXwAAAAACXwAAAAADXwAAAAADXwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAaAAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAADaAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAABXwAAAAADXwAAAAACXwAAAAAAXwAAAAADXwAAAAAAXwAAAAACaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABJAAAAAABKAAAAAACKAAAAAADKAAAAAACKAAAAAACKAAAAAABKAAAAAACXQAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAABbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAC
+          tiles: AQAAAAADAQAAAAAAAQAAAAADJAAAAAADfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAADfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAACKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABXwAAAAAAXwAAAAADXwAAAAAAXwAAAAAAXwAAAAADXwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAADaAAAAAACaAAAAAADaAAAAAADaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAABXwAAAAACXwAAAAACXwAAAAAAXwAAAAACXwAAAAADXwAAAAABaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACJAAAAAACKAAAAAADKAAAAAADKAAAAAADKAAAAAADKAAAAAACKAAAAAADXQAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAegAAAAABegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADegAAAAADegAAAAADegAAAAABbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAC
           version: 6
         -1,-3:
           ind: -1,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
           version: 6
         2,-3:
           ind: 2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAAAJAAAAAACJAAAAAAAJAAAAAACJAAAAAABJAAAAAADJAAAAAABJAAAAAABJAAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAAAJAAAAAACJgAAAAADJgAAAAACJgAAAAABJgAAAAABJgAAAAAAJgAAAAAAJgAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAACJAAAAAACJAAAAAABJAAAAAABJgAAAAAAJgAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAABJgAAAAABJgAAAAADJAAAAAABJAAAAAADJAAAAAABJgAAAAADJgAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADJgAAAAACJgAAAAACJAAAAAABHwAAAAAAHwAAAAACJAAAAAABJAAAAAADHwAAAAAAHwAAAAABJAAAAAAAJAAAAAACJAAAAAACJAAAAAADJAAAAAAAHwAAAAADHwAAAAAAJAAAAAABJAAAAAABHwAAAAACHwAAAAABHwAAAAAAJgAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAACJgAAAAADHwAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAADJAAAAAADJAAAAAABJAAAAAAAJAAAAAACJAAAAAAAJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAADJAAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAADJAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAADJAAAAAACJAAAAAABJAAAAAAAJAAAAAADJAAAAAACJAAAAAACJgAAAAACJgAAAAADJgAAAAACJgAAAAACJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAABJgAAAAACJgAAAAADJgAAAAACJgAAAAABJAAAAAAAJAAAAAABJAAAAAABJgAAAAAAJgAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAJgAAAAADJgAAAAAAJAAAAAADJAAAAAADJAAAAAAAJgAAAAAAJgAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAACHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAABJgAAAAAAJgAAAAACJAAAAAABHwAAAAABHwAAAAAAJAAAAAAAJAAAAAABHwAAAAABHwAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAHwAAAAABHwAAAAACJAAAAAADJAAAAAABHwAAAAAAHwAAAAADHwAAAAACJgAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAABJgAAAAABHwAAAAAA
           version: 6
         3,-2:
           ind: 3,-2
-          tiles: HwAAAAACHwAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADHwAAAAABHwAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAACHwAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAaAAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAADXQAAAAAAaAAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAJAAAAAABfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAAAXQAAAAACXQAAAAACJAAAAAADfgAAAAAAXQAAAAAATgAAAAAATgAAAAACaAAAAAAATgAAAAAATgAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAB
+          tiles: HwAAAAACHwAAAAADfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAHwAAAAACHwAAAAABfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABHwAAAAADHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAABHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAAAXQAAAAAAaAAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAACJAAAAAADfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAAAXQAAAAACXQAAAAABJAAAAAAAfgAAAAAAXQAAAAAATgAAAAABTgAAAAADaAAAAAABTgAAAAABTgAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAAB
           version: 6
         3,-3:
           ind: 3,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAHCwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAABBwAAAAABJAAAAAACJAAAAAABfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAACJAAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAABHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAACJAAAAAADfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAACHwAAAAADOAAAAAAAHwAAAAACOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAACHwAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAALCwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAGJAAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAEBwAAAAAHJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAACJAAAAAADfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAADJAAAAAADHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACHwAAAAACOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAAAJAAAAAADfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAAAHwAAAAABOAAAAAAAHwAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAC
           version: 6
         -2,-3:
           ind: -2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABJAAAAAADfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAABKAAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAABegAAAAACegAAAAADfgAAAAAAfgAAAAAAewAAAAAAewAAAAABfgAAAAAAegAAAAAAegAAAAABegAAAAAAKAAAAAAAKAAAAAABKAAAAAABKAAAAAACKAAAAAADKAAAAAABKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAewAAAAABewAAAAACfgAAAAAAegAAAAADegAAAAADegAAAAADKAAAAAADKAAAAAABKAAAAAABKAAAAAAAKAAAAAABKAAAAAACKAAAAAAAKAAAAAADfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAAAKAAAAAAAKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAABegAAAAABJAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAACKAAAAAAAKAAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAKAAAAAADKAAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADJAAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAKAAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAABegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAegAAAAABegAAAAADegAAAAABKAAAAAABKAAAAAACKAAAAAACKAAAAAACKAAAAAABKAAAAAABKAAAAAAAKAAAAAACfgAAAAAAfgAAAAAAewAAAAAAewAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAKAAAAAADKAAAAAADKAAAAAACKAAAAAACKAAAAAADKAAAAAABKAAAAAABKAAAAAACfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAADKAAAAAAAKAAAAAADKAAAAAACKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAADegAAAAABegAAAAACegAAAAABegAAAAADJAAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAABKAAAAAADKAAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABKAAAAAADKAAAAAADXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
           version: 6
         -3,-1:
           ind: -3,-1
-          tiles: HwAAAAABfgAAAAAAewAAAAABewAAAAACewAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAADegAAAAAAegAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAATgAAAAAATgAAAAADKAAAAAABTgAAAAAATgAAAAACKAAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAATgAAAAACTgAAAAABKAAAAAADTgAAAAABTgAAAAACKAAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAACfgAAAAAAewAAAAADewAAAAAAewAAAAAAfgAAAAAAaAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAABZQAAAAAAfgAAAAAAKAAAAAADKAAAAAADKAAAAAABfgAAAAAAaAAAAAAAKAAAAAABMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAACZQAAAAAAfgAAAAAAKAAAAAAAKAAAAAABKAAAAAABfgAAAAAAXQAAAAADXQAAAAADMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXwAAAAAAXwAAAAADXwAAAAAAXwAAAAADXwAAAAACJAAAAAAAXwAAAAABXwAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAABXwAAAAAAHwAAAAADHwAAAAABJAAAAAACJAAAAAACJAAAAAABJAAAAAABJAAAAAADXQAAAAADXQAAAAABfgAAAAAAXwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACXwAAAAABHwAAAAAAHwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAACfgAAAAAAXwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAADXwAAAAABHwAAAAAAHwAAAAAAJAAAAAADJAAAAAACJAAAAAADJAAAAAABJAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAC
+          tiles: HwAAAAABfgAAAAAAewAAAAABewAAAAABewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAABegAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABTgAAAAABTgAAAAACKAAAAAABTgAAAAAATgAAAAABKAAAAAACHwAAAAACfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACTgAAAAAATgAAAAAAKAAAAAAATgAAAAAATgAAAAAAKAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAACegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAAAZQAAAAADfgAAAAAAewAAAAAAewAAAAABewAAAAAAfgAAAAAAaAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAAAZQAAAAABfgAAAAAAKAAAAAABKAAAAAACKAAAAAACfgAAAAAAaAAAAAAAKAAAAAABBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAAAZQAAAAADfgAAAAAAKAAAAAADKAAAAAADKAAAAAACfgAAAAAAXQAAAAADXQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAXwAAAAACXwAAAAAAXwAAAAAAXwAAAAABXwAAAAACJAAAAAAAXwAAAAAAXwAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAADXwAAAAAAHwAAAAAAHwAAAAADJAAAAAAAJAAAAAADJAAAAAACJAAAAAADJAAAAAAAXQAAAAADXQAAAAABfgAAAAAAXwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABXwAAAAACHwAAAAACHwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAABfgAAAAAAXwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAACXwAAAAADHwAAAAAAHwAAAAACJAAAAAACJAAAAAAAJAAAAAABJAAAAAACJAAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAD
           version: 6
         -3,0:
           ind: -3,0
-          tiles: ZQAAAAAAZQAAAAACZQAAAAADZQAAAAAAZQAAAAAAXQAAAAADaAAAAAABaAAAAAADXQAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAXQAAAAADTgAAAAAATgAAAAABaAAAAAAATgAAAAAATgAAAAACaAAAAAACaAAAAAAAaAAAAAACXQAAAAACXQAAAAAAXwAAAAACaAAAAAACaAAAAAADaAAAAAAAXwAAAAAAaAAAAAAAZQAAAAACZQAAAAACZQAAAAAAZQAAAAAAZQAAAAADXQAAAAADaAAAAAABaAAAAAABXQAAAAACXQAAAAACXwAAAAAAaAAAAAACaAAAAAACaAAAAAADXwAAAAABaAAAAAACJAAAAAACJAAAAAABJAAAAAADJAAAAAACJAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAABMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABewAAAAADewAAAAACewAAAAAAewAAAAACewAAAAADJAAAAAADJAAAAAABJAAAAAADJAAAAAACJAAAAAAAXQAAAAADXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAADHwAAAAADHwAAAAABHwAAAAACHwAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAADHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAewAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAgAAAAAAJAAAAAABJAAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAewAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAQAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAPAAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAAAPAAAAAAAPAAAAAAA
+          tiles: ZQAAAAABZQAAAAADZQAAAAAAZQAAAAACZQAAAAADXQAAAAADaAAAAAAAaAAAAAABXQAAAAACXQAAAAABaAAAAAADaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAXQAAAAAATgAAAAACTgAAAAABaAAAAAABTgAAAAADTgAAAAABaAAAAAAAaAAAAAABaAAAAAACXQAAAAABXQAAAAAAXwAAAAADaAAAAAADaAAAAAABaAAAAAAAXwAAAAAAaAAAAAAAZQAAAAAAZQAAAAAAZQAAAAADZQAAAAADZQAAAAABXQAAAAABaAAAAAACaAAAAAABXQAAAAAAXQAAAAAAXwAAAAACaAAAAAACaAAAAAAAaAAAAAACXwAAAAAAaAAAAAACJAAAAAACJAAAAAACJAAAAAACJAAAAAADJAAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAADXQAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAACewAAAAABJAAAAAABJAAAAAACJAAAAAAAJAAAAAADJAAAAAADXQAAAAADXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAABJAAAAAABJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAACHwAAAAABHwAAAAADbAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAAAewAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAACAgAAAAAAJAAAAAADJAAAAAADHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAABewAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAAgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAADPAAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAADPAAAAAAAPAAAAAAA
           version: 6
         -3,1:
           ind: -3,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAGgQAAAAAAegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAADegAAAAADfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAABgQAAAAAAgQAAAAAAgQAAAAAAggAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAAAfgAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAADfgAAAAAAgQAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAACegAAAAADegAAAAABfgAAAAAAegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAADegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAADgQAAAAAAegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAAGegAAAAADfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAACgQAAAAAAgQAAAAAAgQAAAAAAggAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAABgQAAAAAAFQAAAAADfgAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAAEfgAAAAAAgQAAAAAAegAAAAACegAAAAABegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAABFQAAAAACegAAAAABegAAAAABfgAAAAAAegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -3,-2:
           ind: -3,-2
-          tiles: aAAAAAABaAAAAAACaAAAAAACaAAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABegAAAAAAegAAAAABXQAAAAADEgAAAAABEgAAAAACEgAAAAAAEgAAAAAAEgAAAAACfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAACegAAAAACegAAAAABXQAAAAABEgAAAAACEgAAAAACEgAAAAACEgAAAAABEgAAAAADMwAAAAAAMwAAAAAAJAAAAAABaAAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADegAAAAACegAAAAACXQAAAAADEgAAAAAAEgAAAAADEgAAAAABEgAAAAABEgAAAAAAMwAAAAAAMwAAAAAAJAAAAAABaAAAAAACaAAAAAABXQAAAAAAaAAAAAAAXQAAAAADegAAAAACegAAAAACXQAAAAAAEgAAAAABEgAAAAADEgAAAAACEgAAAAACEgAAAAADMwAAAAAAMwAAAAAAJAAAAAACaAAAAAADaAAAAAAAXQAAAAACaAAAAAACXQAAAAADegAAAAADegAAAAACXQAAAAAAEgAAAAAAEgAAAAAAEgAAAAABEgAAAAAAEgAAAAADMwAAAAAAMwAAAAAAJAAAAAAAaAAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAegAAAAADegAAAAADXQAAAAADEgAAAAABEgAAAAAAEgAAAAADEgAAAAACEgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACaAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAKAAAAAADKAAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABaAAAAAAAaAAAAAACaAAAAAADaAAAAAACXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAKAAAAAABKAAAAAACKAAAAAABKAAAAAABKAAAAAACKAAAAAAAKAAAAAABKAAAAAABaAAAAAABaAAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAAAewAAAAACewAAAAADfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACfgAAAAAAewAAAAADewAAAAACewAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAA
+          tiles: aAAAAAADaAAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABegAAAAADegAAAAABXQAAAAABEgAAAAABEgAAAAADEgAAAAAAEgAAAAAAEgAAAAADfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABegAAAAADegAAAAABXQAAAAAAEgAAAAADEgAAAAAAEgAAAAACEgAAAAAAEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAADaAAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAADegAAAAADegAAAAACXQAAAAAAEgAAAAAAEgAAAAAAEgAAAAACEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAAAaAAAAAACXQAAAAAAaAAAAAAAXQAAAAACegAAAAABegAAAAADXQAAAAACEgAAAAACEgAAAAABEgAAAAAAEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAADaAAAAAAAaAAAAAADXQAAAAABaAAAAAAAXQAAAAADegAAAAACegAAAAABXQAAAAABEgAAAAADEgAAAAADEgAAAAADEgAAAAABEgAAAAABAwAAAAAAAwAAAAAAJAAAAAABaAAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAABegAAAAAAegAAAAACXQAAAAACEgAAAAABEgAAAAAAEgAAAAAAEgAAAAADEgAAAAADfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAABKAAAAAACKAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACaAAAAAAAaAAAAAABaAAAAAADaAAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAKAAAAAADKAAAAAADKAAAAAADKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADaAAAAAACaAAAAAABXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAADewAAAAABewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAABewAAAAAAewAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAAD
           version: 6
         -3,-3:
           ind: -3,-3
-          tiles: XQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAACaAAAAAABXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAEAAAAAAAAfQAAAAAAAAAAAAAATgAAAAABTgAAAAACaAAAAAAATgAAAAACTgAAAAADaAAAAAACaAAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAJAAAAAADJAAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAaAAAAAACXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAAAfgAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAJBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAADTgAAAAAAXQAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAABTgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAACKAAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAADKAAAAAACKAAAAAABaAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAKAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAD
+          tiles: XQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAABTgAAAAACaAAAAAADTgAAAAABTgAAAAABaAAAAAAAaAAAAAACaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAJAAAAAACJAAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAAAfgAAAAAABwAAAAAHBwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAJfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACXQAAAAADTgAAAAACXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABTgAAAAADXQAAAAADXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAAATgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAABKAAAAAAAKAAAAAAAKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABKAAAAAABaAAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAAAKAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAC
           version: 6
         -4,0:
           ind: -4,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAADXQAAAAAAZQAAAAABZQAAAAACZQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABaAAAAAADTgAAAAADTgAAAAAAaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAABZQAAAAAAZQAAAAAAZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADJAAAAAADJAAAAAACJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADXQAAAAAAJAAAAAADJAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAJAAAAAADJAAAAAAAJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAACXQAAAAADZQAAAAAAZQAAAAADZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACaAAAAAADTgAAAAABTgAAAAACaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAAAXQAAAAADZQAAAAAAZQAAAAADZQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAJAAAAAABJAAAAAABJAAAAAAAJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAACXQAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAXQAAAAADJAAAAAACJAAAAAABJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-1:
           ind: -4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABJAAAAAADJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAACMwAAAAAAMwAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAAAXQAAAAABJAAAAAABJAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAAAXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAACJAAAAAABJAAAAAABJAAAAAAAJAAAAAAD
           version: 6
         -4,-2:
           ind: -4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADfgAAAAAAXQAAAAADaAAAAAABJAAAAAAAMwAAAAAAfgAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAABaAAAAAACJAAAAAAAMwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAXQAAAAACaAAAAAADJAAAAAAAMwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACaAAAAAABJAAAAAADMwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABHwAAAAABfgAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAACXQAAAAAAaAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAABfgAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAAAaAAAAAADXQAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACfQAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAD
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADJAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAAAaAAAAAACJAAAAAADAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAXQAAAAABaAAAAAACJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAABaAAAAAADJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAABHwAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAADaAAAAAADJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAACHwAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAACaAAAAAADXQAAAAACaAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAABXQAAAAABaAAAAAADaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAABXQAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADaAAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAACaAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAACAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAB
           version: 6
         -4,-3:
           ind: -4,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADaAAAAAADaAAAAAABTgAAAAABTgAAAAACaAAAAAAATgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXgAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXgAAAAABXgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADYQAAAAAAYQAAAAACXgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAABaAAAAAACTgAAAAACTgAAAAADaAAAAAACTgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXgAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXgAAAAAAXgAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABYQAAAAABYQAAAAADXgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAB
           version: 6
         2,0:
           ind: 2,0
-          tiles: HwAAAAADHwAAAAABHwAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACaAAAAAABXQAAAAACdQAAAAACdQAAAAADdQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAJAAAAAADXQAAAAACXQAAAAABXQAAAAACaAAAAAACXQAAAAAAXQAAAAAATgAAAAAAXQAAAAACdQAAAAADdQAAAAAAdQAAAAABfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABTgAAAAABTgAAAAADaAAAAAADaAAAAAACaAAAAAADTgAAAAADTgAAAAAAXQAAAAAAdQAAAAAAdQAAAAACaAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADaAAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAADdQAAAAAAdQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAAAcAAAAAADcAAAAAACcAAAAAABcAAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAABfgAAAAAAcAAAAAABcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAdQAAAAAAdQAAAAABcAAAAAACcAAAAAADcAAAAAABcAAAAAACcAAAAAAAdQAAAAABXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAAAdQAAAAAATgAAAAACcAAAAAADdQAAAAADcAAAAAADTgAAAAADdQAAAAACXQAAAAAAXQAAAAADXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAACcAAAAAACcAAAAAABcAAAAAABcAAAAAABdQAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACcAAAAAACJAAAAAAAcAAAAAACcAAAAAADcAAAAAACfgAAAAAAXQAAAAABegAAAAADegAAAAACegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACcAAAAAACcAAAAAABcAAAAAAAcAAAAAACJAAAAAABXQAAAAABXQAAAAABegAAAAAAegAAAAACegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAAAcAAAAAADcAAAAAABcAAAAAABcAAAAAAAfgAAAAAAXQAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAADfgAAAAAAXQAAAAABegAAAAADegAAAAADegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAAA
+          tiles: HwAAAAAAHwAAAAABHwAAAAABfgAAAAAAaAAAAAADaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABaAAAAAAAXQAAAAABdQAAAAABdQAAAAAAdQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAJAAAAAAAXQAAAAAAXQAAAAACXQAAAAADaAAAAAADXQAAAAABXQAAAAABTgAAAAABXQAAAAABdQAAAAABdQAAAAADdQAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAABTgAAAAAATgAAAAADaAAAAAACaAAAAAABaAAAAAAATgAAAAAATgAAAAACXQAAAAADdQAAAAAAdQAAAAADaAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAaAAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABdQAAAAACdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAABcAAAAAAAcAAAAAABcAAAAAAAcAAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAdQAAAAACdQAAAAADcAAAAAAAcAAAAAAAcAAAAAADcAAAAAADcAAAAAABdQAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAADdQAAAAACTgAAAAADcAAAAAACdQAAAAAAcAAAAAABTgAAAAAAdQAAAAABXQAAAAABXQAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAADcAAAAAAAcAAAAAADcAAAAAAAcAAAAAADdQAAAAACXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAACdQAAAAADdQAAAAADdQAAAAABdAAAAAABdQAAAAADfgAAAAAAXQAAAAACegAAAAADegAAAAABegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdQAAAAABdQAAAAABdQAAAAACdAAAAAAAJAAAAAACXQAAAAACXQAAAAAAegAAAAABegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABcAAAAAADcAAAAAABcAAAAAADcAAAAAADcAAAAAADfgAAAAAAXQAAAAABegAAAAACegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAADHwAAAAAAJAAAAAADfgAAAAAAXQAAAAADegAAAAABegAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAAATwAAAAAATwAAAAAA
           version: 6
         -5,-2:
           ind: -5,-2
@@ -219,63 +221,63 @@ entities:
           version: 6
         0,2:
           ind: 0,2
-          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAdAAAAAADdAAAAAABdQAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAdAAAAAACdAAAAAADdQAAAAACfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,2:
           ind: -1,2
-          tiles: HwAAAAACHwAAAAAAewAAAAACewAAAAACewAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABJAAAAAABJAAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAAewAAAAADewAAAAAAewAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAACHwAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACewAAAAAAewAAAAACewAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABHwAAAAACHwAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAACXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAHwAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAAAdAAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABgQAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAD
+          tiles: HwAAAAADHwAAAAACewAAAAADewAAAAADewAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACJAAAAAADJAAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAHwAAAAADewAAAAADewAAAAADewAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAHwAAAAACewAAAAAAewAAAAAAewAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAACHwAAAAACHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAABXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACHwAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAACdAAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACgQAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAJAAAAAABJAAAAAADJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAAA
           version: 6
         -2,2:
           ind: -2,2
-          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAABfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAABAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,3:
           ind: -1,3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAABXQAAAAACXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABHwAAAAABHwAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACJAAAAAAAXQAAAAABXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,3:
           ind: 0,3
-          tiles: XQAAAAACHwAAAAABHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAABHwAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAABHwAAAAADHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         2,1:
           ind: 2,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACcAAAAAADfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABTgAAAAABTgAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABTgAAAAABTgAAAAAAHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADaAAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACTwAAAAAATwAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAABTgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAATgAAAAADTgAAAAAAHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAaAAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,0:
           ind: 3,0
-          tiles: fgAAAAAAdQAAAAADdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAfgAAAAAAdQAAAAABdQAAAAACdQAAAAACcAAAAAACdQAAAAACcAAAAAABfgAAAAAAcAAAAAACcAAAAAACdQAAAAABdQAAAAADdQAAAAADfgAAAAAAcAAAAAABdQAAAAACdQAAAAADdQAAAAACdQAAAAADdQAAAAABcAAAAAABdQAAAAAAcAAAAAAAcAAAAAADcAAAAAAAcAAAAAABdQAAAAADdQAAAAACdQAAAAABdQAAAAADdQAAAAACdQAAAAACcAAAAAAAcAAAAAADcAAAAAAAdQAAAAADcAAAAAABdQAAAAADcAAAAAACcAAAAAAAcAAAAAACcAAAAAAAdQAAAAACdQAAAAADdQAAAAAAfgAAAAAAcAAAAAACdQAAAAADdQAAAAACdQAAAAABdQAAAAACdQAAAAACcAAAAAAAdQAAAAACcAAAAAADfgAAAAAAcAAAAAAAcAAAAAABdQAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAAAcAAAAAABfgAAAAAAdQAAAAACdQAAAAADdQAAAAAAcAAAAAACdQAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACcAAAAAADfgAAAAAAcAAAAAADcAAAAAADcAAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAACdQAAAAADcAAAAAACcAAAAAADcAAAAAADdQAAAAABdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAADdQAAAAAAcAAAAAACfgAAAAAAcAAAAAADdQAAAAABdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAdQAAAAABcAAAAAAAdQAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAfgAAAAAAcAAAAAACdQAAAAACcAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAABHwAAAAABegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACdQAAAAAAcAAAAAADcAAAAAAAcAAAAAACHwAAAAACHwAAAAACHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAABcAAAAAAAfgAAAAAAcAAAAAACHwAAAAABHwAAAAADHwAAAAABfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACdQAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAADdQAAAAADdQAAAAADcAAAAAABcAAAAAABcAAAAAACdQAAAAAAcAAAAAACcAAAAAABcAAAAAAAcAAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAAAdQAAAAACdQAAAAADcAAAAAACfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAdQAAAAADdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABfgAAAAAAdQAAAAADdQAAAAAAdQAAAAACcAAAAAAAdQAAAAABcAAAAAABfgAAAAAAcAAAAAADcAAAAAACdQAAAAADdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAABdQAAAAABdQAAAAAAdQAAAAABdQAAAAADdQAAAAACcAAAAAAAdQAAAAAAcAAAAAAAcAAAAAACcAAAAAADcAAAAAADdQAAAAADdQAAAAABdQAAAAABdQAAAAAAdQAAAAAAdQAAAAABcAAAAAAAcAAAAAADcAAAAAABdQAAAAABcAAAAAABdQAAAAABcAAAAAADcAAAAAADcAAAAAADcAAAAAADdQAAAAADdQAAAAAAdQAAAAACfgAAAAAAcAAAAAABdQAAAAABdQAAAAACdQAAAAADdQAAAAAAdQAAAAAAcAAAAAACdQAAAAAAcAAAAAABfgAAAAAAcAAAAAACcAAAAAABdQAAAAACdQAAAAACdQAAAAABfgAAAAAAcAAAAAACcAAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAABcAAAAAADdQAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADcAAAAAABfgAAAAAAcAAAAAAAcAAAAAACcAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABdQAAAAADcAAAAAACcAAAAAACcAAAAAACdQAAAAADdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAABcAAAAAACfgAAAAAAcAAAAAAAdQAAAAABdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABdQAAAAADcAAAAAAAdQAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAdQAAAAAAcAAAAAABfgAAAAAAJAAAAAABHwAAAAABHwAAAAABHwAAAAACHwAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAcAAAAAACdQAAAAACcAAAAAADcAAAAAACcAAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAAAcAAAAAAAfgAAAAAAcAAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAADdQAAAAACcAAAAAACcAAAAAAAcAAAAAACdQAAAAAAcAAAAAADcAAAAAAAcAAAAAACcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABdQAAAAACdQAAAAADdQAAAAACcAAAAAABfgAAAAAAfgAAAAAA
           version: 6
         3,1:
           ind: 3,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAADdQAAAAADdQAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXgAAAAAAZAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAAAfgAAAAAAegAAAAAAegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAAAdQAAAAACdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXgAAAAAAZAAAAAAAXQAAAAADXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -4,-4:
           ind: -4,-4
-          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAAAJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAJAAAAAABJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABJAAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADJAAAAAADJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAA
+          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
           version: 6
         -3,-4:
           ind: -3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAJAAAAAADJAAAAAACJAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAACJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-5:
           ind: -4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -3,-5:
           ind: -3,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAA
           version: 6
         3,-1:
           ind: 3,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACHwAAAAABHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADJAAAAAABJAAAAAAAJAAAAAACJAAAAAABJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAADJAAAAAABJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAAAdQAAAAADdQAAAAADcAAAAAAAfgAAAAAAdQAAAAACdQAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAACcAAAAAABcAAAAAACbQAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAACcAAAAAABcAAAAAAAcAAAAAADdQAAAAACdQAAAAADfgAAAAAAcAAAAAADcAAAAAABcAAAAAADcAAAAAADcAAAAAABbQAAAAAAfgAAAAAAcAAAAAABcAAAAAADdQAAAAAAcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAAAdQAAAAACdQAAAAADdQAAAAADfgAAAAAAcAAAAAADdQAAAAAAdQAAAAADdQAAAAAAcAAAAAACcAAAAAAAdQAAAAAAcAAAAAABcAAAAAACcAAAAAAAdQAAAAADdQAAAAADdQAAAAAAdQAAAAADdQAAAAACfgAAAAAAcAAAAAACcAAAAAACdQAAAAABcAAAAAAAcAAAAAABcAAAAAACdQAAAAACcAAAAAACcAAAAAADcAAAAAADdQAAAAABdQAAAAAAdQAAAAABdQAAAAABdQAAAAADfgAAAAAAcAAAAAACcAAAAAAAdQAAAAADcAAAAAACcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAdQAAAAAAdQAAAAABcAAAAAABfgAAAAAAdQAAAAABdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAABdQAAAAADdQAAAAACcAAAAAAAcAAAAAADdQAAAAADdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAACHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAXQAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAABdQAAAAACdQAAAAADcAAAAAAAfgAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACdQAAAAACcAAAAAACcAAAAAACcAAAAAABdQAAAAABdQAAAAABfgAAAAAAcAAAAAABdQAAAAADdQAAAAABdQAAAAADcAAAAAABfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABdQAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAACdQAAAAACcAAAAAABfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAAAdQAAAAABcAAAAAABcAAAAAAAdQAAAAAAcAAAAAAAcAAAAAADcAAAAAACaAAAAAABaAAAAAADaAAAAAABcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAABdQAAAAABcAAAAAABcAAAAAADcAAAAAAAdQAAAAACcAAAAAADcAAAAAAAcAAAAAABaAAAAAADaAAAAAABaAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABdQAAAAADcAAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAABdQAAAAACcAAAAAABfgAAAAAAdQAAAAADdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACdQAAAAADdQAAAAACcAAAAAACcAAAAAAAdQAAAAACdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         4,0:
           ind: 4,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,-1:
           ind: 4,-1
-          tiles: XQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAAaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAADfgAAAAAAXQAAAAACbQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAfgAAAAAAXQAAAAADbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAADaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAADfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAADXQAAAAAAXQAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAAXQAAAAADbQAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAACfgAAAAAAXQAAAAACbQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACXQAAAAABXQAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,1:
           ind: 4,1
@@ -283,27 +285,27 @@ entities:
           version: 6
         4,-2:
           ind: 4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADJAAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADJAAAAAADJAAAAAABXQAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAJAAAAAACHwAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAACXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAABegAAAAADegAAAAACXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAaAAAAAADXQAAAAACegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAAAegAAAAADegAAAAADXQAAAAADXQAAAAADJAAAAAACfgAAAAAAaAAAAAACXQAAAAABegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAACegAAAAACegAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAaAAAAAABXQAAAAAAJAAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAACbQAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAbQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAACbQAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAAAJAAAAAABJAAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAAAHwAAAAABXQAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAACegAAAAABegAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAaAAAAAACXQAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAACegAAAAADegAAAAABXQAAAAADXQAAAAABJAAAAAACfgAAAAAAaAAAAAABXQAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAABegAAAAACegAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABJAAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABbQAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAATgAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAABbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAA
           version: 6
         5,-1:
           ind: 5,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         5,-2:
           ind: 5,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAABaAAAAAABaAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAXQAAAAABXQAAAAADJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABXQAAAAADXQAAAAABJAAAAAADJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAAAaAAAAAABaAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABXQAAAAAAXQAAAAABJAAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACXQAAAAADXQAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         4,-3:
           ind: 4,-3
-          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         1,-4:
           ind: 1,-4
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAABwAAAAAKBwAAAAAABwAAAAACfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAEBwAAAAAABwAAAAAMBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAABBwAAAAAJBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAAAHwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAEBwAAAAAABwAAAAAABwAAAAADfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAAAJAAAAAACfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAFBwAAAAAEBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAJBwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAAAHwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAALfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAEBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         0,-4:
           ind: 0,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAA
           version: 6
         -5,-3:
           ind: -5,-3
@@ -311,7 +313,7 @@ entities:
           version: 6
         -3,2:
           ind: -3,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-4:
           ind: -1,-4
@@ -323,11 +325,11 @@ entities:
           version: 6
         5,-3:
           ind: 5,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAFWwAAAAAAWwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAGWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,2:
           ind: 1,2
-          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-4:
           ind: -2,-4
@@ -335,15 +337,15 @@ entities:
           version: 6
         2,-4:
           ind: 2,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAADfwAAAAAABwAAAAAABwAAAAAIBwAAAAAIBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAABwAAAAAHBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACBwAAAAAJBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,-4:
           ind: 3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAACBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAACBwAAAAAHBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAJBwAAAAAKBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAABBwAAAAAFBwAAAAAMBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAEBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAKfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAABwAAAAAKBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
           version: 6
         4,-4:
           ind: 4,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAAAfgAAAAAABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -370,20 +372,20 @@ entities:
             color: '#32CD32FF'
             id: Arrows
           decals:
-            1734: 53,14
+            1684: 53,14
         - node:
             angle: 1.5707963267948966 rad
             color: '#32CD32FF'
             id: Arrows
           decals:
-            1735: 55,14
+            1685: 55,14
         - node:
             angle: 4.71238898038469 rad
             color: '#DE3A3A96'
             id: Arrows
           decals:
-            1195: 3,31
-            1196: 3,30
+            1170: 3,31
+            1171: 3,30
         - node:
             angle: 1.5707963267948966 rad
             color: '#EFB34196'
@@ -392,72 +394,82 @@ entities:
             104: 2,-13
             105: 2,-12
         - node:
+            angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1889: 69,-28
-            1890: 70,-28
-            6152: -44.266167,24.17379
-            6153: -43.71579,24.16156
-            6847: 7.80612,-46.838108
-            6848: 8.233204,-46.827694
+            6929: 46,14
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            1829: 69,-28
+            1830: 70,-28
+            6024: -44.266167,24.17379
+            6025: -43.71579,24.16156
+            6689: 7.80612,-46.838108
+            6690: 8.233204,-46.827694
+            6924: 43.669937,12.024849
+            6925: 43.669937,12.431099
+            6926: 44.341812,12.009224
+            6927: 44.341812,12.399849
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
             350: 44,-22
-            1269: 22,15
-            1327: -18,28
-            1783: 62,-25
-            1784: 62,-24
-            1953: 61,-18
-            1954: 61,-20
-            1978: 22,-38
-            1979: 22,-37
-            6150: -45.159,22.681658
-            6151: -45.17123,23.256496
+            1244: 22,15
+            1302: -18,28
+            1723: 62,-25
+            1724: 62,-24
+            1893: 61,-18
+            1894: 61,-20
+            1918: 22,-38
+            1919: 22,-37
+            6022: -45.159,22.681658
+            6023: -45.17123,23.256496
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            2980: -25,37
+            2920: -25,37
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1273: 25,23
-            1274: 29,23
-            1810: 68.96644,-11.160069
-            1811: 69.96644,-11.15081
-            1812: 67.97107,-11.15544
-            6148: -43.71579,21.837746
-            6149: -44.32732,21.837746
-            6669: -33,-12
+            1248: 25,23
+            1249: 29,23
+            1750: 68.96644,-11.160069
+            1751: 69.96644,-11.15081
+            1752: 67.97107,-11.15544
+            6020: -43.71579,21.837746
+            6021: -44.32732,21.837746
+            6513: -33,-12
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1272: 25,12
-            6146: -42.87188,22.669428
-            6147: -42.85965,23.219805
+            1247: 25,12
+            6018: -42.87188,22.669428
+            6019: -42.85965,23.219805
         - node:
             color: '#FFFFFFFF'
             id: Basalt1
           decals:
             309: 26,-21
-            2230: 26,1
-            6876: 54.43144,-23.18127
+            2170: 26,1
+            6718: 54.43144,-23.18127
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Basalt1
           decals:
-            3021: 80.98914,-5.89228
+            2961: 80.98914,-5.89228
         - node:
             color: '#FFFFFFFF'
             id: Basalt2
@@ -468,63 +480,63 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt2
           decals:
-            3023: 79.36655,-6.805498
+            2963: 79.36655,-6.805498
         - node:
             color: '#FFFFFFFF'
             id: Basalt3
           decals:
             312: 26,-24
-            1747: 57,19
+            1697: 57,19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Basalt3
           decals:
-            3020: 80.410225,-6.9767265
+            2960: 80.410225,-6.9767265
         - node:
             color: '#FFFFFFFF'
             id: Basalt4
           decals:
             315: 26,-24
-            941: -48,-27
-            1939: 56,-23
+            916: -48,-27
+            1879: 56,-23
         - node:
             color: '#FFFFFFFF'
             id: Basalt5
           decals:
             311: 26,-22
             314: 25,-23
-            940: -48,-28
-            1937: 54,-21
-            2231: 25,1
-            6875: 54.08898,-21.835905
-            6877: 56.437256,-22.899967
+            915: -48,-28
+            1877: 54,-21
+            2171: 25,1
+            6717: 54.08898,-21.835905
+            6719: 56.437256,-22.899967
         - node:
             color: '#FFFFFFFF'
             id: Basalt6
           decals:
-            939: -48,-29
+            914: -48,-29
         - node:
             color: '#FFFFFFFF'
             id: Basalt7
           decals:
             310: 25,-22
-            938: -49,-29
-            1748: 57,18
-            1938: 57,-23
+            913: -49,-29
+            1698: 57,18
+            1878: 57,-23
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Basalt7
           decals:
-            3022: 80.88314,-7.8817906
+            2962: 80.88314,-7.8817906
         - node:
             color: '#FFFFFFFF'
             id: Basalt8
           decals:
             34: -4,-12
-            942: -47,-30
-            6878: 56.755253,-20.832996
+            917: -47,-30
+            6720: 56.755253,-20.832996
         - node:
             color: '#FFFFFFFF'
             id: Basalt9
@@ -536,31 +548,31 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt9
           decals:
-            3024: 79.17086,-7.824714
+            2964: 79.17086,-7.824714
         - node:
             color: '#D4D4D428'
             id: Bot
           decals:
-            2185: -36,-58
-            2186: -36,-59
-            2187: -36,-60
-            2188: -36,-61
-            2189: -36,-62
-            2190: -36,-63
-            2191: -36,-64
-            2192: -60,-58
-            2193: -60,-59
-            2194: -60,-60
-            2195: -60,-61
-            2196: -60,-62
-            2197: -60,-63
-            2198: -60,-64
+            2125: -36,-58
+            2126: -36,-59
+            2127: -36,-60
+            2128: -36,-61
+            2129: -36,-62
+            2130: -36,-63
+            2131: -36,-64
+            2132: -60,-58
+            2133: -60,-59
+            2134: -60,-60
+            2135: -60,-61
+            2136: -60,-62
+            2137: -60,-63
+            2138: -60,-64
         - node:
             color: '#DE3A3A41'
             id: Bot
           decals:
-            6599: -38,-45
-            6600: -38,-45
+            6443: -38,-45
+            6444: -38,-45
         - node:
             color: '#EFB34196'
             id: Bot
@@ -621,6 +633,14 @@ entities:
             288: 18,-21
             289: 15,-22
             290: 15,-21
+            6916: 41,13
+            6917: 41,12
+            6918: 41,11
+            6919: 47,11
+            6920: 45,11
+            6921: 45,12
+            6922: 43,11
+            6923: 43,12
         - node:
             color: '#EFB341FF'
             id: Bot
@@ -633,19 +653,19 @@ entities:
             color: '#FFFFFF4A'
             id: Bot
           decals:
-            6718: 18,-56
-            6719: 19,-56
+            6560: 18,-56
+            6561: 19,-56
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            1785: 63,-25
-            1786: 63,-24
-            1787: 65,-25
-            1788: 65,-24
-            2153: -10,-41
-            2154: -10,-40
+            1725: 63,-25
+            1726: 63,-24
+            1727: 65,-25
+            1728: 65,-24
+            2093: -10,-41
+            2094: -10,-40
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -664,431 +684,467 @@ entities:
             414: -21,-26
             479: -35,-5
             480: -30,-5
-            742: -38,-34
-            743: -37,-34
-            744: -36,-34
-            787: -19,-35
-            885: -52,3
-            886: -52,-1
-            1084: 33,-3
-            1085: 34,-3
-            1109: 39,-28
-            1110: -26,-32
-            1111: 49,-22
-            1112: 35,2
-            1113: 21,21
-            1114: 34,-37
-            1115: -62,-29
-            1125: -5,31
-            1126: -6,31
-            1127: -6,32
-            1128: -5,32
-            1131: 2,26
-            1232: -1,27
-            1233: 7,30
-            1234: 7,31
-            1235: 7,32
-            1236: 7,33
-            1237: 6,33
-            1238: 2,32
-            1249: -4,48
-            1266: 23,15
-            1267: 23,13
-            1275: 23,8
-            1276: 23,7
-            1277: 23,6
-            1278: 24,6
-            1279: 24,7
-            1280: 24,8
-            1281: 25,6
-            1288: 25,7
-            1289: 25,8
-            1290: 26,20
-            1291: 25,20
-            1292: 24,20
-            1293: 24,19
-            1294: 25,19
-            1295: 26,19
-            1296: 28,20
-            1297: 29,20
-            1298: 30,20
-            1299: 28,19
-            1300: 29,19
-            1301: 30,19
-            1308: 29,17
-            1319: -10,34
-            1320: -9,34
-            1321: -8,34
-            1322: -7,34
-            1326: -18,25
-            1329: 33,17
-            1431: 58,-33
-            1438: 57,-35
-            1449: 47,12
-            1481: 44,11
-            1765: 61,-12
-            1766: 57,-15
-            1767: 57,-14
-            1771: 64,-24
-            1772: 64,-25
-            1807: 71,-11
-            1808: 71,-12
-            1809: 71,-13
-            1869: 63,-19
-            1874: 70,-22
-            1903: 69,-13
-            1958: 22,-39
-            1977: 22,-36
-            2018: 28,-36
-            2019: 29,-36
-            2020: 28,-47
-            2075: 12,-46
-            2076: 13,-46
-            2117: -2,-35
-            2118: -1,-35
-            2119: 3,-38
-            2120: 3,-37
-            2125: 10,-41
-            2131: 12,-38
-            2150: -6,-34
-            2151: -5,-34
-            2152: -4,-34
-            2202: 41,-10
-            2203: -23,12
-            2819: 66,-23
-            2851: -27,30
-            2864: 57,15
-            3147: 75,-13
-            3148: 75,-15
-            3153: 75,-19
-            3154: 75,-17
-            6383: 48,-10
-            6384: 51,5
-            6385: 53,10
-            6527: -36,-65
-            6528: -60,-65
-            6657: -34,-11
-            6658: -34,-10
-            6659: -32,-11
-            6660: -32,-10
-            6679: 61,-21
-            6686: -24,-42
-            6696: 3,48
-            6716: 62,-7
-            6717: 62,-8
-            6803: 54,-33
-            6807: 22,-59
-            6808: 15,-59
-            6811: -19,-38
-            6837: 7,-48
-            6838: 7,-49
-            6839: 9,-48
-            6840: 9,-49
-            6849: 7,-45
-            6850: 9,-45
-            6851: 76,-23
-            6852: 80,-25
-            6853: 76,-25
-            6864: 76,-23
-            6865: 58,-27
-            6866: 58,-26
-            6879: 49,17
-            6880: 50,17
-            6881: 53,17
-            6882: 54,17
-            6883: 55,17
-            6884: 69,6
-            6885: 68,4
-            6886: 69,4
-            6887: 67,0
-            6888: 65,-4
-            6889: 65,-5
-            6890: 79,-11
-            6891: 80,-11
-            6892: 81,-11
-            6893: 21,-41
-            6894: 5,-42
-            6895: 5,-43
-            6896: 5,-40
-            6897: 5,-39
-            6898: -12,-34
-            6899: -11,-34
-            6900: -10,-34
-            6901: -14,-34
-            6902: -15,-34
-            6903: -62,-32
-            6904: -63,-32
-            6905: -64,-32
-            6906: -46,-12
-            6907: -45,-12
-            6908: -41,17
-            6909: -40,17
-            6910: -39,17
-            6911: -21,31
-            6912: -20,31
-            6913: -7,38
-            6914: -6,38
-            6915: -5,38
-            6916: 3,38
-            6917: -11,17
-            6918: -10,17
-            6919: -9,17
-            6920: -12,17
-            6921: -13,17
-            6922: 1,16
-            6923: 2,16
-            6924: 3,16
-            6925: 10,16
-            6926: 11,16
-            6927: 15,4
-            6928: 17,1
-            6929: -14,-12
-            6930: -14,-11
-            6931: 39,-7
-            6932: 39,-8
-            6933: 39,-9
-            6934: 39,-10
-            6935: 39,-11
-            6936: 73,-21
-            6937: 73,-22
-            6938: 45,-10
-            6939: 45,-11
-            6940: 15,1
-            6941: -17,17
-            6942: 45,-17
-            6945: 45,-16
-            6947: 45,-15
-            6948: -37,-42
-            6949: -37,-40
-            6950: -37,-41
-            7107: -29,15
+            717: -38,-34
+            718: -37,-34
+            719: -36,-34
+            762: -19,-35
+            860: -52,3
+            861: -52,-1
+            1059: 33,-3
+            1060: 34,-3
+            1084: 39,-28
+            1085: -26,-32
+            1086: 49,-22
+            1087: 35,2
+            1088: 21,21
+            1089: 34,-37
+            1090: -62,-29
+            1100: -5,31
+            1101: -6,31
+            1102: -6,32
+            1103: -5,32
+            1106: 2,26
+            1207: -1,27
+            1208: 7,30
+            1209: 7,31
+            1210: 7,32
+            1211: 7,33
+            1212: 6,33
+            1213: 2,32
+            1224: -4,48
+            1241: 23,15
+            1242: 23,13
+            1250: 23,8
+            1251: 23,7
+            1252: 23,6
+            1253: 24,6
+            1254: 24,7
+            1255: 24,8
+            1256: 25,6
+            1263: 25,7
+            1264: 25,8
+            1265: 26,20
+            1266: 25,20
+            1267: 24,20
+            1268: 24,19
+            1269: 25,19
+            1270: 26,19
+            1271: 28,20
+            1272: 29,20
+            1273: 30,20
+            1274: 28,19
+            1275: 29,19
+            1276: 30,19
+            1283: 29,17
+            1294: -10,34
+            1295: -9,34
+            1296: -8,34
+            1297: -7,34
+            1301: -18,25
+            1304: 33,17
+            1406: 58,-33
+            1413: 57,-35
+            1705: 61,-12
+            1706: 57,-15
+            1707: 57,-14
+            1711: 64,-24
+            1712: 64,-25
+            1747: 71,-11
+            1748: 71,-12
+            1749: 71,-13
+            1809: 63,-19
+            1814: 70,-22
+            1843: 69,-13
+            1898: 22,-39
+            1917: 22,-36
+            1958: 28,-36
+            1959: 29,-36
+            1960: 28,-47
+            2015: 12,-46
+            2016: 13,-46
+            2057: -2,-35
+            2058: -1,-35
+            2059: 3,-38
+            2060: 3,-37
+            2065: 10,-41
+            2071: 12,-38
+            2090: -6,-34
+            2091: -5,-34
+            2092: -4,-34
+            2142: 41,-10
+            2143: -23,12
+            2759: 66,-23
+            2791: -27,30
+            2804: 57,15
+            3082: 75,-13
+            3083: 75,-15
+            3088: 75,-19
+            3089: 75,-17
+            6227: 48,-10
+            6228: 51,5
+            6229: 53,10
+            6371: -36,-65
+            6372: -60,-65
+            6501: -34,-11
+            6502: -34,-10
+            6503: -32,-11
+            6504: -32,-10
+            6523: 61,-21
+            6530: -24,-42
+            6540: 3,48
+            6645: 54,-33
+            6649: 22,-59
+            6650: 15,-59
+            6653: -19,-38
+            6679: 7,-48
+            6680: 7,-49
+            6681: 9,-48
+            6682: 9,-49
+            6691: 7,-45
+            6692: 9,-45
+            6693: 76,-23
+            6694: 80,-25
+            6695: 76,-25
+            6706: 76,-23
+            6707: 58,-27
+            6708: 58,-26
+            6721: 49,17
+            6722: 50,17
+            6723: 53,17
+            6724: 54,17
+            6725: 55,17
+            6726: 69,6
+            6727: 68,4
+            6728: 69,4
+            6729: 67,0
+            6730: 65,-4
+            6731: 65,-5
+            6732: 79,-11
+            6733: 80,-11
+            6734: 81,-11
+            6735: 21,-41
+            6736: 5,-42
+            6737: 5,-43
+            6738: 5,-40
+            6739: 5,-39
+            6740: -12,-34
+            6741: -11,-34
+            6742: -10,-34
+            6743: -14,-34
+            6744: -15,-34
+            6745: -62,-32
+            6746: -63,-32
+            6747: -64,-32
+            6748: -46,-12
+            6749: -45,-12
+            6750: -41,17
+            6751: -40,17
+            6752: -39,17
+            6753: -21,31
+            6754: -20,31
+            6755: -7,38
+            6756: -6,38
+            6757: -5,38
+            6758: 3,38
+            6759: -11,17
+            6760: -10,17
+            6761: -9,17
+            6762: -12,17
+            6763: -13,17
+            6764: 1,16
+            6765: 2,16
+            6766: 3,16
+            6767: 10,16
+            6768: 11,16
+            6769: 15,4
+            6770: 17,1
+            6771: -14,-12
+            6772: -14,-11
+            6773: 39,-7
+            6774: 39,-8
+            6775: 39,-9
+            6776: 39,-10
+            6777: 39,-11
+            6778: 73,-21
+            6779: 73,-22
+            6780: 45,-10
+            6781: 45,-11
+            6782: 15,1
+            6783: -17,17
+            6784: 45,-17
+            6785: 45,-16
+            6786: 45,-15
+            6787: -37,-42
+            6788: -37,-40
+            6789: -37,-41
+            6828: -29,15
+            6901: 47,12
+            6930: 45,15
+            6972: 82,-11
+            6980: 59,-4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            2948: -25,34
-            2949: -25,35
-            2950: -30,35
-            2951: -30,34
-            2977: -23,38
-            2978: -10,38
-            2979: -9,38
-            3025: 78,-8
-            3026: 79,-8
+            2888: -25,34
+            2889: -25,35
+            2890: -30,35
+            2891: -30,34
+            2917: -23,38
+            2918: -10,38
+            2919: -9,38
+            2965: 78,-8
+            2966: 79,-8
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            6545: 91,-19
-            6546: 91,-18
-            6547: 92,-18
-            6548: 92,-19
-            6549: 87,-19
-            6550: 88,-19
-            6551: 88,-18
-            6552: 87,-18
+            6389: 91,-19
+            6390: 91,-18
+            6391: 92,-18
+            6392: 92,-19
+            6393: 87,-19
+            6394: 88,-19
+            6395: 88,-18
+            6396: 87,-18
         - node:
             color: '#52B4E996'
             id: BotGreyscale
           decals:
-            6288: 55,8
-            6289: 55,8
-            6290: 56,8
-            6291: 56,8
-            6305: 57,1
-            6306: 57,1
-            6307: 56,1
-            6308: 56,1
-            6309: 55,4
-            6310: 55,4
-            6311: 56,4
-            6312: 56,4
-            6313: 57,4
-            6314: 57,4
+            6132: 55,8
+            6133: 55,8
+            6134: 56,8
+            6135: 56,8
+            6149: 57,1
+            6150: 57,1
+            6151: 56,1
+            6152: 56,1
+            6153: 55,4
+            6154: 55,4
+            6155: 56,4
+            6156: 56,4
+            6157: 57,4
+            6158: 57,4
         - node:
             cleanable: True
             color: '#D4D4D428'
             id: BotGreyscale
           decals:
-            2998: 78,-30
+            2938: 78,-30
+        - node:
+            color: '#EFB34196'
+            id: BotLeft
+          decals:
+            6932: 43,14
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotLeft
           decals:
-            6086: 6,-14
-            6088: 6,-14
+            5958: 6,-14
+            5960: 6,-14
         - node:
             color: '#FFFFFFFF'
             id: BotLeft
           decals:
-            1867: 74,-13
-            1868: 74,-12
-            1959: 23,-39
-            1960: 24,-39
-            1961: 25,-39
-            2129: 12,-39
-            6507: -3,33
-            7108: -33,12
-            7109: -34,12
-            7110: -35,12
-            7111: -35,11
-            7112: -34,11
-            7113: -33,11
+            1807: 74,-13
+            1808: 74,-12
+            1899: 23,-39
+            1900: 24,-39
+            1901: 25,-39
+            2069: 12,-39
+            6351: -3,33
+            6829: -33,12
+            6830: -34,12
+            6831: -35,12
+            6832: -35,11
+            6833: -34,11
+            6834: -33,11
+            6979: 60,-4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BotLeft
           decals:
-            6083: 6,-14
+            5955: 6,-14
         - node:
             color: '#D4D4D496'
             id: BotLeftGreyscale
           decals:
-            6856: 77,-30
-            6857: 76,-30
+            6698: 77,-30
+            6699: 76,-30
         - node:
             angle: -6.283185307179586 rad
             color: '#EFB34196'
             id: BotLeftGreyscale
           decals:
-            6587: -1,-20
-            6588: -1,-21
+            6431: -1,-20
+            6432: -1,-21
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotLeftGreyscale
           decals:
-            6087: 6,-14
+            5959: 6,-14
         - node:
             angle: -6.283185307179586 rad
             color: '#EFB34196'
             id: BotRight
           decals:
-            6589: -2,-21
-            6590: -2,-20
+            6433: -2,-21
+            6434: -2,-20
+        - node:
+            color: '#EFB34196'
+            id: BotRight
+          decals:
+            6931: 47,14
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotRight
           decals:
-            6089: 6,-15
+            5961: 6,-15
         - node:
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            1865: 73,-12
-            1866: 73,-13
-            1962: 23,-36
-            1963: 24,-36
-            1964: 25,-36
-            2130: 12,-40
-            6508: -3,34
-            7114: -35,16
-            7115: -34,16
-            7116: -33,16
-            7117: -33,17
-            7118: -34,17
-            7119: -35,17
+            1805: 73,-12
+            1806: 73,-13
+            1902: 23,-36
+            1903: 24,-36
+            1904: 25,-36
+            2070: 12,-40
+            6352: -3,34
+            6835: -35,16
+            6836: -34,16
+            6837: -33,16
+            6838: -33,17
+            6839: -34,17
+            6840: -35,17
+            6978: 58,-4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            6084: 6,-15
+            5956: 6,-15
         - node:
             color: '#D4D4D496'
             id: BotRightGreyscale
           decals:
-            6854: 79,-30
-            6855: 80,-30
+            6696: 79,-30
+            6697: 80,-30
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotRightGreyscale
           decals:
-            6085: 6,-15
+            5957: 6,-15
+        - node:
+            color: '#EFB34196'
+            id: Box
+          decals:
+            6928: 45,14
         - node:
             color: '#FFFFFFFF'
             id: Box
           decals:
-            1086: 33,0
-            1087: 34,0
-            1116: -57,-24
-            1117: -56,-24
-            1992: 19,-37
-            1993: 19,-36
-            6572: 92,-20
-            6960: -21,10
-            7104: -31,17
-            7105: -30,17
-            7106: -29,16
-            7120: -31,12
-            7121: -30,12
-            7122: -30,11
-            7123: -31,11
+            1061: 33,0
+            1062: 34,0
+            1091: -57,-24
+            1092: -56,-24
+            1932: 19,-37
+            1933: 19,-36
+            6416: 92,-20
+            6825: -31,17
+            6826: -30,17
+            6827: -29,16
+            6841: -31,12
+            6842: -30,12
+            6843: -30,11
+            6844: -31,11
+            6894: 47,16
+            6981: 60,-8
+            6982: 61,-8
+        - node:
+            color: '#52B4E996'
+            id: BrickCornerOverlaySW
+          decals:
+            6991: 57,-8
+        - node:
+            color: '#52B4E996'
+            id: BrickLineOverlayS
+          decals:
+            6992: 58,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickLineOverlayS
+          decals:
+            6983: 58,-5
+            6984: 59,-5
+            6985: 60,-5
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
           decals:
-            795: -31,-36
-            1067: 28,-29
-            1430: 58,-34
-            1882: 69,-29
-            2099: 22,-53
-            6836: 9,-48
+            770: -31,-36
+            1042: 28,-29
+            1405: 58,-34
+            1822: 69,-29
+            2039: 22,-53
+            6678: 9,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
             128: 0,-21
-            794: -33,-36
-            1065: 24,-29
-            1427: 56,-34
-            1881: 70,-29
-            2102: 15,-53
-            6835: 7,-48
+            769: -33,-36
+            1040: 24,-29
+            1402: 56,-34
+            1821: 70,-29
+            2042: 15,-53
+            6677: 7,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
           decals:
-            793: -31,-38
-            994: 46,-34
-            1066: 28,-34
-            1428: 58,-36
-            1884: 69,-30
-            2077: 17,-53
-            2101: 22,-60
-            6834: 9,-49
+            768: -31,-38
+            969: 46,-34
+            1041: 28,-34
+            1403: 58,-36
+            1824: 69,-30
+            2017: 17,-53
+            2041: 22,-60
+            6676: 9,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
-            792: -33,-38
-            993: 34,-34
-            1068: 24,-34
-            1429: 56,-36
-            1883: 70,-30
-            2078: 20,-53
-            2100: 15,-60
-            6833: 7,-49
+            767: -33,-38
+            968: 34,-34
+            1043: 24,-34
+            1404: 56,-36
+            1823: 70,-30
+            2018: 20,-53
+            2040: 15,-60
+            6675: 7,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
             119: -4,-16
-            629: -39,-16
-            1152: -4,21
-            1422: 56,-36
-            1806: 70,-11
-            1861: 74,-17
-            1864: 74,-14
-            2093: 15,-60
-            2098: 22,-53
-            2105: 21,-53
-            2106: 22,-54
+            604: -39,-16
+            1127: -4,21
+            1397: 56,-36
+            1746: 70,-11
+            1801: 74,-17
+            1804: 74,-14
+            2033: 15,-60
+            2038: 22,-53
+            2045: 21,-53
+            2046: 22,-54
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
@@ -1096,35 +1152,35 @@ entities:
             46: -12,-19
             81: -5,-15
             231: 0,-22
-            1151: -1,21
-            1421: 58,-36
-            1805: 68,-11
-            2094: 22,-60
-            2097: 15,-53
-            2103: 16,-53
-            2104: 15,-54
+            1126: -1,21
+            1396: 58,-36
+            1745: 68,-11
+            2034: 22,-60
+            2037: 15,-53
+            2043: 16,-53
+            2044: 15,-54
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
           decals:
-            628: -39,-13
-            1157: -4,27
-            1420: 56,-34
-            1862: 74,-15
-            1863: 74,-19
-            2092: 15,-53
-            2095: 22,-60
-            2107: 21,-60
+            603: -39,-13
+            1132: -4,27
+            1395: 56,-34
+            1802: 74,-15
+            1803: 74,-19
+            2032: 15,-53
+            2035: 22,-60
+            2047: 21,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
           decals:
             45: -12,-14
             478: -25,-1
-            1419: 58,-34
-            2091: 22,-53
-            2096: 15,-60
-            2108: 16,-60
+            1394: 58,-34
+            2031: 22,-53
+            2036: 15,-60
+            2048: 16,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
@@ -1158,76 +1214,76 @@ entities:
             492: -34,2
             493: -34,1
             500: -30,2
-            612: -39,-15
-            613: -39,-14
-            704: -41,-34
-            705: -41,-33
-            706: -41,-32
-            707: -41,-31
-            708: -41,-30
-            709: -41,-29
-            710: -41,-28
-            711: -41,-27
-            712: -41,-26
-            713: -41,-25
-            732: -37,-15
-            733: -37,-14
-            734: -34,-15
-            735: -34,-14
-            736: -31,-15
-            737: -31,-14
-            738: -28,-15
-            739: -28,-14
-            782: -27,-38
-            783: -27,-37
-            790: -32,-40
-            791: -32,-39
-            799: -31,-37
-            800: -52,-2
-            801: -52,-3
-            802: -52,4
-            803: -52,5
-            920: -48,12
-            921: -48,13
-            968: -48,9
-            969: -48,10
-            970: -46,11
-            1047: 42,-34
-            1051: 28,-33
-            1052: 28,-32
-            1053: 28,-31
-            1058: 28,-30
-            1147: -4,23
-            1148: -4,24
-            1149: -4,24
-            1150: -4,25
-            1169: -3,36
-            1170: -3,37
-            1171: -3,38
-            1242: 0,45
-            1243: 0,46
-            1244: 0,47
-            1255: 0,48
-            1416: 56,-35
-            1423: 58,-35
-            1877: 69,-30
-            1878: 69,-29
-            1955: 22,-39
-            1956: 22,-38
-            1957: 22,-37
-            1998: 27,-47
-            1999: 27,-46
-            2000: 27,-45
-            2001: 27,-44
-            2002: 27,-43
-            2003: 27,-42
-            2087: 15,-58
-            2088: 15,-57
-            2089: 15,-55
-            2090: 15,-54
-            2113: 16,-60
-            6386: 53,12
-            6387: 53,11
+            587: -39,-15
+            588: -39,-14
+            679: -41,-34
+            680: -41,-33
+            681: -41,-32
+            682: -41,-31
+            683: -41,-30
+            684: -41,-29
+            685: -41,-28
+            686: -41,-27
+            687: -41,-26
+            688: -41,-25
+            707: -37,-15
+            708: -37,-14
+            709: -34,-15
+            710: -34,-14
+            711: -31,-15
+            712: -31,-14
+            713: -28,-15
+            714: -28,-14
+            757: -27,-38
+            758: -27,-37
+            765: -32,-40
+            766: -32,-39
+            774: -31,-37
+            775: -52,-2
+            776: -52,-3
+            777: -52,4
+            778: -52,5
+            895: -48,12
+            896: -48,13
+            943: -48,9
+            944: -48,10
+            945: -46,11
+            1022: 42,-34
+            1026: 28,-33
+            1027: 28,-32
+            1028: 28,-31
+            1033: 28,-30
+            1122: -4,23
+            1123: -4,24
+            1124: -4,24
+            1125: -4,25
+            1144: -3,36
+            1145: -3,37
+            1146: -3,38
+            1217: 0,45
+            1218: 0,46
+            1219: 0,47
+            1230: 0,48
+            1391: 56,-35
+            1398: 58,-35
+            1817: 69,-30
+            1818: 69,-29
+            1895: 22,-39
+            1896: 22,-38
+            1897: 22,-37
+            1938: 27,-47
+            1939: 27,-46
+            1940: 27,-45
+            1941: 27,-44
+            1942: 27,-43
+            1943: 27,-42
+            2027: 15,-58
+            2028: 15,-57
+            2029: 15,-55
+            2030: 15,-54
+            2053: 16,-60
+            6230: 53,12
+            6231: 53,11
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -1251,87 +1307,87 @@ entities:
             247: 8,-29
             248: 9,-29
             249: 23,-22
-            601: -38,-16
-            602: -37,-16
-            603: -36,-16
-            604: -35,-16
-            605: -34,-16
-            606: -32,-16
-            607: -33,-16
-            608: -31,-16
-            609: -29,-16
-            610: -30,-16
-            611: -28,-16
-            796: -32,-36
-            981: 35,-38
-            982: 36,-38
-            983: 37,-38
-            984: 38,-38
-            985: 39,-38
-            986: 40,-38
-            987: 41,-38
-            988: 42,-38
-            989: 43,-38
-            990: 44,-38
-            1014: 46,-38
-            1019: 31,-35
-            1020: 32,-35
-            1021: 33,-35
-            1022: 47,-35
-            1023: 48,-35
-            1024: 49,-35
-            1062: 25,-29
-            1063: 26,-29
-            1064: 27,-29
-            1081: 30,-2
-            1082: 31,-2
-            1083: 32,-2
-            1098: -46,-16
-            1099: -45,-16
-            1100: -44,-16
-            1153: -2,21
-            1154: -3,21
-            1245: -3,51
-            1246: -2,51
-            1247: 1,51
-            1248: 2,51
-            1418: 57,-36
-            1425: 57,-34
-            1501: -52,-49
-            1502: -51,-49
-            1503: -50,-49
-            1504: -48,-49
-            1505: -49,-49
-            1506: -48,-49
-            1507: -48,-49
-            1508: -47,-49
-            1509: -46,-49
-            1510: -45,-49
-            1511: -44,-49
-            1803: 67,-11
-            1804: 71,-11
-            1887: 71,-29
-            1888: 68,-29
-            2012: 28,-43
-            2013: 29,-43
-            2081: 16,-60
-            2082: 21,-60
-            2109: 15,-57
-            2110: 22,-57
-            6073: -14,-23
-            6074: -15,-23
-            6075: -16,-23
-            6560: 87,-20
-            6561: 88,-20
-            6562: 89,-20
-            6563: 90,-20
-            6564: 91,-20
-            6565: 92,-20
-            6822: 33,-2
-            6823: 34,-2
-            6830: 7,-48
-            6831: 8,-48
-            6832: 9,-48
+            576: -38,-16
+            577: -37,-16
+            578: -36,-16
+            579: -35,-16
+            580: -34,-16
+            581: -32,-16
+            582: -33,-16
+            583: -31,-16
+            584: -29,-16
+            585: -30,-16
+            586: -28,-16
+            771: -32,-36
+            956: 35,-38
+            957: 36,-38
+            958: 37,-38
+            959: 38,-38
+            960: 39,-38
+            961: 40,-38
+            962: 41,-38
+            963: 42,-38
+            964: 43,-38
+            965: 44,-38
+            989: 46,-38
+            994: 31,-35
+            995: 32,-35
+            996: 33,-35
+            997: 47,-35
+            998: 48,-35
+            999: 49,-35
+            1037: 25,-29
+            1038: 26,-29
+            1039: 27,-29
+            1056: 30,-2
+            1057: 31,-2
+            1058: 32,-2
+            1073: -46,-16
+            1074: -45,-16
+            1075: -44,-16
+            1128: -2,21
+            1129: -3,21
+            1220: -3,51
+            1221: -2,51
+            1222: 1,51
+            1223: 2,51
+            1393: 57,-36
+            1400: 57,-34
+            1451: -52,-49
+            1452: -51,-49
+            1453: -50,-49
+            1454: -48,-49
+            1455: -49,-49
+            1456: -48,-49
+            1457: -48,-49
+            1458: -47,-49
+            1459: -46,-49
+            1460: -45,-49
+            1461: -44,-49
+            1743: 67,-11
+            1744: 71,-11
+            1827: 71,-29
+            1828: 68,-29
+            1952: 28,-43
+            1953: 29,-43
+            2021: 16,-60
+            2022: 21,-60
+            2049: 15,-57
+            2050: 22,-57
+            5945: -14,-23
+            5946: -15,-23
+            5947: -16,-23
+            6404: 87,-20
+            6405: 88,-20
+            6406: 89,-20
+            6407: 90,-20
+            6408: 91,-20
+            6409: 92,-20
+            6664: 33,-2
+            6665: 34,-2
+            6672: 7,-48
+            6673: 8,-48
+            6674: 9,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -1361,95 +1417,92 @@ entities:
             476: -27,-1
             477: -26,-1
             488: -37,-1
-            598: -29,-18
-            599: -30,-18
-            600: -28,-18
-            614: -38,-13
-            615: -37,-13
-            616: -35,-13
-            617: -36,-13
-            618: -35,-13
-            619: -34,-13
-            620: -33,-13
-            621: -32,-13
-            622: -31,-13
-            623: -31,-13
-            624: -30,-13
-            625: -28,-13
-            626: -28,-13
-            627: -29,-13
-            797: -32,-38
-            972: 31,-25
-            973: 32,-25
-            974: 33,-25
-            975: 47,-25
-            976: 49,-25
-            977: 48,-25
-            991: 35,-34
-            992: 45,-34
-            1004: 39,-35
-            1059: 25,-34
-            1060: 26,-34
-            1061: 27,-34
-            1118: -57,-27
-            1119: -56,-27
-            1120: -55,-27
-            1121: -54,-27
-            1155: -3,27
-            1156: -2,27
-            1417: 57,-34
-            1426: 57,-36
-            1512: -56,-54
-            1513: -55,-54
-            1514: -54,-54
-            1515: -41,-54
-            1516: -40,-54
-            1885: 68,-30
-            1886: 71,-30
-            2014: 28,-46
-            2015: 29,-46
-            2079: 16,-53
-            2080: 21,-53
-            2111: 22,-55
-            2112: 15,-55
-            2136: 10,-40
-            2137: 11,-40
-            2201: -42,-54
-            6070: -14,-25
-            6071: -15,-25
-            6072: -16,-25
-            6155: -3,43
-            6156: -2,43
-            6157: -1,43
-            6188: 45,14
-            6189: 47,14
-            6190: 46,14
-            6360: 49,-11
-            6361: 52,-11
-            6524: -29,-17
-            6566: 87,-21
-            6567: 89,-21
-            6568: 88,-21
-            6569: 90,-21
-            6570: 91,-21
-            6571: 92,-21
-            6827: 7,-49
-            6828: 8,-49
-            6829: 9,-49
+            573: -29,-18
+            574: -30,-18
+            575: -28,-18
+            589: -38,-13
+            590: -37,-13
+            591: -35,-13
+            592: -36,-13
+            593: -35,-13
+            594: -34,-13
+            595: -33,-13
+            596: -32,-13
+            597: -31,-13
+            598: -31,-13
+            599: -30,-13
+            600: -28,-13
+            601: -28,-13
+            602: -29,-13
+            772: -32,-38
+            947: 31,-25
+            948: 32,-25
+            949: 33,-25
+            950: 47,-25
+            951: 49,-25
+            952: 48,-25
+            966: 35,-34
+            967: 45,-34
+            979: 39,-35
+            1034: 25,-34
+            1035: 26,-34
+            1036: 27,-34
+            1093: -57,-27
+            1094: -56,-27
+            1095: -55,-27
+            1096: -54,-27
+            1130: -3,27
+            1131: -2,27
+            1392: 57,-34
+            1401: 57,-36
+            1462: -56,-54
+            1463: -55,-54
+            1464: -54,-54
+            1465: -41,-54
+            1466: -40,-54
+            1825: 68,-30
+            1826: 71,-30
+            1954: 28,-46
+            1955: 29,-46
+            2019: 16,-53
+            2020: 21,-53
+            2051: 22,-55
+            2052: 15,-55
+            2076: 10,-40
+            2077: 11,-40
+            2141: -42,-54
+            5942: -14,-25
+            5943: -15,-25
+            5944: -16,-25
+            6027: -3,43
+            6028: -2,43
+            6029: -1,43
+            6204: 49,-11
+            6205: 52,-11
+            6368: -29,-17
+            6410: 87,-21
+            6411: 89,-21
+            6412: 88,-21
+            6413: 90,-21
+            6414: 91,-21
+            6415: 92,-21
+            6669: 7,-49
+            6670: 8,-49
+            6671: 9,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
           decals:
-            2952: -30,36
-            2953: -29,36
-            2954: -28,36
-            2955: -27,36
-            2956: -26,36
-            2976: -30,36
-            2995: 77,-25
-            2996: 78,-25
-            2997: 79,-25
+            2892: -30,36
+            2893: -29,36
+            2894: -28,36
+            2895: -27,36
+            2896: -26,36
+            2916: -30,36
+            2935: 77,-25
+            2936: 78,-25
+            2937: 79,-25
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
@@ -1482,104 +1535,104 @@ entities:
             497: -34,2
             498: -30,1
             499: -30,2
-            714: -28,-34
-            715: -28,-33
-            716: -28,-32
-            717: -28,-31
-            718: -28,-30
-            719: -28,-29
-            720: -28,-28
-            721: -28,-28
-            722: -28,-28
-            723: -28,-27
-            724: -28,-26
-            725: -28,-25
-            726: -35,-15
-            727: -35,-14
-            728: -32,-15
-            729: -32,-14
-            730: -29,-15
-            731: -29,-14
-            740: -38,-15
-            741: -38,-14
-            788: -33,-40
-            789: -33,-39
-            798: -33,-37
-            808: -43,3
-            809: -43,4
-            810: -43,5
-            811: -43,-1
-            812: -43,-2
-            813: -43,-3
-            917: -48,10
-            918: -48,12
-            919: -48,13
-            967: -48,9
-            971: -50,11
-            1046: 38,-34
-            1054: 24,-33
-            1055: 24,-32
-            1056: 24,-31
-            1057: 24,-30
-            1144: -1,23
-            1145: -1,24
-            1146: -1,25
-            1166: -1,36
-            1167: -1,37
-            1168: -1,38
-            1239: -4,45
-            1240: -4,46
-            1241: -4,47
-            1285: 26,6
-            1286: 26,7
-            1287: 26,8
-            1415: 58,-35
-            1424: 56,-35
-            1879: 70,-30
-            1880: 70,-29
-            2083: 22,-58
-            2084: 22,-57
-            2085: 22,-55
-            2086: 22,-54
-            2114: 21,-60
+            689: -28,-34
+            690: -28,-33
+            691: -28,-32
+            692: -28,-31
+            693: -28,-30
+            694: -28,-29
+            695: -28,-28
+            696: -28,-28
+            697: -28,-28
+            698: -28,-27
+            699: -28,-26
+            700: -28,-25
+            701: -35,-15
+            702: -35,-14
+            703: -32,-15
+            704: -32,-14
+            705: -29,-15
+            706: -29,-14
+            715: -38,-15
+            716: -38,-14
+            763: -33,-40
+            764: -33,-39
+            773: -33,-37
+            783: -43,3
+            784: -43,4
+            785: -43,5
+            786: -43,-1
+            787: -43,-2
+            788: -43,-3
+            892: -48,10
+            893: -48,12
+            894: -48,13
+            942: -48,9
+            946: -50,11
+            1021: 38,-34
+            1029: 24,-33
+            1030: 24,-32
+            1031: 24,-31
+            1032: 24,-30
+            1119: -1,23
+            1120: -1,24
+            1121: -1,25
+            1141: -1,36
+            1142: -1,37
+            1143: -1,38
+            1214: -4,45
+            1215: -4,46
+            1216: -4,47
+            1260: 26,6
+            1261: 26,7
+            1262: 26,8
+            1390: 58,-35
+            1399: 56,-35
+            1819: 70,-30
+            1820: 70,-29
+            2023: 22,-58
+            2024: 22,-57
+            2025: 22,-55
+            2026: 22,-54
+            2054: 21,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNe
           decals:
             213: 7,-19
-            1158: -6,28
+            1133: -6,28
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSe
           decals:
-            7100: -29,12
+            6821: -29,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNe
           decals:
-            703: -39,-34
-            1948: 57,-21
-            6664: -33,-12
+            678: -39,-34
+            1888: 57,-21
+            6508: -33,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
           decals:
-            702: -30,-34
-            1947: 54,-21
-            6663: -33,-12
+            677: -30,-34
+            1887: 54,-21
+            6507: -33,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSe
           decals:
-            701: -39,-25
-            1949: 57,-23
+            676: -39,-25
+            1889: 57,-23
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSw
           decals:
-            700: -30,-25
-            1414: 44,5
-            1950: 54,-23
+            675: -30,-25
+            1389: 44,5
+            1890: 54,-23
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineE
@@ -1590,32 +1643,37 @@ entities:
             210: 7,-22
             211: 7,-21
             212: 7,-20
-            587: -34,-21
-            588: -34,-20
-            589: -34,-19
-            590: -34,-18
-            662: -39,-33
-            663: -39,-32
-            664: -39,-31
-            665: -39,-30
-            666: -39,-29
-            667: -39,-29
-            668: -39,-28
-            669: -39,-27
-            670: -39,-26
-            753: -39,-33
-            754: -39,-26
-            804: -52,0
-            805: -52,2
-            1164: -6,27
-            1165: -6,26
-            1856: 74,-15
-            1857: 74,-14
-            1858: 74,-17
-            1859: 74,-18
-            1860: 74,-19
-            7097: -29,13
-            7098: -29,14
+            565: -34,-21
+            637: -39,-33
+            638: -39,-32
+            639: -39,-31
+            640: -39,-30
+            641: -39,-29
+            642: -39,-29
+            643: -39,-28
+            644: -39,-27
+            645: -39,-26
+            728: -39,-33
+            729: -39,-26
+            779: -52,0
+            780: -52,2
+            1139: -6,27
+            1140: -6,26
+            1796: 74,-15
+            1797: 74,-14
+            1798: 74,-17
+            1799: 74,-18
+            1800: 74,-19
+            6818: -29,13
+            6819: -29,14
+            6964: -34,-18
+            6965: -34,-21
+            6966: -34,-20
+            6967: -34,-19
+            6968: -34,-18
+            6969: -34,-19
+            6970: -34,-20
+            6971: -34,-21
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
@@ -1626,446 +1684,432 @@ entities:
             386: -21,12
             387: -20,12
             388: -19,12
-            693: -35,-34
-            694: -35,-34
-            695: -34,-34
-            696: -33,-34
-            697: -32,-34
-            698: -31,-34
-            699: -31,-34
-            943: -50,-26
-            944: -46,-26
-            961: -50,-26
-            962: -46,-26
-            1074: 37,-4
-            1075: 38,-4
-            1076: 39,-4
-            1077: 36,-4
-            1159: -7,28
-            1160: -8,28
-            1161: -9,28
-            1162: -10,28
-            1163: -11,28
-            1875: 69,-28
-            1876: 70,-28
-            2115: 0,-37
-            2116: 1,-37
-            2121: 2,-37
-            2848: -27,27
-            2849: -26,27
-            2850: -25,27
-            6661: -34,-12
-            6662: -32,-12
-            6955: -22,10
-            7094: -32,16
-            7095: -31,16
-            7096: -30,16
+            668: -35,-34
+            669: -35,-34
+            670: -34,-34
+            671: -33,-34
+            672: -32,-34
+            673: -31,-34
+            674: -31,-34
+            918: -50,-26
+            919: -46,-26
+            936: -50,-26
+            937: -46,-26
+            1049: 37,-4
+            1050: 38,-4
+            1051: 39,-4
+            1052: 36,-4
+            1134: -7,28
+            1135: -8,28
+            1136: -9,28
+            1137: -10,28
+            1138: -11,28
+            1815: 69,-28
+            1816: 70,-28
+            2055: 0,-37
+            2056: 1,-37
+            2061: 2,-37
+            2788: -27,27
+            2789: -26,27
+            2790: -25,27
+            6505: -34,-12
+            6506: -32,-12
+            6815: -32,16
+            6816: -31,16
+            6817: -30,16
+            6962: -22,10
+            6963: -21,10
         - node:
             cleanable: True
             color: '#FFFFFF35'
             id: BrickTileSteelLineS
           decals:
-            6091: 83,-35
+            5963: 83,-35
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
           decals:
-            683: -38,-25
-            684: -36,-25
-            685: -36,-25
-            686: -37,-25
-            687: -36,-25
-            688: -35,-25
-            689: -34,-25
-            690: -33,-25
-            691: -31,-25
-            692: -32,-25
-            945: -50,-31
-            946: -46,-31
-            959: -50,-31
-            960: -46,-31
-            1071: 36,-1
-            1072: 37,-1
-            1073: 39,-1
-            1078: 38,-1
-            1101: -48,-16
-            1102: -49,-16
-            1103: -50,-16
-            1104: -51,-16
-            1411: 40,5
-            1412: 42,5
-            1413: 43,5
-            1476: 41,5
-            3030: 51,22
-            3031: 50,22
-            3032: 52,22
-            6522: -34,-17
-            6523: -33,-17
-            6958: -22,10
-            7099: -32,12
+            658: -38,-25
+            659: -36,-25
+            660: -36,-25
+            661: -37,-25
+            662: -36,-25
+            663: -35,-25
+            664: -34,-25
+            665: -33,-25
+            666: -31,-25
+            667: -32,-25
+            920: -50,-31
+            921: -46,-31
+            934: -50,-31
+            935: -46,-31
+            1046: 36,-1
+            1047: 37,-1
+            1048: 39,-1
+            1053: 38,-1
+            1076: -48,-16
+            1077: -49,-16
+            1078: -50,-16
+            1079: -51,-16
+            1386: 40,5
+            1387: 42,5
+            1388: 43,5
+            1427: 41,5
+            2970: 51,22
+            2971: 50,22
+            2972: 52,22
+            6366: -34,-17
+            6367: -33,-17
+            6820: -32,12
+            6960: -22,10
+            6961: -21,10
         - node:
             cleanable: True
             color: '#FFFFFF35'
             id: BrickTileSteelLineW
           decals:
-            6090: 81,-34
+            5962: 81,-34
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
           decals:
-            671: -30,-33
-            672: -30,-32
-            673: -30,-31
-            674: -30,-31
-            675: -30,-30
-            676: -30,-30
-            677: -30,-29
-            678: -30,-29
-            679: -30,-28
-            680: -30,-27
-            681: -30,-27
-            682: -30,-26
-            755: -30,-26
-            756: -30,-33
-            806: -43,0
-            807: -43,2
-            1122: 3,23
-            1123: 3,24
-            1124: 3,25
-            1129: -6,33
-            1130: -6,34
-            1408: 44,1
-            1409: 44,2
-            1410: 44,3
-            1446: 44,4
-            7090: -35,13
-            7091: -35,14
-            7092: -35,14
-            7093: -35,15
+            646: -30,-33
+            647: -30,-32
+            648: -30,-31
+            649: -30,-31
+            650: -30,-30
+            651: -30,-30
+            652: -30,-29
+            653: -30,-29
+            654: -30,-28
+            655: -30,-27
+            656: -30,-27
+            657: -30,-26
+            730: -30,-26
+            731: -30,-33
+            781: -43,0
+            782: -43,2
+            1097: 3,23
+            1098: 3,24
+            1099: 3,25
+            1104: -6,33
+            1105: -6,34
+            1383: 44,1
+            1384: 44,2
+            1385: 44,3
+            1421: 44,4
+            6811: -35,13
+            6812: -35,14
+            6813: -35,14
+            6814: -35,15
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerNe
           decals:
-            1349: 28,15
-            1382: 28,8
-            1399: 36,22
-            1400: 27,14
+            1324: 28,15
+            1357: 28,8
+            1374: 36,22
+            1375: 27,14
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerNe
           decals:
-            1791: 60,-13
-            1813: 70,-12
+            1731: 60,-13
+            1753: 70,-12
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNe
           decals:
-            6653: 52,-26
+            6497: 52,-26
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
-            2825: -4,14
+            2765: -4,14
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
-            2961: -25,38
+            2901: -25,38
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerNw
           decals:
-            1398: 33,22
-            1403: 26,14
+            1373: 33,22
+            1378: 26,14
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerNw
           decals:
-            1792: 58,-13
-            1816: 68,-12
+            1732: 58,-13
+            1756: 68,-12
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNw
           decals:
-            6652: 51,-26
+            6496: 51,-26
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
           decals:
-            2181: -54,9
-            2824: -2,14
+            2121: -54,9
+            2764: -2,14
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
           decals:
-            2960: -30,38
+            2900: -30,38
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSe
           decals:
-            1348: 28,10
-            1381: 28,6
-            1397: 36,17
-            1401: 27,11
+            1323: 28,10
+            1356: 28,6
+            1372: 36,17
+            1376: 27,11
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerSe
           decals:
-            1793: 60,-14
-            1814: 70,-14
+            1733: 60,-14
+            1754: 70,-14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSe
           decals:
-            6651: 52,-27
+            6495: 52,-27
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSw
           decals:
-            1402: 26,11
+            1377: 26,11
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerSw
           decals:
-            1794: 58,-14
-            1815: 68,-14
+            1734: 58,-14
+            1755: 68,-14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSw
           decals:
-            6654: 51,-27
+            6498: 51,-27
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteEndE
           decals:
-            2847: 63,9
+            2787: 63,9
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNe
           decals:
-            1013: 46,-38
-            1015: 46,-38
-            1050: 37,-34
+            988: 46,-38
+            990: 46,-38
+            1025: 37,-34
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerNe
           decals:
-            1478: 41,5
-            1756: 57,-7
-            6334: 48,-1
-            6351: 49,-7
+            1429: 41,5
+            6178: 48,-1
+            6195: 49,-7
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerNe
           decals:
-            1384: 26,8
+            1359: 26,8
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerNe
           decals:
-            1325: -18,27
-        - node:
-            color: '#EFB34196'
-            id: BrickTileWhiteInnerNe
-          decals:
-            1461: 41,11
+            1300: -18,27
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNw
           decals:
-            1045: 43,-34
+            1020: 43,-34
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerNw
           decals:
-            1477: 45,5
-            6333: 52,-1
-            6350: 51,-7
-        - node:
-            color: '#EFB34196'
-            id: BrickTileWhiteInnerNw
-          decals:
-            1460: 47,11
+            1428: 45,5
+            6177: 52,-1
+            6194: 51,-7
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerSe
           decals:
-            1008: 46,-37
+            983: 46,-37
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSe
           decals:
-            1480: 45,4
-            6332: 48,-8
-            6349: 49,-2
-            6353: 50,-8
+            1431: 45,4
+            6176: 48,-8
+            6193: 49,-2
+            6197: 50,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerSe
           decals:
-            1379: 31,23
-            1383: 26,6
+            1354: 31,23
+            1358: 26,6
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerSe
           decals:
-            1211: -15,26
-            1212: -11,26
-            1213: -7,26
-            1254: -4,45
-            1324: -18,29
-        - node:
-            color: '#EFB34196'
-            id: BrickTileWhiteInnerSe
-          decals:
-            1459: 41,13
+            1186: -15,26
+            1187: -11,26
+            1188: -7,26
+            1229: -4,45
+            1299: -18,29
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSw
           decals:
-            6331: 52,-8
-            6348: 51,-2
-            6352: 50,-8
+            6175: 52,-8
+            6192: 51,-2
+            6196: 50,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerSw
           decals:
-            1380: 30,17
+            1355: 30,17
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerSw
           decals:
-            1209: -13,26
-            1210: -9,26
-            1253: 0,45
+            1184: -13,26
+            1185: -9,26
+            1228: 0,45
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerSw
           decals:
             183: 5,-24
-            1458: 47,13
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineE
           decals:
-            1009: 46,-37
-            1010: 46,-36
-            1011: 46,-35
-            1012: 46,-34
+            984: 46,-37
+            985: 46,-36
+            986: 46,-35
+            987: 46,-34
         - node:
             color: '#52B4E93E'
             id: BrickTileWhiteLineE
           decals:
-            6804: 51,6
-            6805: 51,6
-            6806: 51,6
+            6646: 51,6
+            6647: 51,6
+            6648: 51,6
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
           decals:
-            1753: 57,-6
-            1754: 57,-5
-            1755: 57,-4
-            6237: 42,9
-            6238: 42,7
-            6244: 47,9
-            6245: 47,8
-            6246: 47,7
-            6262: 51,1
-            6263: 51,2
-            6264: 51,3
-            6265: 51,4
-            6266: 51,7
-            6267: 51,8
-            6268: 51,9
-            6269: 51,10
-            6270: 51,11
-            6271: 51,12
-            6272: 51,13
-            6273: 51,14
-            6274: 51,15
-            6279: 56,10
-            6280: 56,11
-            6281: 56,12
-            6285: 56,6
-            6286: 56,7
-            6287: 56,8
-            6323: 52,-1
-            6324: 52,-2
-            6325: 52,-3
-            6326: 52,-4
-            6327: 52,-5
-            6328: 52,-6
-            6329: 52,-7
-            6330: 52,-8
-            6344: 49,-6
-            6345: 49,-5
-            6346: 49,-4
-            6347: 49,-3
+            6081: 42,9
+            6082: 42,7
+            6088: 47,9
+            6089: 47,8
+            6090: 47,7
+            6106: 51,1
+            6107: 51,2
+            6108: 51,3
+            6109: 51,4
+            6110: 51,7
+            6111: 51,8
+            6112: 51,9
+            6113: 51,10
+            6114: 51,11
+            6115: 51,12
+            6116: 51,13
+            6117: 51,14
+            6118: 51,15
+            6123: 56,10
+            6124: 56,11
+            6125: 56,12
+            6129: 56,6
+            6130: 56,7
+            6131: 56,8
+            6167: 52,-1
+            6168: 52,-2
+            6169: 52,-3
+            6170: 52,-4
+            6171: 52,-5
+            6172: 52,-6
+            6173: 52,-7
+            6174: 52,-8
+            6188: 49,-6
+            6189: 49,-5
+            6190: 49,-4
+            6191: 49,-3
+            6987: 61,-7
+            6988: 61,-6
+            6989: 61,-5
+            6990: 61,-4
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineE
           decals:
-            1736: 61,17
-            1737: 61,16
-            1738: 61,15
-            1739: 61,14
+            1686: 61,17
+            1687: 61,16
+            1688: 61,15
+            1689: 61,14
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineE
           decals:
-            1332: 28,7
-            1341: 28,14
-            1342: 28,13
-            1343: 28,12
-            1344: 28,11
-            1361: 31,22
-            1362: 31,21
-            1363: 31,20
-            1364: 31,19
-            1365: 31,18
-            1366: 31,17
-            1367: 31,16
-            1368: 31,15
-            1369: 31,14
-            1370: 31,13
-            1371: 31,12
-            1387: 36,19
-            1388: 36,20
-            1389: 36,21
-            1394: 36,18
-            1404: 27,13
-            1405: 27,12
+            1307: 28,7
+            1316: 28,14
+            1317: 28,13
+            1318: 28,12
+            1319: 28,11
+            1336: 31,22
+            1337: 31,21
+            1338: 31,20
+            1339: 31,19
+            1340: 31,18
+            1341: 31,17
+            1342: 31,16
+            1343: 31,15
+            1344: 31,14
+            1345: 31,13
+            1346: 31,12
+            1362: 36,19
+            1363: 36,20
+            1364: 36,21
+            1369: 36,18
+            1379: 27,13
+            1380: 27,12
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineE
           decals:
-            1817: 70,-13
-            1821: 65,-21
-            1822: 65,-20
-            1823: 65,-19
-            1824: 65,-18
-            1825: 65,-17
-            1826: 65,-16
-            1827: 65,-15
-            1828: 65,-14
-            1829: 65,-13
-            1830: 65,-12
-            1904: 71,-27
-            1905: 71,-26
+            1757: 70,-13
+            1761: 65,-21
+            1762: 65,-20
+            1763: 65,-19
+            1764: 65,-18
+            1765: 65,-17
+            1766: 65,-16
+            1767: 65,-15
+            1768: 65,-14
+            1769: 65,-13
+            1770: 65,-12
+            1844: 71,-27
+            1845: 71,-26
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineE
           decals:
-            1134: -1,23
-            1135: -1,24
-            1142: -1,25
-            1323: -18,28
-            6591: -37,-44
-            6592: -37,-45
-            6605: -37,-46
+            1109: -1,23
+            1110: -1,24
+            1117: -1,25
+            1298: -18,28
+            6435: -37,-44
+            6436: -37,-45
+            6449: -37,-46
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineE
@@ -2073,77 +2117,70 @@ entities:
             177: 2,-22
             235: 10,-23
             236: 10,-22
-            1457: 41,12
-            1467: 47,13
-            1468: 47,11
-            2158: -4,-37
-            2159: -4,-35
-            2862: -39,-38
+            2098: -4,-37
+            2099: -4,-35
+            2802: -39,-38
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineE
           decals:
-            2959: -25,37
-            2966: -32,38
-            2967: -32,37
-            2968: -32,36
-            2969: -32,35
-            2970: -32,34
+            2899: -25,37
+            2906: -32,38
+            2907: -32,37
+            2908: -32,36
+            2909: -32,35
+            2910: -32,34
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineE
           decals:
-            1264: 2,40
+            1239: 2,40
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineN
           decals:
-            1016: 39,-34
-            1017: 40,-34
-            1018: 41,-34
-            1048: 38,-34
-            1049: 42,-34
-            1971: 19,-36
-            1972: 20,-36
-            1976: 21,-36
-            2006: 24,-46
+            991: 39,-34
+            992: 40,-34
+            993: 41,-34
+            1023: 38,-34
+            1024: 42,-34
+            1911: 19,-36
+            1912: 20,-36
+            1916: 21,-36
+            1946: 24,-46
         - node:
             color: '#474F52A7'
             id: BrickTileWhiteLineN
           decals:
-            1214: -16,24
-            1215: -15,24
-            1216: -14,24
-            1217: -12,24
-            1218: -11,24
-            1219: -10,24
-            1220: -8,24
-            1221: -7,24
-            1222: -6,24
+            1189: -16,24
+            1190: -15,24
+            1191: -14,24
+            1192: -12,24
+            1193: -11,24
+            1194: -10,24
+            1195: -8,24
+            1196: -7,24
+            1197: -6,24
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineN
           decals:
-            1473: 43,5
-            1474: 42,5
-            1475: 44,5
-            1720: 59,4
-            1721: 60,4
-            1749: 58,-7
-            1750: 59,-7
-            1751: 60,-7
-            1752: 61,-7
-            6296: 53,3
-            6297: 54,3
-            6298: 55,3
-            6299: 57,3
-            6335: 51,-1
-            6336: 50,-1
-            6337: 49,-1
-            6357: 49,-10
-            6358: 50,-10
-            6359: 51,-10
+            1424: 43,5
+            1425: 42,5
+            1426: 44,5
+            1670: 59,4
+            1671: 60,4
+            6140: 53,3
+            6141: 54,3
+            6142: 55,3
+            6143: 57,3
+            6179: 51,-1
+            6180: 50,-1
+            6181: 49,-1
+            6201: 49,-10
+            6202: 50,-10
+            6203: 51,-10
         - node:
             color: '#79150096'
             id: BrickTileWhiteLineN
@@ -2153,49 +2190,49 @@ entities:
             color: '#9FED5896'
             id: BrickTileWhiteLineN
           decals:
-            1262: -1,53
-            1263: 0,53
-            2004: 24,-43
+            1237: -1,53
+            1238: 0,53
+            1944: 24,-43
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineN
           decals:
-            1330: 27,8
-            1338: 25,15
-            1339: 26,15
-            1340: 27,15
-            1395: 34,22
-            1396: 35,22
+            1305: 27,8
+            1313: 25,15
+            1314: 26,15
+            1315: 27,15
+            1370: 34,22
+            1371: 35,22
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineN
           decals:
-            1773: 63,-23
-            1774: 64,-23
-            1775: 65,-23
-            1780: 61,-23
-            1781: 62,-23
-            1795: 59,-13
-            1819: 69,-12
-            1842: 77,-13
-            1843: 75,-13
-            1844: 77,-17
-            1845: 75,-17
-            3149: 76,-13
-            3152: 76,-17
+            1713: 63,-23
+            1714: 64,-23
+            1715: 65,-23
+            1720: 61,-23
+            1721: 62,-23
+            1735: 59,-13
+            1759: 69,-12
+            1782: 77,-13
+            1783: 75,-13
+            1784: 77,-17
+            1785: 75,-17
+            3084: 76,-13
+            3087: 76,-17
         - node:
             color: '#D4D4D496'
             id: BrickTileWhiteLineN
           decals:
-            2005: 25,-43
+            1945: 25,-43
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineN
           decals:
-            1203: -3,32
-            1204: -2,32
-            1205: -1,32
-            2007: 25,-46
+            1178: -3,32
+            1179: -2,32
+            1180: -1,32
+            1947: 25,-46
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineN
@@ -2212,32 +2249,32 @@ entities:
             284: 19,-21
             285: 20,-21
             286: 21,-21
-            1450: 42,11
-            1451: 43,11
-            1452: 46,11
-            1453: 45,11
-            2155: 0,-35
-            2156: 1,-35
-            2182: -53,9
-            2860: -62,-21
-            2861: -61,-21
+            2095: 0,-35
+            2096: 1,-35
+            2122: -53,9
+            2800: -62,-21
+            2801: -61,-21
+            6905: 43,13
+            6906: 44,13
+            6907: 45,13
+            6934: 47,13
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineN
           decals:
-            2962: -29,38
-            2963: -28,38
-            2964: -27,38
-            2965: -26,38
+            2902: -29,38
+            2903: -28,38
+            2904: -27,38
+            2905: -26,38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineN
           decals:
-            2212: 13,25
-            2213: 14,25
-            2214: 15,25
-            6136: 14,22
+            2152: 13,25
+            2153: 14,25
+            2154: 15,25
+            6008: 14,22
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineS
@@ -2248,43 +2285,43 @@ entities:
             356: 47,-22
             357: 48,-22
             358: 49,-22
-            1973: 19,-39
-            1974: 20,-39
-            1975: 21,-39
-            6632: 52,-37
-            6633: 51,-37
+            1913: 19,-39
+            1914: 20,-39
+            1915: 21,-39
+            6476: 52,-37
+            6477: 51,-37
         - node:
             color: '#474F52A7'
             id: BrickTileWhiteLineS
           decals:
-            1223: -12,23
-            1224: -11,23
-            1225: -10,23
-            1226: -14,23
-            1227: -15,23
-            1228: -16,23
-            1229: -8,23
-            1230: -6,23
-            1231: -7,23
+            1198: -12,23
+            1199: -11,23
+            1200: -10,23
+            1201: -14,23
+            1202: -15,23
+            1203: -16,23
+            1204: -8,23
+            1205: -6,23
+            1206: -7,23
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineS
           decals:
-            1479: 46,4
-            1718: 60,0
-            1719: 59,0
-            2010: 24,-46
-            6300: 57,2
-            6301: 56,2
-            6302: 55,2
-            6303: 54,2
-            6304: 53,2
-            6338: 49,-8
-            6339: 51,-8
-            6354: 48,-11
-            6355: 51,-11
-            6356: 53,-11
-            6362: 50,-11
+            1430: 46,4
+            1668: 60,0
+            1669: 59,0
+            1950: 24,-46
+            6144: 57,2
+            6145: 56,2
+            6146: 55,2
+            6147: 54,2
+            6148: 53,2
+            6182: 49,-8
+            6183: 51,-8
+            6198: 48,-11
+            6199: 51,-11
+            6200: 53,-11
+            6206: 50,-11
         - node:
             color: '#79150096'
             id: BrickTileWhiteLineS
@@ -2294,59 +2331,59 @@ entities:
             color: '#9FED5896'
             id: BrickTileWhiteLineS
           decals:
-            1256: -3,50
-            1257: -1,50
-            1258: -2,50
-            1259: 0,50
-            1260: 1,50
-            1261: 2,50
+            1231: -3,50
+            1232: -1,50
+            1233: -2,50
+            1234: 0,50
+            1235: 1,50
+            1236: 2,50
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineS
           decals:
-            1331: 27,6
-            1345: 25,10
-            1346: 26,10
-            1347: 27,10
-            1350: 23,17
-            1351: 24,17
-            1352: 25,17
-            1353: 26,17
-            1354: 27,17
-            1355: 28,17
-            1385: 34,17
-            1386: 35,17
-            2008: 24,-43
+            1306: 27,6
+            1320: 25,10
+            1321: 26,10
+            1322: 27,10
+            1325: 23,17
+            1326: 24,17
+            1327: 25,17
+            1328: 26,17
+            1329: 27,17
+            1330: 28,17
+            1360: 34,17
+            1361: 35,17
+            1948: 24,-43
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineS
           decals:
-            1776: 63,-27
-            1777: 64,-27
-            1778: 65,-27
-            1779: 66,-27
-            1796: 59,-14
-            1797: 58,-15
-            1798: 59,-15
-            1799: 60,-15
-            1818: 69,-14
-            1846: 75,-19
-            1847: 77,-19
-            1848: 75,-15
-            1849: 77,-15
-            2011: 25,-43
-            3150: 76,-15
-            3151: 76,-19
+            1716: 63,-27
+            1717: 64,-27
+            1718: 65,-27
+            1719: 66,-27
+            1736: 59,-14
+            1737: 58,-15
+            1738: 59,-15
+            1739: 60,-15
+            1758: 69,-14
+            1786: 75,-19
+            1787: 77,-19
+            1788: 75,-15
+            1789: 77,-15
+            1951: 25,-43
+            3085: 76,-15
+            3086: 76,-19
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
           decals:
-            1206: -10,26
-            1207: -14,26
-            1208: -6,26
-            1250: -3,45
-            1251: -2,45
-            1252: -1,45
+            1181: -10,26
+            1182: -14,26
+            1183: -6,26
+            1225: -3,45
+            1226: -2,45
+            1227: -1,45
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineS
@@ -2366,138 +2403,142 @@ entities:
             237: 7,-25
             282: 21,-23
             283: 20,-23
-            1454: 44,13
-            1455: 45,13
-            1456: 46,13
-            2009: 25,-46
-            2128: 9,-41
-            2836: 61,-31
-            2837: 62,-31
-            2838: 63,-31
-            6164: 42,13
+            1949: 25,-46
+            2068: 9,-41
+            2776: 61,-31
+            2777: 62,-31
+            2778: 63,-31
+            6902: 43,13
+            6903: 44,13
+            6904: 45,13
+            6933: 47,13
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineS
           decals:
-            1443: 45,4
-            1444: 46,4
-            1445: 44,4
+            1418: 45,4
+            1419: 46,4
+            1420: 44,4
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineW
           decals:
-            1005: 34,-34
-            1006: 34,-35
-            1007: 34,-36
-            1439: 54,-36
-            1440: 54,-35
-            1441: 54,-34
-            1442: 54,-33
+            980: 34,-34
+            981: 34,-35
+            982: 34,-36
+            1414: 54,-36
+            1415: 54,-35
+            1416: 54,-34
+            1417: 54,-33
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
           decals:
-            6239: 46,7
-            6240: 46,9
-            6241: 41,9
-            6242: 41,8
-            6243: 41,7
-            6247: 49,1
-            6248: 49,2
-            6249: 49,3
-            6250: 49,4
-            6251: 49,5
-            6252: 49,6
-            6253: 49,7
-            6254: 49,8
-            6255: 49,9
-            6256: 49,10
-            6257: 49,11
-            6258: 49,12
-            6259: 49,13
-            6260: 49,14
-            6261: 49,15
-            6282: 53,6
-            6283: 53,7
-            6284: 53,8
-            6315: 48,-8
-            6316: 48,-7
-            6317: 48,-6
-            6318: 48,-5
-            6319: 48,-4
-            6320: 48,-3
-            6321: 48,-2
-            6322: 48,-1
-            6340: 51,-6
-            6341: 51,-5
-            6342: 51,-4
-            6343: 51,-3
+            6083: 46,7
+            6084: 46,9
+            6085: 41,9
+            6086: 41,8
+            6087: 41,7
+            6091: 49,1
+            6092: 49,2
+            6093: 49,3
+            6094: 49,4
+            6095: 49,5
+            6096: 49,6
+            6097: 49,7
+            6098: 49,8
+            6099: 49,9
+            6100: 49,10
+            6101: 49,11
+            6102: 49,12
+            6103: 49,13
+            6104: 49,14
+            6105: 49,15
+            6126: 53,6
+            6127: 53,7
+            6128: 53,8
+            6159: 48,-8
+            6160: 48,-7
+            6161: 48,-6
+            6162: 48,-5
+            6163: 48,-4
+            6164: 48,-3
+            6165: 48,-2
+            6166: 48,-1
+            6184: 51,-6
+            6185: 51,-5
+            6186: 51,-4
+            6187: 51,-3
+            6986: 57,-7
+            6994: 57,-6
+            6995: 57,-5
+            6996: 57,-4
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineW
           decals:
-            1740: 57,16
-            1741: 57,17
+            1690: 57,16
+            1691: 57,17
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineW
           decals:
-            1333: 30,7
-            1334: 30,8
-            1335: 30,9
-            1336: 30,10
-            1337: 30,6
-            1356: 30,16
-            1357: 30,15
-            1358: 30,14
-            1359: 30,13
-            1360: 30,12
-            1372: 33,15
-            1373: 33,14
-            1374: 33,13
-            1375: 33,12
-            1390: 33,18
-            1391: 33,19
-            1392: 33,20
-            1393: 33,21
-            1406: 26,12
-            1407: 26,13
+            1308: 30,7
+            1309: 30,8
+            1310: 30,9
+            1311: 30,10
+            1312: 30,6
+            1331: 30,16
+            1332: 30,15
+            1333: 30,14
+            1334: 30,13
+            1335: 30,12
+            1347: 33,15
+            1348: 33,14
+            1349: 33,13
+            1350: 33,12
+            1365: 33,18
+            1366: 33,19
+            1367: 33,20
+            1368: 33,21
+            1381: 26,12
+            1382: 26,13
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineW
           decals:
-            1820: 68,-13
-            1831: 63,-21
-            1832: 63,-20
-            1833: 63,-19
-            1834: 63,-17
-            1835: 63,-18
-            1836: 63,-16
-            1837: 63,-15
-            1838: 63,-14
-            1839: 63,-13
-            1840: 63,-12
-            1899: 68,-23
-            1900: 68,-22
-            1901: 68,-21
-            1902: 68,-24
-            1906: 68,-27
-            1907: 68,-26
+            1760: 68,-13
+            1771: 63,-21
+            1772: 63,-20
+            1773: 63,-19
+            1774: 63,-17
+            1775: 63,-18
+            1776: 63,-16
+            1777: 63,-15
+            1778: 63,-14
+            1779: 63,-13
+            1780: 63,-12
+            1839: 68,-23
+            1840: 68,-22
+            1841: 68,-21
+            1842: 68,-24
+            1846: 68,-27
+            1847: 68,-26
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineW
           decals:
-            1132: -4,23
-            1133: -4,24
-            1143: -4,25
+            1107: -4,23
+            1108: -4,24
+            1118: -4,25
         - node:
             color: '#EFB34131'
             id: BrickTileWhiteLineW
           decals:
-            6777: 14,39
-            6778: 14,40
-            6779: 14,41
-            6780: 14,42
+            6619: 14,39
+            6620: 14,40
+            6621: 14,41
+            6622: 14,42
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineW
@@ -2511,75 +2552,72 @@ entities:
             182: 5,-25
             216: 4,-19
             220: 4,-22
-            1469: 41,11
-            1470: 41,12
-            1471: 41,13
-            2126: 8,-40
-            2127: 8,-39
-            2157: -2,-36
-            2160: -6,-37
-            2161: -6,-36
-            2162: -6,-35
-            2171: 39,-15
-            2172: 39,-17
-            2173: 39,-16
-            2854: -22,34
-            2855: -22,35
+            2066: 8,-40
+            2067: 8,-39
+            2097: -2,-36
+            2100: -6,-37
+            2101: -6,-36
+            2102: -6,-35
+            2111: 39,-15
+            2112: 39,-17
+            2113: 39,-16
+            2794: -22,34
+            2795: -22,35
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineW
           decals:
-            2957: -30,36
-            2958: -30,37
-            2971: -34,34
-            2972: -34,35
-            2973: -34,36
-            2974: -34,37
-            2975: -34,38
+            2897: -30,36
+            2898: -30,37
+            2911: -34,34
+            2912: -34,35
+            2913: -34,36
+            2914: -34,37
+            2915: -34,38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineW
           decals:
-            1265: -6,40
+            1240: -6,40
         - node:
             color: '#FFFFFFFF'
             id: BushAOne
           decals:
             559: -24,5
-            864: -48,4
-            870: -51,-2
-            1487: -52,-49
-            1726: 59,19
-            1744: 57,18
+            839: -48,4
+            845: -51,-2
+            1437: -52,-49
+            1676: 59,19
+            1694: 57,18
         - node:
             color: '#FFFFFFFF'
             id: BushAThree
           decals:
             526: -39,7
-            865: -50,-2
-            928: -49,-30
+            840: -50,-2
+            903: -49,-30
         - node:
             color: '#FFFFFFFF'
             id: BushATwo
           decals:
-            6867: 57.061016,-21.004225
+            6709: 57.061016,-21.004225
         - node:
             color: '#FFFFFFFF'
             id: BushCOne
           decals:
-            862: -45,4
-            1929: 56,-21
+            837: -45,4
+            1869: 56,-21
         - node:
             color: '#FFFFFFFF'
             id: BushCThree
           decals:
             320: 26,-24
             527: -40,6
-            866: -48,-2
-            1105: 42,-30
-            1483: -49,-49
-            2226: 24,1
+            841: -48,-2
+            1080: 42,-30
+            1433: -49,-49
+            2166: 24,1
         - node:
             color: '#FFFFFFFF'
             id: BushCTwo
@@ -2587,82 +2625,82 @@ entities:
             36: -4,-12
             321: 26,-23
             525: -38,6
-            1484: -46,-49
-            1930: 56,-22
+            1434: -46,-49
+            1870: 56,-22
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BushCTwo
           decals:
-            3001: 81,-8
+            2941: 81,-8
         - node:
             color: '#FFFFFFFF'
             id: BushDThree
           decals:
-            6869: 54.199055,-22.34959
+            6711: 54.199055,-22.34959
         - node:
             color: '#FFFFFFFF'
             id: BushDTwo
           decals:
-            871: -49,4
+            846: -49,4
         - node:
             color: '#FFFFFFFF'
             id: Busha1
           decals:
             523: -39,5
-            925: -48,-28
-            1932: 57,-23
-            1951: 54,-23
+            900: -48,-28
+            1872: 57,-23
+            1891: 54,-23
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Busha1
           decals:
-            3002: 82,-6
+            2942: 82,-6
         - node:
             color: '#FFFFFFFF'
             id: Busha2
           decals:
             531: -30,7
-            926: -47,-29
-            1725: 58,19
-            1931: 55,-23
+            901: -47,-29
+            1675: 58,19
+            1871: 55,-23
         - node:
             color: '#FFFFFFFF'
             id: Busha3
           decals:
             319: 25,-24
             529: -30,5
-            863: -47,4
-            1486: -44,-49
+            838: -47,4
+            1436: -44,-49
         - node:
             color: '#FFFFFFFF'
             id: Bushb1
           decals:
             316: 25,-21
-            868: -46,-2
-            869: -44,-2
+            843: -46,-2
+            844: -44,-2
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushb1
           decals:
-            2999: 81,-7
+            2939: 81,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushb2
           decals:
             558: -24,7
-            916: -47,-8
-            1743: 57,19
-            1927: 54,-21
+            891: -47,-8
+            1693: 57,19
+            1867: 54,-21
         - node:
             color: '#FFFFFFFF'
             id: Bushb3
           decals:
             317: 26,-22
-            861: -50,4
-            927: -48,-30
+            836: -50,4
+            902: -48,-30
         - node:
             color: '#FFFFFFFF'
             id: Bushc1
@@ -2670,45 +2708,45 @@ entities:
             318: 25,-23
             524: -39,6
             530: -29,6
-            867: -45,-2
-            929: -49,-27
-            1928: 55,-22
+            842: -45,-2
+            904: -49,-27
+            1868: 55,-22
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushc1
           decals:
-            3000: 82,-7
+            2940: 82,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushc2
           decals:
             528: -28,6
-            1485: -47,-49
-            2228: 25,1
+            1435: -47,-49
+            2168: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Bushc3
           decals:
             35: -5,-12
-            1482: -51,-49
-            2227: 26,1
+            1432: -51,-49
+            2167: 26,1
         - node:
             color: '#FFFFFFFF'
             id: Bushd2
           decals:
-            873: -49,-2
+            848: -49,-2
         - node:
             color: '#FFFFFFFF'
             id: Bushd4
           decals:
-            872: -44,4
-            6868: 56.804173,-21.505678
+            847: -44,4
+            6710: 56.804173,-21.505678
         - node:
             color: '#FFFFFFFF'
             id: Bushg2
           decals:
-            6870: 56.804173,-21.884827
+            6712: 56.804173,-21.884827
         - node:
             color: '#FFFFFFFF'
             id: Bushh1
@@ -2726,58 +2764,58 @@ entities:
           decals:
             534: -29,5
             560: -24,4
-            875: -47,-2
-            930: -48,-29
-            1489: -48,-49
-            1727: 60,19
-            6871: 57.220013,-21.982672
+            850: -47,-2
+            905: -48,-29
+            1439: -48,-49
+            1677: 60,19
+            6713: 57.220013,-21.982672
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushi1
           decals:
-            3005: 80,-7
+            2945: 80,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushi2
           decals:
             322: 25,-22
-            876: -51,4
-            913: -48,-8
-            914: -51,-9
-            1933: 54,-22
-            1952: 53.45864,-23.10261
-            2229: 24,1
+            851: -51,4
+            888: -48,-8
+            889: -51,-9
+            1873: 54,-22
+            1892: 53.45864,-23.10261
+            2169: 24,1
         - node:
             color: '#FFFFFFFF'
             id: Bushi3
           decals:
             532: -38,5
-            931: -47,-27
-            1488: -50,-49
+            906: -47,-27
+            1438: -50,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushi3
           decals:
-            3003: 82,-8
+            2943: 82,-8
         - node:
             color: '#FFFFFFFF'
             id: Bushi4
           decals:
             533: -40,7
-            874: -46,4
-            915: -46,-7
-            1106: 42,-31
-            1490: -45,-49
-            1934: 56,-23
-            1940: 57.568016,-22.290323
+            849: -46,4
+            890: -46,-7
+            1081: 42,-31
+            1440: -45,-49
+            1874: 56,-23
+            1880: 57.568016,-22.290323
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushi4
           decals:
-            3004: 81,-6
+            2944: 81,-6
         - node:
             color: '#FFFFFFFF'
             id: Bushj3
@@ -2797,82 +2835,71 @@ entities:
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            1984: 24,-37
-            1988: 23,-37
-            1989: 25,-37
+            1924: 24,-37
+            1928: 23,-37
+            1929: 25,-37
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            1985: 24,-38
-            1986: 23,-38
-            1987: 25,-38
-        - node:
-            color: '#EFB34196'
-            id: CheckerNESW
-          decals:
-            1462: 42,12
-            1463: 43,12
-            1464: 44,12
-            1465: 45,12
-            1466: 46,12
-            6167: 46,15
-            6168: 46,14
+            1925: 24,-38
+            1926: 23,-38
+            1927: 25,-38
         - node:
             color: '#334E6DC8'
             id: CheckerNWSE
           decals:
-            1980: 20,-37
-            1981: 21,-37
-            1982: 21,-38
-            1983: 20,-38
+            1920: 20,-37
+            1921: 21,-37
+            1922: 21,-38
+            1923: 20,-38
         - node:
             color: '#474F528F'
             id: CheckerNWSE
           decals:
-            2204: -17,11
-            2205: -16,11
-            2206: -16,12
-            2207: -17,12
-            2208: -17,13
-            2209: -16,13
-            2210: -16,14
-            2211: -17,14
+            2144: -17,11
+            2145: -16,11
+            2146: -16,12
+            2147: -17,12
+            2148: -17,13
+            2149: -16,13
+            2150: -16,14
+            2151: -17,14
         - node:
             color: '#52B4E996'
             id: CheckerNWSE
           decals:
-            1759: 55,-5
-            1760: 55,-4
-            1761: 56,-4
-            1762: 56,-5
-            1763: 53,-5
-            1764: 53,-4
+            1699: 55,-5
+            1700: 55,-4
+            1701: 56,-4
+            1702: 56,-5
+            1703: 53,-5
+            1704: 53,-4
         - node:
             color: '#D381C996'
             id: CheckerNWSE
           decals:
-            1841: 66,-21
+            1781: 66,-21
         - node:
             color: '#DE3A3A41'
             id: CheckerNWSE
           decals:
-            6593: -36,-46
-            6594: -36,-45
-            6595: -36,-44
-            6596: -35,-44
-            6597: -35,-45
-            6598: -35,-46
+            6437: -36,-46
+            6438: -36,-45
+            6439: -36,-44
+            6440: -35,-44
+            6441: -35,-45
+            6442: -35,-46
         - node:
             color: '#EFB34131'
             id: CheckerNWSE
           decals:
-            6728: 13,40
-            6729: 13,39
-            6730: 13,41
-            6731: 13,42
-            6776: 15,40
+            6570: 13,40
+            6571: 13,39
+            6572: 13,41
+            6573: 13,42
+            6618: 15,40
         - node:
             color: '#EFB34196'
             id: CheckerNWSE
@@ -2883,90 +2910,88 @@ entities:
             149: -2,-27
             150: -3,-27
             151: -3,-28
-            2166: 37,-15
-            2167: 37,-16
-            2168: 37,-17
-            2169: 38,-16
-            2170: 38,-15
-            2174: 38,-17
-            2175: 38,6
-            2176: 38,7
-            2177: -54,10
-            2178: -53,10
-            2179: -55,10
-            2180: -55,9
-            2820: -4,15
-            2821: -3,15
-            2822: -2,15
-            2823: -3,14
-            2826: -38,-54
-            2827: -38,-53
-            2828: -37,-53
-            2829: -37,-54
-            2830: 61,-32
-            2831: 62,-32
-            2832: 63,-32
-            2833: 63,-33
-            2834: 62,-33
-            2835: 61,-33
-            2839: 63,10
-            2840: 64,10
-            2841: 65,10
-            2842: 65,9
-            2843: 65,8
-            2844: 64,8
-            2845: 63,8
-            2846: 64,9
-            2852: -23,34
-            2853: -23,35
-            2856: 14,-39
-            2857: 15,-39
-            2858: -61,-20
-            2859: -62,-20
-            2863: -38,-38
-            6643: 51,-30
-            6644: 51,-29
-            6645: 52,-29
-            6646: 52,-30
+            2106: 37,-15
+            2107: 37,-16
+            2108: 37,-17
+            2109: 38,-16
+            2110: 38,-15
+            2114: 38,-17
+            2115: 38,6
+            2116: 38,7
+            2117: -54,10
+            2118: -53,10
+            2119: -55,10
+            2120: -55,9
+            2760: -4,15
+            2761: -3,15
+            2762: -2,15
+            2763: -3,14
+            2766: -38,-54
+            2767: -38,-53
+            2768: -37,-53
+            2769: -37,-54
+            2770: 61,-32
+            2771: 62,-32
+            2772: 63,-32
+            2773: 63,-33
+            2774: 62,-33
+            2775: 61,-33
+            2779: 63,10
+            2780: 64,10
+            2781: 65,10
+            2782: 65,9
+            2783: 65,8
+            2784: 64,8
+            2785: 63,8
+            2786: 64,9
+            2792: -23,34
+            2793: -23,35
+            2796: 14,-39
+            2797: 15,-39
+            2798: -61,-20
+            2799: -62,-20
+            2803: -38,-38
+            6487: 51,-30
+            6488: 51,-29
+            6489: 52,-29
+            6490: 52,-30
         - node:
             color: '#D4D4D496'
             id: Delivery
           decals:
-            6529: 0,30
-            6530: 0,31
+            6373: 0,30
+            6374: 0,31
         - node:
             color: '#DE3A3A41'
             id: Delivery
           decals:
-            6601: -38,-46
-            6602: -38,-46
-            6603: -38,-44
-            6604: -38,-44
+            6445: -38,-46
+            6446: -38,-46
+            6447: -38,-44
+            6448: -38,-44
         - node:
             color: '#DE3A3A96'
             id: Delivery
           decals:
-            1136: -3,25
-            1137: -2,25
-            1199: 4,31
-            1200: 5,31
-            1201: 2,31
-            1202: 2,30
+            1111: -3,25
+            1112: -2,25
+            1174: 4,31
+            1175: 5,31
+            1176: 2,31
+            1177: 2,30
         - node:
             color: '#EFB34131'
             id: Delivery
           decals:
-            6772: 15,41
-            6773: 15,41
-            6774: 15,41
-            6775: 15,41
+            6614: 15,41
+            6615: 15,41
+            6616: 15,41
+            6617: 15,41
         - node:
             color: '#EFB34196'
             id: Delivery
           decals:
             60: -7,-20
-            6179: 47,16
-            6180: 47,16
         - node:
             color: '#EFB341FF'
             id: Delivery
@@ -3005,3576 +3030,3563 @@ entities:
             409: -23,-28
             410: -23,-27
             411: -23,-26
-            1268: 23,14
-            1270: 24,12
-            1282: 25,6
-            1283: 24,6
-            1284: 23,6
-            1302: 24,21
-            1303: 25,21
-            1304: 26,21
-            1305: 28,21
-            1306: 29,21
-            1307: 30,21
-            1447: 46,3
-            1448: 46,3
-            1768: 60,-12
-            1990: 26,-37
-            1991: 26,-38
-            1994: 31,-37
-            1995: 31,-38
-            2138: 8,-41
-            3043: 3,20
-            3044: -9,19
-            3045: -9,20
-            3046: -9,21
-            3047: -17,21
-            3048: -17,20
-            3049: -17,19
-            3050: 3,21
-            3051: 3,19
-            3052: 17,19
-            3053: 17,20
-            3054: 17,21
-            3055: 19,17
-            3056: 21,17
-            3057: 20,17
-            3058: 21,6
-            3059: 20,6
-            3060: 19,6
-            3061: 29,2
-            3062: 29,4
-            3063: 29,3
-            3064: 39,2
-            3065: 39,3
-            3066: 39,4
-            3067: 43,0
-            3068: 42,0
-            3069: 41,0
-            3070: 43,-14
-            3071: 42,-14
-            3072: 41,-14
-            3073: 46,-21
-            3074: 46,-19
-            3075: 46,-20
-            3076: 38,-19
-            3077: 38,-21
-            3078: 38,-20
-            3079: 30,-21
-            3080: 30,-20
-            3081: 30,-19
-            3082: 30,-20
-            3083: 21,-28
-            3084: 20,-28
-            3085: 19,-28
-            3086: 18,-32
-            3087: 18,-33
-            3088: 18,-34
-            3089: 10,-34
-            3090: 10,-33
-            3091: 10,-32
-            3092: 4,-32
-            3093: 4,-31
-            3094: 4,-30
-            3095: -9,-32
-            3096: -9,-31
-            3097: -9,-30
-            3098: -20,-32
-            3099: -20,-30
-            3100: -20,-31
-            3101: -24,-22
-            3102: -25,-22
-            3103: -26,-22
-            3104: -42,-29
-            3105: -42,-28
-            3106: -27,-29
-            3107: -27,-28
-            3108: -26,-12
-            3109: -25,-12
-            3110: -24,-12
-            3111: -23,-6
-            3112: -24,-6
-            3113: -25,-6
-            3114: -25,10
-            3115: -26,10
-            3116: -27,10
-            3117: -42,0
-            3118: -42,1
-            3119: -42,2
-            3120: -53,-5
-            3121: -54,-5
-            3122: -55,-5
-            3123: -55,-19
-            3124: -54,-19
-            3125: -53,-19
-            3126: -49,-34
-            3127: -47,-34
-            3128: -48,-34
-            3129: -47,-45
-            3130: -48,-45
-            3131: -49,-45
-            3132: -41,-49
-            3133: -42,-49
-            3134: -40,-49
-            3135: -54,-49
-            3136: -55,-49
-            3137: -56,-49
-            3138: -56,-55
-            3139: -55,-55
-            3140: -54,-55
-            3141: -42,-55
-            3142: -41,-55
-            3143: -40,-55
-            6531: 60,-24
-            6532: 60,-23
-            6631: 32,21
+            1243: 23,14
+            1245: 24,12
+            1257: 25,6
+            1258: 24,6
+            1259: 23,6
+            1277: 24,21
+            1278: 25,21
+            1279: 26,21
+            1280: 28,21
+            1281: 29,21
+            1282: 30,21
+            1422: 46,3
+            1423: 46,3
+            1708: 60,-12
+            1930: 26,-37
+            1931: 26,-38
+            1934: 31,-37
+            1935: 31,-38
+            2078: 8,-41
+            2978: 3,20
+            2979: -9,19
+            2980: -9,20
+            2981: -9,21
+            2982: -17,21
+            2983: -17,20
+            2984: -17,19
+            2985: 3,21
+            2986: 3,19
+            2987: 17,19
+            2988: 17,20
+            2989: 17,21
+            2990: 19,17
+            2991: 21,17
+            2992: 20,17
+            2993: 21,6
+            2994: 20,6
+            2995: 19,6
+            2996: 29,2
+            2997: 29,4
+            2998: 29,3
+            2999: 39,2
+            3000: 39,3
+            3001: 39,4
+            3002: 43,0
+            3003: 42,0
+            3004: 41,0
+            3005: 43,-14
+            3006: 42,-14
+            3007: 41,-14
+            3008: 46,-21
+            3009: 46,-19
+            3010: 46,-20
+            3011: 38,-19
+            3012: 38,-21
+            3013: 38,-20
+            3014: 30,-21
+            3015: 30,-20
+            3016: 30,-19
+            3017: 30,-20
+            3018: 21,-28
+            3019: 20,-28
+            3020: 19,-28
+            3021: 18,-32
+            3022: 18,-33
+            3023: 18,-34
+            3024: 10,-34
+            3025: 10,-33
+            3026: 10,-32
+            3027: 4,-32
+            3028: 4,-31
+            3029: 4,-30
+            3030: -9,-32
+            3031: -9,-31
+            3032: -9,-30
+            3033: -20,-32
+            3034: -20,-30
+            3035: -20,-31
+            3036: -24,-22
+            3037: -25,-22
+            3038: -26,-22
+            3039: -42,-29
+            3040: -42,-28
+            3041: -27,-29
+            3042: -27,-28
+            3043: -26,-12
+            3044: -25,-12
+            3045: -24,-12
+            3046: -23,-6
+            3047: -24,-6
+            3048: -25,-6
+            3049: -25,10
+            3050: -26,10
+            3051: -27,10
+            3052: -42,0
+            3053: -42,1
+            3054: -42,2
+            3055: -53,-5
+            3056: -54,-5
+            3057: -55,-5
+            3058: -55,-19
+            3059: -54,-19
+            3060: -53,-19
+            3061: -49,-34
+            3062: -47,-34
+            3063: -48,-34
+            3064: -47,-45
+            3065: -48,-45
+            3066: -49,-45
+            3067: -41,-49
+            3068: -42,-49
+            3069: -40,-49
+            3070: -54,-49
+            3071: -55,-49
+            3072: -56,-49
+            3073: -56,-55
+            3074: -55,-55
+            3075: -54,-55
+            3076: -42,-55
+            3077: -41,-55
+            3078: -40,-55
+            6375: 60,-24
+            6376: 60,-23
+            6475: 32,21
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Delivery
           decals:
-            2981: 24,5
-            2982: 25,5
-            2983: 26,5
-            2984: 14,1
-            2985: 14,-12
-            2986: 0,14
-            2987: -6,14
+            2921: 24,5
+            2922: 25,5
+            2923: 26,5
+            2924: 14,1
+            2925: 14,-12
+            2926: 0,14
+            2927: -6,14
         - node:
             color: '#52B4E996'
             id: DeliveryGreyscale
           decals:
-            1757: 59,-5
-            1758: 61,-5
-            6292: 48,2
-            6293: 48,2
-            6294: 48,1
-            6295: 48,1
-            6525: 50,-5
-            6526: 50,-5
+            6136: 48,2
+            6137: 48,2
+            6138: 48,1
+            6139: 48,1
+            6369: 50,-5
+            6370: 50,-5
         - node:
             color: '#DE3A3A96'
             id: DeliveryGreyscale
           decals:
-            1197: 4,31
-            1198: 5,31
+            1172: 4,31
+            1173: 5,31
         - node:
             color: '#FFFFFFFF'
             id: DeliveryGreyscale
           decals:
-            2215: 9,23
-            2216: 9,24
+            2155: 9,23
+            2156: 9,24
         - node:
             cleanable: True
             color: '#835432FF'
             id: Dirt
           decals:
-            2866: -37,28
-            2867: -36,27
-            2868: -37,27
-            2869: -37,25
-            2870: -37,24
-            2871: -36,25
-            2872: -36,24
-            2873: -36,25
-            2874: -38,28
-            2875: -39,29
-            2876: -40,28
-            2877: -38,28
-            2878: -37,27
-            2879: -37,28
-            2880: -37,27
-            2881: -36,25
-            2882: -36,24
-            2883: -34,24
-            2884: -34,23
-            2885: -34,22
-            2886: -36,22
-            2887: -37,22
-            2888: -36,24
-            2889: -37,24
-            2890: -36,23
-            2891: -37,25
-            2892: -36,25
-            2893: -37,26
-            2894: -38,27
-            2895: -38,28
-            2896: -39,27
-            2897: -39,26
-            2898: -39,26
+            2806: -37,28
+            2807: -36,27
+            2808: -37,27
+            2809: -37,25
+            2810: -37,24
+            2811: -36,25
+            2812: -36,24
+            2813: -36,25
+            2814: -38,28
+            2815: -39,29
+            2816: -40,28
+            2817: -38,28
+            2818: -37,27
+            2819: -37,28
+            2820: -37,27
+            2821: -36,25
+            2822: -36,24
+            2823: -34,24
+            2824: -34,23
+            2825: -34,22
+            2826: -36,22
+            2827: -37,22
+            2828: -36,24
+            2829: -37,24
+            2830: -36,23
+            2831: -37,25
+            2832: -36,25
+            2833: -37,26
+            2834: -38,27
+            2835: -38,28
+            2836: -39,27
+            2837: -39,26
+            2838: -39,26
         - node:
             cleanable: True
             color: '#A4610696'
             id: Dirt
           decals:
-            5427: -34,-26
-            5428: -37,-25
-            5429: -39,-28
-            5430: -40,-28
-            5431: -40,-31
-            5432: -39,-33
-            5433: -37,-33
-            5434: -32,-33
-            5435: -29,-33
-            5436: -29,-31
-            5437: -30,-28
-            5438: -29,-27
-            5439: -25,-30
-            5440: -25,-27
-            5441: -25,-26
-            5442: -25,-23
-            5443: -24,-21
-            5444: -25,-18
-            5445: -29,-20
-            5446: -29,-19
-            5447: -33,-19
-            5448: -33,-20
-            5449: -31,-14
-            5450: -29,-15
-            5451: -33,-16
-            5452: -29,-13
-            5453: -29,-11
-            5454: -38,-11
-            5455: -37,-15
-            5456: -36,-16
-            5457: -40,-10
-            5458: -38,-17
-            5459: -47,-8
-            5460: -45,0
-            5461: -47,0
-            5462: -44,2
-            5463: -48,-2
-            5464: -47,-1
-            5465: -49,3
-            5466: -50,-1
-            5467: -45,1
-            5468: -53,4
-            5469: -48,5
-            5470: -50,6
-            5471: -47,1
-            5472: -38,-1
-            5473: -36,1
-            5474: -35,-1
-            5475: -32,-1
-            5476: -33,0
-            5477: -33,-3
-            5478: -24,-2
-            5479: -28,3
-            5480: -26,3
-            5481: -26,8
-            5482: -27,13
-            5483: -26,14
-            5484: -26,18
-            5488: -22,13
-            5489: -20,12
-            5490: -22,13
-            5491: -24,19
-            5492: -20,20
-            5493: -18,19
-            5494: -16,20
-            5495: -13,19
-            5496: -15,24
-            5497: -14,24
-            5498: -13,27
-            5499: -14,28
-            5500: -13,27
-            5501: -5,28
-            5502: -20,28
-            5503: -18,25
-            5504: -13,31
-            5505: -15,32
-            5506: -14,34
-            5507: -17,32
-            5508: -8,32
-            5509: -8,32
-            5510: -6,33
-            5511: -6,27
-            5512: -3,28
-            5513: -1,30
-            5514: -2,33
-            5515: -2,33
-            5516: -2,36
-            5517: -2,43
-            5518: -7,42
-            5519: -5,45
-            5520: -3,47
-            5521: 0,45
-            5522: -2,47
-            5523: -1,47
-            5524: -2,51
-            5525: 1,51
-            5526: -1,52
-            5527: 1,52
-            5528: 2,45
-            5529: 2,47
-            5530: 2,42
-            5531: 1,40
-            5532: 6,41
-            5533: 8,39
-            5534: 6,41
-            5535: 5,31
-            5536: 3,31
-            5537: 5,30
-            5538: 4,30
-            5539: 3,26
-            5540: 2,27
-            5541: 4,25
-            5542: 3,23
-            5543: 2,24
-            5544: 1,23
-            5545: -2,24
-            5546: 1,21
-            5547: -1,19
-            5548: 4,20
-            5549: 9,20
-            5550: 9,20
-            5551: 15,19
-            5552: 11,24
-            5553: 14,23
-            5554: 14,25
-            5555: 15,24
-            5556: 14,29
-            5557: 14,31
-            5558: 17,25
-            5559: 17,23
-            5560: 16,20
-            5561: 20,20
-            5562: 20,18
-            5563: 20,15
-            5564: 21,15
-            5565: 20,12
-            5566: 22,12
-            5567: 20,11
-            5568: 27,12
-            5569: 27,11
-            5570: 26,14
-            5571: 25,19
-            5572: 30,19
-            5573: 31,16
-            5574: 31,12
-            5575: 35,14
-            5576: 35,14
-            5577: 35,14
-            5578: 32,8
-            5579: 34,9
-            5580: 32,7
-            5581: 26,7
-            5582: 24,7
-            5583: 24,3
-            5584: 24,2
-            5585: 23,2
-            5586: 20,6
-            5587: 20,9
-            5588: 23,3
-            5589: 32,3
-            5590: 34,2
-            5591: 32,-2
-            5592: 32,-2
-            5593: 32,-4
-            5594: 37,-4
-            5595: 36,3
-            5596: 42,2
-            5597: 38,-2
-            5598: 42,-5
-            5599: 42,-2
-            5600: 42,-4
-            5601: 43,6
-            5602: 44,12
-            5603: 43,11
-            5604: 46,12
-            5605: 44,12
-            5606: 52,12
-            5607: 50,14
-            5608: 50,7
-            5609: 53,14
-            5610: 59,15
-            5611: 60,17
-            5612: 55,7
-            5613: 54,7
-            5614: 50,7
-            5615: 49,0
-            5616: 45,-1
-            5617: 46,-5
-            5618: 46,-8
-            5619: 50,-4
-            5620: 50,-7
-            5621: 55,-5
-            5622: 53,-5
-            5623: 58,-6
-            5624: 61,-5
-            5625: 59,-7
-            5626: 59,-7
-            5627: 60,-6
-            5628: 59,-14
-            5629: 60,-14
-            5630: 59,-14
-            5631: 59,-18
-            5632: 59,-20
-            5633: 60,-18
-            5634: 60,-17
-            5635: 64,-13
-            5636: 64,-17
-            5637: 65,-19
-            5638: 64,-19
-            5639: 64,-25
-            5640: 65,-24
-            5641: 63,-26
-            5642: 63,-24
-            5643: 62,-26
-            5644: 64,-26
-            5645: 70,-28
-            5646: 71,-26
-            5647: 69,-27
-            5648: 69,-23
-            5649: 70,-24
-            5650: 69,-22
-            5651: 66,-18
-            5652: 70,-18
-            5653: 71,-17
-            5654: 69,-13
-            5655: 71,-14
-            5656: 69,-12
-            5657: 70,-14
-            5658: 76,-17
-            5659: 77,-18
-            5660: 74,-15
-            5661: 76,-14
-            5662: 74,-14
-            5663: 68,-8
-            5664: 70,-10
-            5665: 76,-6
-            5666: 48,-25
-            5667: 48,-26
-            5668: 48,-27
-            5669: 48,-30
-            5670: 48,-31
-            5671: 47,-31
-            5672: 49,-34
-            5673: 47,-36
-            5674: 46,-36
-            5675: 44,-37
-            5676: 42,-35
-            5677: 42,-36
-            5678: 38,-36
-            5679: 38,-35
-            5680: 37,-37
-            5681: 32,-35
-            5682: 32,-36
-            5683: 32,-33
-            5684: 33,-31
-            5685: 32,-31
-            5686: 33,-27
-            5687: 32,-25
-            5688: 33,-24
-            5689: 35,-26
-            5690: 37,-26
-            5691: 41,-25
-            5692: 40,-26
-            5693: 41,-29
-            5694: 40,-29
-            5695: 40,-31
-            5696: 43,-29
-            5697: 44,-31
-            5698: 45,-30
-            5699: 27,-34
-            5700: 25,-34
-            5701: 24,-32
-            5702: 26,-29
-            5703: 23,-29
-            5704: 23,-31
-            5705: 25,-38
-            5706: 24,-37
-            5707: 22,-38
-            5708: 21,-37
-            5709: 21,-38
-            5710: 29,-39
-            5711: 28,-41
-            5712: 29,-44
-            5713: 28,-42
-            5714: 28,-45
-            5715: 26,-45
-            5716: 27,-44
-            5717: 24,-43
-            5718: 25,-46
-            5719: 27,-45
-            5720: 25,-46
-            5721: 32,-30
-            5722: 33,-28
-            5723: 36,-26
-            5724: 35,-26
-            5725: 36,-23
-            5726: 36,-30
-            5727: 42,-28
-            5728: 43,-29
-            5729: 52,-31
-            5730: 52,-35
-            5731: 55,-29
-            5732: 55,-30
-            5733: 57,-30
-            5734: 55,-34
-            5735: 55,-34
-            5736: 55,-36
-            5737: 57,-34
-            5738: 20,-45
-            5739: 17,-44
-            5740: 18,-45
-            5741: 19,-46
-            5742: 18,-48
-            5743: 19,-49
-            5744: 18,-50
-            5745: 20,-53
-            5746: 18,-54
-            5747: 17,-54
-            5748: 16,-54
-            5749: 16,-58
-            5750: 16,-59
-            5751: 19,-58
-            5752: 21,-58
-            5753: 21,-59
-            5754: 13,-47
-            5755: 14,-47
-            5756: 13,-48
-            5757: 13,-45
-            5758: 12,-45
-            5759: 10,-39
-            5760: 11,-39
-            5761: 0,-37
-            5762: 0,-36
-            5763: 1,-36
-            5764: 2,-38
-            5765: 0,-36
-            5766: -1,-37
-            5767: -2,-36
-            5768: -5,-36
-            5769: -4,-36
-            5770: -6,-36
-            5771: -7,-32
-            5772: -8,-32
-            5773: -7,-30
-            5774: -11,-31
-            5775: -12,-32
-            5776: -15,-32
-            5777: -16,-32
-            5778: -13,-30
-            5779: -16,-30
-            5780: -17,-30
-            5781: -22,-30
-            5782: -23,-30
-            5783: -24,-30
-            5784: -24,-29
-            5785: -24,-28
-            5786: -22,-32
-            5787: -24,-32
-            5788: -25,-32
-            5789: -26,-30
-            5790: -26,-28
-            5791: -26,-26
-            5792: -26,-24
-            5793: -24,-24
-            5794: -24,-22
-            5795: -24,-19
-            5796: -26,-21
-            5797: -26,-18
-            5798: -26,-17
-            5799: -24,-14
-            5800: -25,-15
-            5801: -27,-15
-            5802: -30,-15
-            5803: -30,-15
-            5804: -34,-15
-            5805: -35,-14
-            5806: -37,-15
-            5807: -38,-14
-            5808: -35,-15
-            5809: -34,-14
-            5810: -37,-10
-            5811: -38,-10
-            5812: -36,-9
-            5813: -29,-10
-            5814: -29,-11
-            5815: -33,-20
-            5816: -34,-20
-            5817: -33,-18
-            5818: -32,-20
-            5819: -34,-19
-            5820: -33,-18
-            5821: -29,-19
-            5822: -30,-21
-            5823: -29,-19
-            5824: -30,-20
-            5825: -37,-18
-            5826: -40,-18
-            5827: -39,-20
-            5828: -37,-19
-            5829: -39,-19
-            5830: -32,-26
-            5831: -35,-25
-            5832: -39,-26
-            5833: -39,-26
-            5834: -39,-27
-            5835: -40,-28
-            5836: -38,-30
-            5837: -39,-32
-            5838: -39,-33
-            5839: -37,-33
-            5840: -34,-33
-            5841: -31,-33
-            5842: -34,-34
-            5843: -30,-33
-            5844: -30,-31
-            5845: -31,-28
-            5846: -29,-27
-            5847: -29,-30
-            5848: -43,-30
-            5849: -44,-28
-            5850: -45,-31
-            5851: -46,-27
-            5852: -45,-25
-            5853: -45,-25
-            5854: -47,-25
-            5855: -49,-25
-            5856: -51,-26
-            5857: -50,-29
-            5858: -51,-30
-            5859: -51,-30
-            5860: -50,-32
-            5861: -47,-32
-            5862: -48,-33
-            5863: -44,-31
-            5864: -44,-29
-            5865: -55,-25
-            5866: -56,-25
-            5867: -55,-29
-            5868: -56,-29
-            5869: -55,-29
-            5870: -60,-27
-            5871: -60,-29
-            5872: -62,-27
-            5873: -61,-21
-            5874: -61,-21
-            5875: -54,-21
-            5876: -54,-21
-            5877: -55,-16
-            5878: -53,-14
-            5879: -54,-13
-            5880: -53,-10
-            5881: -54,-7
-            5882: -53,-5
-            5883: -55,-2
-            5884: -54,0
-            5885: -53,1
-            5886: -53,-4
-            5887: -54,-3
-            5888: -54,-4
-            5889: -54,-9
-            5890: -46,-4
-            5891: -47,-4
-            5892: -48,-3
-            5893: -50,0
-            5894: -45,1
-            5895: -47,1
-            5896: -44,1
-            5897: -47,1
-            5898: -46,7
-            5899: -49,7
-            5900: -49,11
-            5901: -46,11
-            5902: -49,10
-            5903: -48,13
-            5904: -45,11
-            5905: -54,10
-            5906: -54,9
-            5907: -53,10
-            5908: -39,1
-            5909: -37,0
-            5910: -39,-1
-            5911: -34,-1
-            5912: -37,-1
-            5913: -36,0
-            5914: -35,2
-            5915: -31,2
-            5916: -31,2
-            5917: -33,1
-            5918: -28,0
-            5919: -30,-1
-            5920: -27,-1
-            5921: -33,-4
-            5922: -27,-5
-            5923: -24,-3
-            5924: -24,1
-            5925: -22,3
-            5926: -23,-2
-            5927: -22,-3
-            5928: -17,-3
-            5929: -19,-3
-            5930: -17,-3
-            5931: -18,-4
-            5932: -14,-4
-            5933: -18,-4
-            5934: -17,-4
-            5935: -17,-4
-            5936: -19,-4
-            5937: -19,-2
-            5938: -19,-2
-            5939: -20,-3
-            5940: -20,-5
-            5941: -16,0
-            5942: -16,1
-            5943: -16,3
-            5944: -15,0
-            5945: -15,6
-            5946: -17,5
-            5947: -15,7
-            5948: -21,5
-            5949: -21,6
-            5950: -20,7
-            5951: -22,8
-            5952: -24,9
-            5953: -21,9
-            5954: -23,8
-            5955: -22,8
-            5956: -23,8
-            5957: -21,13
-            5958: -22,11
-            5959: -20,13
-            5960: -22,14
-            5961: -26,12
-            5962: -26,16
-            5963: -26,17
-            5964: -26,20
-            5965: -19,20
-            5966: -25,20
-            5967: -22,19
-            5968: -24,26
-            5969: -25,26
-            5970: -26,26
-            5971: -25,29
-            5972: -26,29
-            5973: -26,26
-            5974: -26,27
-            5975: -25,29
-            5976: -29,26
-            5977: -29,26
-            5978: -19,26
-            5979: -21,26
-            5980: -19,28
-            5981: -18,26
-            5982: -14,28
-            5983: -14,26
-            5984: -13,28
-            5985: -11,23
-            5986: -7,32
-            5987: -9,32
-            5988: -14,32
-            5989: -15,33
-            5990: -18,32
-            5991: -3,28
-            5992: -4,27
-            5993: -1,29
-            5994: -2,23
-            5995: -1,19
-            5996: -3,14
-            5997: -3,14
-            5998: -2,15
-            5999: -4,15
-            6000: -3,15
-            6001: 2,-14
-            6002: 2,-16
-            6003: -1,-17
-            6004: -2,-14
-            6005: -7,-17
-            6006: -6,-16
-            6007: -7,-19
-            6008: -7,-19
-            6009: -7,-23
-            6010: -1,-24
-            6011: 4,-20
-            6012: 6,-23
-            6013: 6,-20
-            6014: 7,-22
-            6015: 7,-20
-            6016: 11,-18
-            6017: 13,-18
-            6018: 13,-22
-            6019: 13,-22
-            6020: 12,-22
-            6021: 15,-26
-            6022: 12,-26
-            6023: 12,-29
-            6024: 7,-30
-            6025: 8,-32
-            6026: 7,-32
-            6027: 10,-34
-            6028: 13,-33
-            6029: 16,-32
-            6030: 21,-37
-            6031: 20,-38
-            6032: 24,-38
-            6033: 25,-37
-            6034: 28,-34
-            6035: 25,-34
-            6036: 27,-29
-            6037: 24,-29
-            6038: 33,-34
-            6039: 32,-37
-            6040: 35,-37
-            6041: 38,-36
-            6042: 40,-36
-            6043: 39,-30
-            6044: 44,-25
-            6045: 43,-25
-            6046: 42,-20
-            6047: 42,-18
-            6048: 41,-16
-            6049: 38,-16
-            6050: 37,-17
-            6051: 37,-15
-            6052: 37,-17
-            6053: 37,-16
-            6054: 37,-16
-            6055: 37,-16
-            6056: 38,-4
-            6057: 33,-3
-            6058: 33,-3
-            6059: 38,7
-            6060: 36,13
-            6061: 37,13
-            6062: 35,13
-            6063: 34,13
-            6064: 34,14
-            6065: 36,13
-            6066: 36,13
-            6067: 34,14
-            6068: 35,18
-            6069: 36,18
+            5313: -34,-26
+            5314: -37,-25
+            5315: -39,-28
+            5316: -40,-28
+            5317: -40,-31
+            5318: -39,-33
+            5319: -37,-33
+            5320: -32,-33
+            5321: -29,-33
+            5322: -29,-31
+            5323: -30,-28
+            5324: -29,-27
+            5325: -25,-30
+            5326: -25,-27
+            5327: -25,-26
+            5328: -25,-23
+            5329: -24,-21
+            5330: -25,-18
+            5331: -29,-20
+            5332: -29,-19
+            5333: -33,-19
+            5334: -33,-20
+            5335: -31,-14
+            5336: -29,-15
+            5337: -33,-16
+            5338: -29,-13
+            5339: -29,-11
+            5340: -38,-11
+            5341: -37,-15
+            5342: -36,-16
+            5343: -40,-10
+            5344: -38,-17
+            5345: -47,-8
+            5346: -45,0
+            5347: -47,0
+            5348: -44,2
+            5349: -48,-2
+            5350: -47,-1
+            5351: -49,3
+            5352: -50,-1
+            5353: -45,1
+            5354: -53,4
+            5355: -48,5
+            5356: -50,6
+            5357: -47,1
+            5358: -38,-1
+            5359: -36,1
+            5360: -35,-1
+            5361: -32,-1
+            5362: -33,0
+            5363: -33,-3
+            5364: -24,-2
+            5365: -28,3
+            5366: -26,3
+            5367: -26,8
+            5368: -27,13
+            5369: -26,14
+            5370: -26,18
+            5371: -22,13
+            5372: -20,12
+            5373: -22,13
+            5374: -24,19
+            5375: -20,20
+            5376: -18,19
+            5377: -16,20
+            5378: -13,19
+            5379: -15,24
+            5380: -14,24
+            5381: -13,27
+            5382: -14,28
+            5383: -13,27
+            5384: -5,28
+            5385: -20,28
+            5386: -18,25
+            5387: -13,31
+            5388: -15,32
+            5389: -14,34
+            5390: -17,32
+            5391: -8,32
+            5392: -8,32
+            5393: -6,33
+            5394: -6,27
+            5395: -3,28
+            5396: -1,30
+            5397: -2,33
+            5398: -2,33
+            5399: -2,36
+            5400: -2,43
+            5401: -7,42
+            5402: -5,45
+            5403: -3,47
+            5404: 0,45
+            5405: -2,47
+            5406: -1,47
+            5407: -2,51
+            5408: 1,51
+            5409: -1,52
+            5410: 1,52
+            5411: 2,45
+            5412: 2,47
+            5413: 2,42
+            5414: 1,40
+            5415: 6,41
+            5416: 8,39
+            5417: 6,41
+            5418: 5,31
+            5419: 3,31
+            5420: 5,30
+            5421: 4,30
+            5422: 3,26
+            5423: 2,27
+            5424: 4,25
+            5425: 3,23
+            5426: 2,24
+            5427: 1,23
+            5428: -2,24
+            5429: 1,21
+            5430: -1,19
+            5431: 4,20
+            5432: 9,20
+            5433: 9,20
+            5434: 15,19
+            5435: 11,24
+            5436: 14,23
+            5437: 14,25
+            5438: 15,24
+            5439: 14,29
+            5440: 14,31
+            5441: 17,25
+            5442: 17,23
+            5443: 16,20
+            5444: 20,20
+            5445: 20,18
+            5446: 20,15
+            5447: 21,15
+            5448: 20,12
+            5449: 22,12
+            5450: 20,11
+            5451: 27,12
+            5452: 27,11
+            5453: 26,14
+            5454: 25,19
+            5455: 30,19
+            5456: 31,16
+            5457: 31,12
+            5458: 35,14
+            5459: 35,14
+            5460: 35,14
+            5461: 32,8
+            5462: 34,9
+            5463: 32,7
+            5464: 26,7
+            5465: 24,7
+            5466: 24,3
+            5467: 24,2
+            5468: 23,2
+            5469: 20,6
+            5470: 20,9
+            5471: 23,3
+            5472: 32,3
+            5473: 34,2
+            5474: 32,-2
+            5475: 32,-2
+            5476: 32,-4
+            5477: 37,-4
+            5478: 36,3
+            5479: 42,2
+            5480: 38,-2
+            5481: 42,-5
+            5482: 42,-2
+            5483: 42,-4
+            5484: 43,6
+            5485: 52,12
+            5486: 50,14
+            5487: 50,7
+            5488: 53,14
+            5489: 59,15
+            5490: 60,17
+            5491: 55,7
+            5492: 54,7
+            5493: 50,7
+            5494: 49,0
+            5495: 45,-1
+            5496: 46,-5
+            5497: 46,-8
+            5498: 50,-4
+            5499: 50,-7
+            5500: 55,-5
+            5501: 53,-5
+            5502: 59,-14
+            5503: 60,-14
+            5504: 59,-14
+            5505: 59,-18
+            5506: 59,-20
+            5507: 60,-18
+            5508: 60,-17
+            5509: 64,-13
+            5510: 64,-17
+            5511: 65,-19
+            5512: 64,-19
+            5513: 64,-25
+            5514: 65,-24
+            5515: 63,-26
+            5516: 63,-24
+            5517: 62,-26
+            5518: 64,-26
+            5519: 70,-28
+            5520: 71,-26
+            5521: 69,-27
+            5522: 69,-23
+            5523: 70,-24
+            5524: 69,-22
+            5525: 66,-18
+            5526: 70,-18
+            5527: 71,-17
+            5528: 69,-13
+            5529: 71,-14
+            5530: 69,-12
+            5531: 70,-14
+            5532: 76,-17
+            5533: 77,-18
+            5534: 74,-15
+            5535: 76,-14
+            5536: 74,-14
+            5537: 68,-8
+            5538: 70,-10
+            5539: 76,-6
+            5540: 48,-25
+            5541: 48,-26
+            5542: 48,-27
+            5543: 48,-30
+            5544: 48,-31
+            5545: 47,-31
+            5546: 49,-34
+            5547: 47,-36
+            5548: 46,-36
+            5549: 44,-37
+            5550: 42,-35
+            5551: 42,-36
+            5552: 38,-36
+            5553: 38,-35
+            5554: 37,-37
+            5555: 32,-35
+            5556: 32,-36
+            5557: 32,-33
+            5558: 33,-31
+            5559: 32,-31
+            5560: 33,-27
+            5561: 32,-25
+            5562: 33,-24
+            5563: 35,-26
+            5564: 37,-26
+            5565: 41,-25
+            5566: 40,-26
+            5567: 41,-29
+            5568: 40,-29
+            5569: 40,-31
+            5570: 43,-29
+            5571: 44,-31
+            5572: 45,-30
+            5573: 27,-34
+            5574: 25,-34
+            5575: 24,-32
+            5576: 26,-29
+            5577: 23,-29
+            5578: 23,-31
+            5579: 25,-38
+            5580: 24,-37
+            5581: 22,-38
+            5582: 21,-37
+            5583: 21,-38
+            5584: 29,-39
+            5585: 28,-41
+            5586: 29,-44
+            5587: 28,-42
+            5588: 28,-45
+            5589: 26,-45
+            5590: 27,-44
+            5591: 24,-43
+            5592: 25,-46
+            5593: 27,-45
+            5594: 25,-46
+            5595: 32,-30
+            5596: 33,-28
+            5597: 36,-26
+            5598: 35,-26
+            5599: 36,-23
+            5600: 36,-30
+            5601: 42,-28
+            5602: 43,-29
+            5603: 52,-31
+            5604: 52,-35
+            5605: 55,-29
+            5606: 55,-30
+            5607: 57,-30
+            5608: 55,-34
+            5609: 55,-34
+            5610: 55,-36
+            5611: 57,-34
+            5612: 20,-45
+            5613: 17,-44
+            5614: 18,-45
+            5615: 19,-46
+            5616: 18,-48
+            5617: 19,-49
+            5618: 18,-50
+            5619: 20,-53
+            5620: 18,-54
+            5621: 17,-54
+            5622: 16,-54
+            5623: 16,-58
+            5624: 16,-59
+            5625: 19,-58
+            5626: 21,-58
+            5627: 21,-59
+            5628: 13,-47
+            5629: 14,-47
+            5630: 13,-48
+            5631: 13,-45
+            5632: 12,-45
+            5633: 10,-39
+            5634: 11,-39
+            5635: 0,-37
+            5636: 0,-36
+            5637: 1,-36
+            5638: 2,-38
+            5639: 0,-36
+            5640: -1,-37
+            5641: -2,-36
+            5642: -5,-36
+            5643: -4,-36
+            5644: -6,-36
+            5645: -7,-32
+            5646: -8,-32
+            5647: -7,-30
+            5648: -11,-31
+            5649: -12,-32
+            5650: -15,-32
+            5651: -16,-32
+            5652: -13,-30
+            5653: -16,-30
+            5654: -17,-30
+            5655: -22,-30
+            5656: -23,-30
+            5657: -24,-30
+            5658: -24,-29
+            5659: -24,-28
+            5660: -22,-32
+            5661: -24,-32
+            5662: -25,-32
+            5663: -26,-30
+            5664: -26,-28
+            5665: -26,-26
+            5666: -26,-24
+            5667: -24,-24
+            5668: -24,-22
+            5669: -24,-19
+            5670: -26,-21
+            5671: -26,-18
+            5672: -26,-17
+            5673: -24,-14
+            5674: -25,-15
+            5675: -27,-15
+            5676: -30,-15
+            5677: -30,-15
+            5678: -34,-15
+            5679: -35,-14
+            5680: -37,-15
+            5681: -38,-14
+            5682: -35,-15
+            5683: -34,-14
+            5684: -37,-10
+            5685: -38,-10
+            5686: -36,-9
+            5687: -29,-10
+            5688: -29,-11
+            5689: -33,-20
+            5690: -33,-18
+            5691: -32,-20
+            5692: -33,-18
+            5693: -29,-19
+            5694: -30,-21
+            5695: -29,-19
+            5696: -30,-20
+            5697: -37,-18
+            5698: -40,-18
+            5699: -39,-20
+            5700: -37,-19
+            5701: -39,-19
+            5702: -32,-26
+            5703: -35,-25
+            5704: -39,-26
+            5705: -39,-26
+            5706: -39,-27
+            5707: -40,-28
+            5708: -38,-30
+            5709: -39,-32
+            5710: -39,-33
+            5711: -37,-33
+            5712: -34,-33
+            5713: -31,-33
+            5714: -34,-34
+            5715: -30,-33
+            5716: -30,-31
+            5717: -31,-28
+            5718: -29,-27
+            5719: -29,-30
+            5720: -43,-30
+            5721: -44,-28
+            5722: -45,-31
+            5723: -46,-27
+            5724: -45,-25
+            5725: -45,-25
+            5726: -47,-25
+            5727: -49,-25
+            5728: -51,-26
+            5729: -50,-29
+            5730: -51,-30
+            5731: -51,-30
+            5732: -50,-32
+            5733: -47,-32
+            5734: -48,-33
+            5735: -44,-31
+            5736: -44,-29
+            5737: -55,-25
+            5738: -56,-25
+            5739: -55,-29
+            5740: -56,-29
+            5741: -55,-29
+            5742: -60,-27
+            5743: -60,-29
+            5744: -62,-27
+            5745: -61,-21
+            5746: -61,-21
+            5747: -54,-21
+            5748: -54,-21
+            5749: -55,-16
+            5750: -53,-14
+            5751: -54,-13
+            5752: -53,-10
+            5753: -54,-7
+            5754: -53,-5
+            5755: -55,-2
+            5756: -54,0
+            5757: -53,1
+            5758: -53,-4
+            5759: -54,-3
+            5760: -54,-4
+            5761: -54,-9
+            5762: -46,-4
+            5763: -47,-4
+            5764: -48,-3
+            5765: -50,0
+            5766: -45,1
+            5767: -47,1
+            5768: -44,1
+            5769: -47,1
+            5770: -46,7
+            5771: -49,7
+            5772: -49,11
+            5773: -46,11
+            5774: -49,10
+            5775: -48,13
+            5776: -45,11
+            5777: -54,10
+            5778: -54,9
+            5779: -53,10
+            5780: -39,1
+            5781: -37,0
+            5782: -39,-1
+            5783: -34,-1
+            5784: -37,-1
+            5785: -36,0
+            5786: -35,2
+            5787: -31,2
+            5788: -31,2
+            5789: -33,1
+            5790: -28,0
+            5791: -30,-1
+            5792: -27,-1
+            5793: -33,-4
+            5794: -27,-5
+            5795: -24,-3
+            5796: -24,1
+            5797: -22,3
+            5798: -23,-2
+            5799: -22,-3
+            5800: -17,-3
+            5801: -19,-3
+            5802: -17,-3
+            5803: -18,-4
+            5804: -14,-4
+            5805: -18,-4
+            5806: -17,-4
+            5807: -17,-4
+            5808: -19,-4
+            5809: -19,-2
+            5810: -19,-2
+            5811: -20,-3
+            5812: -20,-5
+            5813: -16,0
+            5814: -16,1
+            5815: -16,3
+            5816: -15,0
+            5817: -15,6
+            5818: -17,5
+            5819: -15,7
+            5820: -21,5
+            5821: -21,6
+            5822: -20,7
+            5823: -22,8
+            5824: -24,9
+            5825: -21,9
+            5826: -23,8
+            5827: -22,8
+            5828: -23,8
+            5829: -21,13
+            5830: -22,11
+            5831: -20,13
+            5832: -22,14
+            5833: -26,12
+            5834: -26,16
+            5835: -26,17
+            5836: -26,20
+            5837: -19,20
+            5838: -25,20
+            5839: -22,19
+            5840: -24,26
+            5841: -25,26
+            5842: -26,26
+            5843: -25,29
+            5844: -26,29
+            5845: -26,26
+            5846: -26,27
+            5847: -25,29
+            5848: -29,26
+            5849: -29,26
+            5850: -19,26
+            5851: -21,26
+            5852: -19,28
+            5853: -18,26
+            5854: -14,28
+            5855: -14,26
+            5856: -13,28
+            5857: -11,23
+            5858: -7,32
+            5859: -9,32
+            5860: -14,32
+            5861: -15,33
+            5862: -18,32
+            5863: -3,28
+            5864: -4,27
+            5865: -1,29
+            5866: -2,23
+            5867: -1,19
+            5868: -3,14
+            5869: -3,14
+            5870: -2,15
+            5871: -4,15
+            5872: -3,15
+            5873: 2,-14
+            5874: 2,-16
+            5875: -1,-17
+            5876: -2,-14
+            5877: -7,-17
+            5878: -6,-16
+            5879: -7,-19
+            5880: -7,-19
+            5881: -7,-23
+            5882: -1,-24
+            5883: 4,-20
+            5884: 6,-23
+            5885: 6,-20
+            5886: 7,-22
+            5887: 7,-20
+            5888: 11,-18
+            5889: 13,-18
+            5890: 13,-22
+            5891: 13,-22
+            5892: 12,-22
+            5893: 15,-26
+            5894: 12,-26
+            5895: 12,-29
+            5896: 7,-30
+            5897: 8,-32
+            5898: 7,-32
+            5899: 10,-34
+            5900: 13,-33
+            5901: 16,-32
+            5902: 21,-37
+            5903: 20,-38
+            5904: 24,-38
+            5905: 25,-37
+            5906: 28,-34
+            5907: 25,-34
+            5908: 27,-29
+            5909: 24,-29
+            5910: 33,-34
+            5911: 32,-37
+            5912: 35,-37
+            5913: 38,-36
+            5914: 40,-36
+            5915: 39,-30
+            5916: 44,-25
+            5917: 43,-25
+            5918: 42,-20
+            5919: 42,-18
+            5920: 41,-16
+            5921: 38,-16
+            5922: 37,-17
+            5923: 37,-15
+            5924: 37,-17
+            5925: 37,-16
+            5926: 37,-16
+            5927: 37,-16
+            5928: 38,-4
+            5929: 33,-3
+            5930: 33,-3
+            5931: 38,7
+            5932: 36,13
+            5933: 37,13
+            5934: 35,13
+            5935: 34,13
+            5936: 34,14
+            5937: 36,13
+            5938: 36,13
+            5939: 34,14
+            5940: 35,18
+            5941: 36,18
         - node:
             cleanable: True
             color: '#D4D4D447'
             id: Dirt
           decals:
-            6701: 37,-3
-            6702: 37,-2
-            6703: 37,-2
-            6704: 38,-3
-            6705: 39,-2
-            6706: 39,-2
-            6707: 38,-3
-            6708: 38,-2
-            6709: 36,-3
-            6710: 36,-3
-            6711: 36,-2
-            6712: 36,-2
-            6713: 39,-3
-            6714: 37,-3
-            6715: 37,-3
+            6545: 37,-3
+            6546: 37,-2
+            6547: 37,-2
+            6548: 38,-3
+            6549: 39,-2
+            6550: 39,-2
+            6551: 38,-3
+            6552: 38,-2
+            6553: 36,-3
+            6554: 36,-3
+            6555: 36,-2
+            6556: 36,-2
+            6557: 39,-3
+            6558: 37,-3
+            6559: 37,-3
         - node:
             cleanable: True
             color: '#FFFFFF47'
             id: Dirt
           decals:
-            6610: 15,-30
-            6611: 15,-30
-            6612: 16,-27
-            6613: 16,-27
+            6454: 15,-30
+            6455: 15,-30
+            6456: 16,-27
+            6457: 16,-27
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            6081: 51,20
-            6082: 50,21
-            6119: 81,-34
-            6120: 83,-35
-            6121: 81,-34
-            6122: 81,-34
-            6123: 83,-35
-            6124: 81,-35
-            6125: 82,-35
-            6126: 82,-35
-            6127: 80,-35
-            6128: 83,-36
-            6133: 82,-34
-            6682: -25,-42
+            5953: 51,20
+            5954: 50,21
+            5991: 81,-34
+            5992: 83,-35
+            5993: 81,-34
+            5994: 81,-34
+            5995: 83,-35
+            5996: 81,-35
+            5997: 82,-35
+            5998: 82,-35
+            5999: 80,-35
+            6000: 83,-36
+            6005: 82,-34
+            6526: -25,-42
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            2992: -44,16
-            2993: -43,17
-            2994: -41,14
+            2932: -44,16
+            2933: -43,17
+            2934: -41,14
         - node:
             cleanable: True
             color: '#1D1D21FF'
             id: DirtHeavy
           decals:
-            2917: -39,26
-            2918: -40,29
-            2919: -38,28
-            2920: -36,29
-            2921: -35,27
-            2922: -35,26
-            2923: -35,26
-            2924: -37,26
-            2925: -37,26
-            2926: -37,25
-            2927: -39,26
-            2928: -34,25
-            2929: -34,25
-            2930: -36,24
+            2857: -39,26
+            2858: -40,29
+            2859: -38,28
+            2860: -36,29
+            2861: -35,27
+            2862: -35,26
+            2863: -35,26
+            2864: -37,26
+            2865: -37,26
+            2866: -37,25
+            2867: -39,26
+            2868: -34,25
+            2869: -34,25
+            2870: -36,24
         - node:
             cleanable: True
             color: '#835432FF'
             id: DirtHeavy
           decals:
-            2909: -36,26
-            2910: -35,27
-            2911: -37,26
-            2912: -37,27
-            2913: -37,25
-            2914: -39,26
-            2915: -38,27
-            2916: -38,28
+            2849: -36,26
+            2850: -35,27
+            2851: -37,26
+            2852: -37,27
+            2853: -37,25
+            2854: -39,26
+            2855: -38,27
+            2856: -38,28
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            6575: 89,-20
-            6576: 87,-21
-            6577: 92,-21
+            6419: 89,-20
+            6420: 87,-21
+            6421: 92,-21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            2937: -8,-40
-            2938: -7,-39
-            2939: -5,-40
-            2940: -6,-42
-            2941: -4,-39
-            2942: -6,-40
-            2943: -6,-40
-            2944: -7,-40
-            2945: -7,-39
-            2946: -7,-39
-            2947: -8,-39
-            3622: -60,-66
-            3623: -59,-65
-            3624: -59,-63
-            3625: -59,-61
-            3626: -59,-59
-            3627: -59,-57
-            3628: -60,-57
-            3629: -57,-57
-            3630: -58,-58
-            3631: -56,-57
-            3632: -56,-58
-            3633: -56,-60
-            3634: -56,-62
-            3635: -56,-64
-            3636: -56,-66
-            3637: -58,-66
-            3638: -55,-56
-            3639: -54,-54
-            3640: -54,-52
-            3641: -54,-50
-            3642: -56,-53
-            3643: -56,-52
-            3644: -56,-47
-            3645: -53,-48
-            3646: -52,-46
-            3647: -54,-46
-            3648: -51,-46
-            3649: -50,-48
-            3650: -47,-48
-            3651: -45,-48
-            3652: -43,-46
-            3653: -45,-46
-            3654: -43,-48
-            3655: -42,-48
-            3656: -40,-48
-            3657: -40,-50
-            3658: -40,-52
-            3659: -40,-54
-            3660: -42,-51
-            3661: -42,-53
-            3662: -42,-54
-            3663: -41,-56
-            3664: -39,-57
-            3665: -40,-58
-            3666: -37,-57
-            3667: -37,-58
-            3668: -37,-61
-            3669: -37,-64
-            3670: -37,-65
-            3671: -36,-65
-            3672: -36,-66
-            3673: -39,-66
-            3674: -40,-65
-            3675: -40,-63
-            3676: -40,-60
-            3677: -47,-44
-            3678: -47,-42
-            3679: -47,-39
-            3680: -47,-35
-            3681: -47,-33
-            3682: -49,-33
-            3683: -49,-37
-            3684: -49,-39
-            3685: -49,-41
-            3686: -49,-44
-            3687: -49,-44
-            3688: -49,-43
-            3689: -44,-32
-            3690: -44,-30
-            3691: -43,-31
-            3692: -43,-27
-            3693: -44,-26
-            3694: -43,-26
-            3695: -44,-25
-            3696: -52,-32
-            3697: -52,-30
-            3698: -52,-29
-            3699: -52,-25
-            3700: -52,-22
-            3701: -54,-22
-            3702: -55,-22
-            3703: -52,-20
-            3704: -50,-20
-            3705: -47,-20
-            3706: -46,-20
-            3707: -45,-20
-            3708: -44,-20
-            3709: -44,-22
-            3710: -51,-18
-            3711: -51,-17
-            3712: -49,-17
-            3713: -48,-15
-            3714: -48,-13
-            3715: -50,-13
-            3716: -51,-14
-            3717: -51,-15
-            3718: -44,-15
-            3719: -46,-15
-            3720: -46,-14
-            3721: -54,-24
-            3722: -56,-24
-            3723: -54,-30
-            3724: -56,-29
-            3725: -57,-28
-            3726: -54,-28
-            3727: -61,-29
-            3728: -59,-29
-            3729: -59,-27
-            3730: -59,-25
-            3731: -61,-25
-            3732: -55,-17
-            3733: -55,-15
-            3734: -55,-13
-            3735: -55,-10
-            3736: -53,-17
-            3737: -53,-14
-            3738: -53,-12
-            3739: -53,-11
-            3740: -53,-9
-            3741: -53,-7
-            3742: -53,-6
-            3743: -53,-4
-            3744: -55,-3
-            3745: -55,-7
-            3746: -55,-8
-            3747: -53,0
-            3748: -53,-2
-            3749: -51,-4
-            3750: -49,-4
-            3751: -50,-5
-            3752: -48,-5
-            3761: -53,2
-            3762: -53,4
-            3763: -53,6
-            3764: -53,7
-            3765: -55,7
-            3766: -55,5
-            3767: -55,-1
-            3768: -51,6
-            3769: -50,7
-            3770: -47,7
-            3771: -48,6
-            3772: -46,6
-            3773: -45,7
-            3774: -47,9
-            3775: -45,9
-            3776: -44,9
-            3777: -50,9
-            3778: -50,9
-            3779: -51,11
-            3780: -51,13
-            3781: -50,13
-            3782: -48,13
-            3783: -46,13
-            3784: -48,12
-            3785: -43,11
-            3786: -44,12
-            3787: -43,13
-            3788: -43,12
-            3789: -54,10
-            3790: -53,9
-            3791: -54,9
-            3814: -43,1
-            3815: -40,2
-            3816: -39,1
-            3817: -39,1
-            3818: -40,-1
-            3819: -38,-1
-            3820: -40,-2
-            3821: -39,-2
-            3822: -40,-4
-            3823: -39,-5
-            3824: -38,-5
-            3825: -37,-5
-            3826: -36,-5
-            3827: -38,-4
-            3828: -36,-3
-            3829: -36,-2
-            3830: -36,-4
-            3831: -34,-3
-            3832: -32,-4
-            3833: -34,-1
-            3834: -32,0
-            3835: -35,0
-            3836: -39,3
-            3837: -40,4
-            3838: -38,4
-            3839: -33,1
-            3840: -31,2
-            3841: -31,-1
-            3842: -29,0
-            3843: -32,-2
-            3844: -31,-3
-            3845: -33,-4
-            3846: -32,-5
-            3847: -31,-4
-            3848: -30,-3
-            3849: -28,-3
-            3850: -28,-4
-            3851: -26,-5
-            3852: -27,-2
-            3853: -27,-3
-            3854: -29,0
-            3855: -27,0
-            3856: -27,2
-            3857: -28,3
-            3858: -27,3
-            3859: -27,1
-            3860: -26,-1
-            3861: -32,-1
-            3862: -28,4
-            3863: -26,5
-            3864: -26,6
-            3865: -26,3
-            3866: -26,3
-            3867: -24,2
-            3868: -23,1
-            3869: -25,0
-            3870: -23,-2
-            3871: -25,-3
-            3872: -23,-3
-            3873: -25,-4
-            3874: -23,-5
-            3875: -25,-5
-            3876: -24,-1
-            3877: -25,-1
-            3878: -23,3
-            3879: -15,-1
-            3880: -16,-1
-            3881: -15,0
-            3882: -16,1
-            3883: -16,3
-            3884: -15,3
-            3885: -15,2
-            3886: -15,1
-            3887: -15,1
-            3888: -27,6
-            3889: -27,7
-            3890: -27,9
-            3891: -20,5
-            3892: -21,5
-            3897: -17,5
-            3898: -16,5
-            3899: -16,5
-            3900: -22,11
-            3901: -21,11
-            3902: -22,13
-            3903: -20,14
-            3904: -22,13
-            3905: -22,15
-            3906: -20,14
-            3907: -20,13
-            3908: -20,12
-            3909: -19,11
-            3910: -22,14
-            3911: -23,14
-            3912: -17,11
-            3913: -17,11
-            3914: -17,12
-            3915: -16,11
-            3916: -16,12
-            3917: -17,13
-            3918: -16,14
-            3919: -17,14
-            3920: -16,12
-            3921: -17,12
-            3922: -17,11
-            3942: -39,11
-            3945: -27,11
-            3946: -27,13
-            3947: -27,16
-            3948: -27,17
-            3949: -27,19
-            3950: -27,20
-            3951: -27,21
-            3952: -25,18
-            3953: -25,16
-            3954: -25,14
-            3955: -25,12
-            3956: -25,11
-            3957: -24,18
-            3958: -22,18
-            3959: -23,17
-            3960: -21,17
-            3961: -20,18
-            3962: -19,17
-            3963: -20,20
-            3964: -22,20
-            3965: -24,20
-            3966: -20,21
-            3967: -17,19
-            3968: -16,19
-            3969: -14,19
-            3970: -17,21
-            3971: -15,21
-            3972: -13,21
-            3973: -11,21
-            3974: -13,19
-            3975: -10,19
-            3976: -8,19
-            3977: -6,19
-            3978: -9,21
-            3979: -7,21
-            3980: -5,21
-            3981: -3,21
-            3982: 0,21
-            3983: -5,19
-            3984: -2,19
-            3985: 0,19
-            3986: 0,21
-            3987: 2,21
-            3988: 5,21
-            3989: 6,21
-            3990: 2,19
-            3991: 4,19
-            3992: 7,19
-            3993: 10,19
-            3994: 8,21
-            3995: 10,21
-            3996: 11,21
-            3997: 13,21
-            3998: 12,19
-            3999: 14,19
-            4000: 15,19
-            4001: 17,19
-            4002: 15,23
-            4003: 14,23
-            4004: 13,24
-            4005: 15,25
-            4006: 15,24
-            4007: 11,23
-            4008: 10,23
-            4009: 11,24
-            4010: 17,23
-            4011: 17,25
-            4012: 17,25
-            4013: 16,23
-            4014: 18,19
-            4015: 19,19
-            4016: 19,21
-            4017: 17,21
-            4018: 16,21
-            4019: 21,20
-            4020: 21,18
-            4021: 21,17
-            4022: 19,18
-            4023: 19,15
-            4024: 19,12
-            4025: 19,11
-            4026: 21,16
-            4027: 21,13
-            4028: 21,12
-            4029: 21,10
-            4030: 21,8
-            4031: 21,7
-            4032: 19,9
-            4033: 19,7
-            4034: 19,6
-            4035: 23,10
-            4036: 24,10
-            4037: 26,10
-            4038: 27,10
-            4039: 28,7
-            4040: 27,8
-            4041: 27,6
-            4042: 28,6
-            4043: 30,6
-            4044: 30,8
-            4045: 30,9
-            4046: 30,10
-            4047: 33,10
-            4048: 34,10
-            4049: 31,12
-            4050: 31,13
-            4051: 30,14
-            4052: 31,17
-            4053: 30,17
-            4054: 31,19
-            4055: 31,20
-            4056: 31,22
-            4057: 30,22
-            4058: 28,22
-            4059: 29,23
-            4060: 26,22
-            4061: 24,22
-            4062: 23,22
-            4063: 23,23
-            4064: 23,20
-            4065: 23,18
-            4066: 25,18
-            4067: 25,17
-            4068: 26,18
-            4069: 27,17
-            4070: 26,19
-            4071: 27,20
-            4072: 29,18
-            4073: 27,18
-            4074: 30,17
-            4075: 33,22
-            4076: 35,22
-            4077: 33,19
-            4078: 33,18
-            4079: 35,18
-            4080: 36,17
-            4081: 34,17
-            4082: 35,17
-            4083: 33,13
-            4084: 33,15
-            4085: 33,15
-            4086: 32,13
-            4087: 26,7
-            4088: 23,2
-            4089: 26,2
-            4090: 20,2
-            4091: 21,2
-            4092: 19,4
-            4098: 31,2
-            4099: 33,2
-            4100: 33,4
-            4101: 32,4
-            4102: 35,4
-            4103: 37,4
-            4104: 37,2
-            4105: 40,2
-            4106: 41,2
-            4107: 41,1
-            4108: 38,2
-            4109: 39,-4
-            4110: 37,-4
-            4111: 39,-5
-            4112: 33,-1
-            4113: 31,-1
-            4114: 31,0
-            4115: 33,0
-            4116: 32,1
-            4117: 38,7
-            4118: 46,11
-            4119: 47,13
-            4120: 44,11
-            4121: 44,13
-            4122: 42,12
-            4123: 42,11
-            4124: 44,12
-            4125: 54,14
-            4126: 58,14
-            4127: 59,14
-            4128: 60,14
-            4129: 58,16
-            4130: 55,10
-            4131: 55,12
-            4132: 54,12
-            4133: 54,6
-            4134: 59,3
-            4135: 60,4
-            4136: 59,0
-            4137: 55,-5
-            4138: 56,-4
-            4139: 57,-5
-            4140: 58,-7
-            4141: 59,-8
-            4142: 60,-7
-            4143: 41,-1
-            4144: 41,-3
-            4145: 41,-5
-            4146: 41,-7
-            4147: 41,-10
-            4148: 41,-11
-            4149: 43,-12
-            4150: 43,-14
-            4151: 43,-16
-            4152: 43,-17
-            4153: 41,-15
-            4154: 41,-16
-            4155: 41,-17
-            4156: 41,-19
-            4157: 40,-19
-            4158: 40,-21
-            4159: 42,-21
-            4160: 43,-21
-            4161: 45,-21
-            4166: 45,-19
-            4167: 47,-19
-            4168: 48,-19
-            4169: 51,-19
-            4170: 47,-21
-            4171: 49,-21
-            4172: 47,-22
-            4173: 51,-21
-            4174: 52,-21
-            4175: 52,-23
-            4176: 53,-24
-            4177: 56,-24
-            4178: 57,-24
-            4179: 58,-24
-            4180: 58,-23
-            4181: 59,-21
-            4182: 60,-21
-            4183: 61,-20
-            4184: 59,-19
-            4185: 61,-19
-            4186: 60,-17
-            4187: 60,-17
-            4188: 58,-18
-            4189: 58,-19
-            4190: 56,-19
-            4191: 55,-19
-            4192: 53,-19
-            4193: 60,-15
-            4194: 58,-15
-            4195: 59,-14
-            4196: 57,-13
-            4197: 57,-12
-            4198: 60,-13
-            4199: 60,-12
-            4200: 60,-14
-            4201: 61,-13
-            4202: 63,-13
-            4203: 64,-12
-            4204: 65,-14
-            4205: 63,-14
-            4206: 63,-16
-            4207: 65,-16
-            4208: 65,-18
-            4209: 65,-20
-            4210: 63,-18
-            4211: 63,-20
-            4212: 63,-21
-            4213: 65,-21
-            4214: 62,-23
-            4215: 61,-24
-            4216: 64,-24
-            4217: 63,-25
-            4218: 64,-26
-            4219: 65,-27
-            4220: 66,-26
-            4221: 65,-24
-            4222: 65,-23
-            4223: 65,-23
-            4227: 68,-21
-            4228: 69,-21
-            4229: 69,-23
-            4230: 69,-24
-            4232: 69,-27
-            4233: 70,-26
-            4234: 70,-26
-            4235: 71,-27
-            4236: 71,-28
-            4237: 70,-28
-            4238: 68,-28
-            4239: 69,-29
-            4240: 70,-30
-            4241: 69,-30
-            4242: 70,-29
-            4243: 70,-29
-            4244: 70,-29
-            4245: 71,-30
-            4246: 71,-17
-            4247: 68,-17
-            4248: 67,-19
-            4249: 70,-17
-            4250: 70,-19
-            4251: 71,-18
-            4252: 68,-18
-            4253: 69,-19
-            4273: 69,-9
-            4274: 68,-9
-            4275: 67,-9
-            4276: 70,-10
-            4277: 77,-18
-            4278: 75,-18
-            4279: 76,-19
-            4280: 77,-18
-            4281: 76,-17
-            4282: 76,-15
-            4283: 75,-15
-            4284: 76,-13
-            4285: 77,-14
-            4286: 74,-14
-            4287: 74,-16
-            4288: 73,-14
-            4289: 74,-17
-            4290: 74,-18
-            4291: 72,-17
-            4292: 73,-19
-            4293: 73,-17
-            4294: 74,-16
-            4295: 73,-15
-            4296: 74,-16
-            4297: 74,-15
-            4298: 76,-18
-            4299: 79,-14
-            4300: 80,-13
-            4301: 81,-14
-            4302: 79,-14
-            4303: 80,-15
-            4304: 81,-13
-            4305: 80,-19
-            4306: 79,-18
-            4307: 80,-18
-            4308: 80,-19
-            4309: 79,-19
-            4310: 80,-19
-            4311: 81,-19
-            4312: 80,-17
-            4313: 80,-18
-            4314: 79,-19
-            4315: 50,-13
-            4316: 51,-14
-            4317: 50,-13
-            4318: 51,-13
-            4319: 50,-14
-            4320: 50,-14
-            4321: 48,-13
-            4322: 48,-14
-            4323: 48,-13
-            4324: 53,-13
-            4325: 53,-14
-            4326: 53,-12
-            4327: 53,-14
-            4328: 53,-13
-            4329: 53,-14
-            4330: 50,-15
-            4331: 51,-15
-            4332: 50,-14
-            4333: 51,-13
-            4334: 50,-12
-            4335: 50,-12
-            4336: 48,-12
-            4337: 50,-12
-            4338: 51,-13
-            4339: 47,-24
-            4340: 49,-25
-            4341: 48,-26
-            4342: 47,-25
-            4343: 49,-25
-            4344: 48,-23
-            4345: 47,-28
-            4346: 49,-29
-            4347: 47,-30
-            4348: 48,-32
-            4349: 49,-31
-            4350: 48,-33
-            4351: 47,-33
-            4352: 49,-33
-            4353: 48,-34
-            4354: 47,-34
-            4355: 43,-36
-            4356: 40,-36
-            4357: 37,-35
-            4358: 36,-35
-            4359: 37,-36
-            4360: 40,-36
-            4361: 43,-35
-            4362: 43,-35
-            4363: 41,-35
-            4364: 43,-35
-            4365: 43,-34
-            4391: 33,-34
-            4392: 31,-34
-            4393: 33,-32
-            4394: 32,-32
-            4395: 32,-31
-            4396: 32,-30
-            4397: 33,-28
-            4398: 31,-29
-            4399: 33,-31
-            4400: 33,-31
-            4401: 35,-30
-            4402: 36,-30
-            4403: 36,-29
-            4404: 33,-25
-            4405: 31,-25
-            4406: 33,-25
-            4407: 31,-25
-            4408: 33,-25
-            4409: 32,-26
-            4410: 31,-25
-            4411: 32,-24
-            4412: 32,-25
-            4413: 31,-24
-            4414: 40,-25
-            4415: 39,-24
-            4416: 40,-26
-            4417: 42,-25
-            4418: 42,-25
-            4419: 44,-24
-            4420: 42,-25
-            4421: 44,-25
-            4422: 45,-25
-            4423: 42,-26
-            4424: 43,-25
-            4425: 43,-25
-            4426: 41,-25
-            4427: 40,-25
-            4428: 40,-25
-            4429: 40,-24
-            4430: 35,-23
-            4431: 37,-23
-            4432: 36,-23
-            4433: 35,-23
-            4434: 38,-21
-            4435: 35,-21
-            4436: 33,-21
-            4437: 33,-22
-            4438: 32,-22
-            4439: 32,-21
-            4440: 37,-19
-            4441: 34,-19
-            4442: 32,-19
-            4443: 31,-19
-            4444: 28,-19
-            4445: 27,-19
-            4446: 27,-20
-            4447: 27,-21
-            4448: 30,-21
-            4449: 29,-21
-            4450: 29,-23
-            4451: 29,-24
-            4452: 29,-25
-            4453: 29,-26
-            4454: 27,-22
-            4455: 27,-24
-            4456: 27,-25
-            4457: 26,-25
-            4458: 25,-25
-            4459: 29,-27
-            4460: 27,-27
-            4461: 25,-27
-            4462: 24,-27
-            4463: 21,-27
-            4464: 21,-25
-            4465: 20,-25
-            4466: 19,-25
-            4467: 19,-26
-            4468: 19,-28
-            4469: 19,-28
-            4470: 19,-30
-            4471: 19,-31
-            4472: 19,-32
-            4473: 21,-30
-            4474: 21,-33
-            4475: 21,-34
-            4476: 21,-34
-            4477: 19,-34
-            4478: 20,-36
-            4479: 20,-37
-            4480: 19,-37
-            4481: 20,-39
-            4482: 21,-38
-            4483: 22,-39
-            4484: 21,-37
-            4485: 24,-37
-            4486: 23,-38
-            4487: 25,-37
-            4488: 25,-38
-            4489: 24,-38
-            4490: 25,-38
-            4491: 17,-34
-            4492: 17,-35
-            4493: 16,-34
-            4494: 14,-34
-            4495: 17,-32
-            4496: 15,-32
-            4497: 13,-32
-            4498: 11,-32
-            4499: 10,-32
-            4500: 12,-34
-            4501: 9,-34
-            4502: 8,-34
-            4503: 7,-34
-            4504: 7,-32
-            4505: 7,-32
-            4506: 6,-32
-            4507: 9,-30
-            4508: 8,-29
-            4509: 7,-29
-            4510: 7,-29
-            4511: 6,-28
-            4512: 8,-27
-            4513: 9,-27
-            4514: 7,-28
-            4515: 6,-27
-            4516: 5,-29
-            4517: 7,-30
-            4518: 9,-30
-            4519: 3,-30
-            4520: 1,-30
-            4521: 3,-32
-            4522: 2,-32
-            4523: 2,-33
-            4524: 0,-33
-            4525: -1,-33
-            4526: -1,-32
-            4527: 0,-30
-            4528: -3,-30
-            4529: -4,-30
-            4530: -6,-30
-            4531: -7,-30
-            4532: -9,-30
-            4533: -6,-32
-            4534: -5,-32
-            4535: -3,-32
-            4536: -8,-32
-            4537: -8,-33
-            4538: -9,-32
-            4539: -10,-32
-            4540: -11,-32
-            4541: -13,-32
-            4542: -10,-30
-            4543: -11,-30
-            4544: -13,-30
-            4545: -15,-30
-            4546: -16,-30
-            4547: -12,-29
-            4548: -12,-30
-            4549: -16,-32
-            4550: -17,-33
-            4551: -17,-32
-            4552: -19,-32
-            4553: -18,-30
-            4554: -20,-30
-            4555: -22,-30
-            4556: -23,-30
-            4557: -23,-29
-            4558: -22,-32
-            4559: -24,-32
-            4560: -24,-32
-            4561: -26,-30
-            4562: -26,-29
-            4563: -26,-27
-            4564: -26,-25
-            4565: -24,-27
-            4566: -24,-26
-            4567: -24,-25
-            4568: -24,-24
-            4569: -26,-23
-            4570: -26,-22
-            4571: -26,-20
-            4572: -24,-21
-            4573: -24,-19
-            4574: -24,-18
-            4575: -24,-16
-            4576: -26,-17
-            4577: -26,-16
-            4578: -26,-14
-            4579: -26,-13
-            4580: -26,-12
-            4581: -26,-10
-            4582: -26,-9
-            4583: -25,-9
-            4584: -24,-11
-            4585: -23,-11
-            4586: -23,-10
-            4587: -23,-9
-            4588: -24,-5
-            4589: -24,-4
-            4590: -24,-2
-            4591: -19,-11
-            4592: -19,-10
-            4593: -20,-10
-            4594: -20,-9
-            4595: -19,-9
-            4596: -30,-21
-            4597: -30,-19
-            4598: -29,-19
-            4599: -30,-18
-            4600: -32,-21
-            4601: -32,-19
-            4602: -33,-18
-            4603: -34,-18
-            4604: -36,-15
-            4605: -36,-14
-            4606: -33,-14
-            4607: -33,-14
-            4608: -33,-15
-            4609: -30,-14
-            4610: -36,-10
-            4611: -37,-9
-            4612: -37,-10
-            4613: -29,-10
-            4614: -30,-11
-            4615: -30,-9
-            4616: -28,-10
-            4617: -40,-11
-            4618: -41,-10
-            4619: -41,-9
-            4620: -40,-9
-            4621: -41,-10
-            4622: -41,-10
-            4623: -49,-18
-            4624: -38,-33
-            4625: -36,-33
-            4626: -33,-33
-            4627: -32,-33
-            4628: -31,-33
-            4629: -31,-31
-            4630: -31,-29
-            4631: -31,-28
-            4632: -31,-26
-            4633: -33,-26
-            4634: -35,-26
-            4635: -36,-26
-            4636: -37,-26
-            4637: -38,-26
-            4638: -38,-27
-            4639: -38,-29
-            4640: -38,-30
-            4641: -38,-31
-            4642: -38,-29
-            4643: -38,-26
-            4644: -40,-26
-            4645: -40,-25
-            4646: -41,-25
-            4647: -41,-26
-            4648: -41,-28
-            4649: -41,-29
-            4650: -41,-30
-            4651: -41,-32
-            4652: -41,-33
-            4653: -41,-34
-            4654: -39,-33
-            4655: -40,-34
-            4656: -35,-34
-            4657: -34,-34
-            4658: -32,-34
-            4659: -31,-34
-            4660: -30,-34
-            4661: -30,-33
-            4662: -28,-34
-            4663: -28,-32
-            4664: -28,-31
-            4665: -28,-29
-            4666: -28,-27
-            4667: -28,-26
-            4668: -29,-25
-            4669: -30,-25
-            4670: -30,-26
-            4671: -32,-25
-            4672: -33,-26
-            4673: -35,-25
-            4674: -32,6
-            4675: -32,7
-            4676: -32,6
-            4677: -36,6
-            4678: -36,5
-            4679: -36,7
-            4680: -34,6
-            4681: -34,5
-            4682: -35,6
-            4683: -33,6
-            4684: -35,-4
-            4685: -35,-2
-            4686: -36,-5
-            4687: -35,-2
-            4688: -34,-2
-            4689: -35,-1
-            4701: -25,28
-            4702: -26,28
-            4703: -18,32
-            4704: -17,31
-            4705: -17,33
-            4706: -18,32
-            4707: -15,34
-            4708: -15,32
-            4709: -15,31
-            4710: -13,31
-            4711: -12,31
-            4712: -15,34
-            4713: -15,34
-            4714: -12,39
-            4715: -13,40
-            4716: -14,40
-            4717: -15,40
-            4718: -16,40
-            4719: -16,40
-            4720: -13,40
-            4721: -12,40
-            4722: -12,38
-            4723: -12,40
-            4729: -5,40
-            4730: -6,40
-            4731: -6,42
-            4732: -6,43
-            4733: -5,42
-            4734: -6,43
-            4735: -6,45
-            4736: -6,46
-            4737: -6,47
-            4738: -5,46
-            4739: -4,48
-            4740: -5,46
-            4741: -2,48
-            4742: -4,46
-            4743: -1,47
-            4744: -3,45
-            4745: 0,46
-            4746: -3,47
-            4747: -1,45
-            4748: -3,46
-            4749: 1,45
-            4750: 1,47
-            4751: 0,46
-            4752: 1,48
-            4753: 2,48
-            4754: 3,47
-            4755: 2,45
-            4756: 2,44
-            4757: 2,43
-            4758: 2,42
-            4759: 1,42
-            4760: 3,42
-            4761: -2,43
-            4762: -1,41
-            4763: -3,40
-            4764: -3,40
-            4765: 1,51
-            4766: -2,50
-            4767: -3,50
-            4768: -2,51
-            4769: 0,51
-            4770: -1,52
-            4771: -2,51
-            4772: -2,53
-            4773: 1,53
-            4774: 2,51
-            4775: 2,50
-            4776: 0,50
-            4777: -4,45
-            4778: -4,47
-            4805: 6,42
-            4806: 5,41
-            4807: 5,39
-            4808: 7,39
-            4809: 8,39
-            4810: 9,41
-            4811: 9,40
-            4812: 8,42
-            4813: 8,41
-            4814: 15,37
-            4815: 14,37
-            4816: 14,35
-            4817: 14,34
-            4818: 13,35
-            4819: 13,36
-            4820: 15,34
-            4821: 16,35
-            4822: 15,36
-            4823: 15,34
-            4824: 15,35
-            4825: 15,37
-            4826: 14,37
-            4827: 15,30
-            4828: 14,29
-            4829: 14,29
-            4830: 15,28
-            4831: 14,29
-            4832: 14,32
-            4833: 13,32
-            4834: 15,24
-            4858: 2,24
-            4859: 1,24
-            4860: 1,24
-            4861: 2,23
-            4862: 4,23
-            4863: 4,24
-            4864: 3,26
-            4865: 4,28
-            4866: 2,27
-            4867: 2,27
-            4868: 3,27
-            4869: -2,25
-            4870: -3,25
-            4871: -3,23
-            4872: -2,24
-            4873: -4,23
-            4874: -4,25
-            4910: -14,28
-            4911: -15,28
-            4912: -14,29
-            4913: -13,26
-            4914: -10,26
-            4915: -9,27
-            4916: -10,28
-            4917: -7,28
-            4918: -8,26
-            4919: -5,28
-            4920: -7,24
-            4921: -8,24
-            4922: -7,23
-            4923: -6,24
-            4924: -6,23
-            4925: -7,23
-            4926: -8,23
-            4927: -8,23
-            4928: -12,23
-            4929: -11,24
-            4930: -10,23
-            4931: -10,24
-            4932: -10,24
-            4933: -12,24
-            4934: -12,24
-            4935: -14,24
-            4936: -14,23
-            4937: -16,24
-            4938: -14,24
-            4939: -15,23
-            4940: -16,24
-            4941: -14,25
-            4942: -10,25
-            4943: -7,25
-            4944: -1,28
-            4945: -3,27
-            4946: -1,30
-            4947: -1,33
-            4948: -1,34
-            4949: -1,37
-            4950: -3,37
-            4951: -3,38
-            4952: -1,37
-            4953: -2,37
-            4954: -1,40
-            4955: -3,41
-            4956: -3,43
-            4957: -2,43
-            4958: -20,25
-            4959: -21,25
-            4960: -19,25
-            4961: -21,25
-            4962: -22,17
-            4963: -23,17
-            4964: -22,5
-            4965: -22,5
-            4966: -22,5
-            4967: -19,-28
-            4968: -16,-28
-            4969: -16,-27
-            4970: -15,-28
-            4971: -16,-26
-            4972: -15,-27
-            4973: -15,-28
-            4974: -15,-26
-            4975: -15,-26
-            4976: -14,-26
-            4987: -25,-34
-            4988: -23,-34
-            4989: -22,-34
-            4990: -21,-34
-            4991: -20,-34
-            4992: -20,-37
-            4993: -20,-36
-            4994: -19,-38
-            4995: -19,-36
-            4996: -22,-37
-            4997: -23,-37
-            4998: -23,-38
-            4999: -23,-36
-            5000: -24,-37
-            5001: -26,-37
-            5002: -26,-36
-            5003: -26,-37
-            5004: -28,-40
-            5005: -27,-40
-            5006: -25,-40
-            5007: -24,-40
-            5008: -23,-40
-            5009: -21,-40
-            5010: -19,-40
-            5011: -21,-40
-            5012: -24,-40
-            5013: -26,-40
-            5014: -32,-40
-            5015: -31,-40
-            5016: -33,-39
-            5017: -33,-40
-            5018: -32,-39
-            5019: -31,-39
-            5020: -34,-39
-            5021: -33,-40
-            5022: -39,-38
-            5023: -38,-38
-            5032: -38,-53
-            5033: -38,-54
-            5034: -37,-53
-            5035: -37,-54
-            5036: -14,-39
-            5037: -13,-38
-            5038: -13,-39
-            5039: -13,-40
-            5040: -13,-41
-            5041: -13,-39
-            5042: -13,-40
-            5043: -13,-41
-            5044: -13,-39
-            5045: -13,-40
-            5046: -13,-39
-            5047: -13,-40
-            5050: -5,-41
-            5051: -5,-40
-            5052: -6,-42
-            5053: -5,-36
-            5054: -6,-36
-            5055: -4,-35
-            5056: -4,-36
-            5057: 0,-36
-            5058: -2,-36
-            5059: 1,-35
-            5060: 1,-37
-            5061: 1,-38
-            5062: 2,-37
-            5063: 2,-38
-            5064: 0,-37
-            5065: 3,-37
-            5066: -1,-36
-            5070: -6,-28
-            5071: -6,-27
-            5072: -5,-27
-            5073: -6,-26
-            5074: -2,-27
-            5075: -3,-26
-            5076: -2,-28
-            5077: -1,-27
-            5078: 0,-27
-            5079: 0,-27
-            5080: -2,-27
-            5081: -2,-27
-            5082: 0,-24
-            5083: -2,-24
-            5084: -2,-23
-            5085: 0,-22
-            5086: 1,-22
-            5087: 1,-21
-            5088: -4,-19
-            5089: -5,-19
-            5090: -7,-19
-            5091: -9,-19
-            5092: -6,-19
-            5093: -7,-17
-            5094: -8,-17
-            5095: -9,-16
-            5096: -9,-16
-            5097: -5,-16
-            5098: -4,-14
-            5099: -5,-15
-            5100: -8,-16
-            5101: -8,-15
-            5102: -14,-14
-            5103: -12,-14
-            5104: -12,-16
-            5105: -13,-18
-            5106: -14,-16
-            5107: -13,-16
-            5108: -13,-19
-            5109: -14,-19
-            5110: -2,-17
-            5111: -2,-15
-            5112: -2,-13
-            5113: -2,-12
-            5114: -1,-15
-            5115: -1,-16
-            5116: -1,-17
-            5117: 1,-17
-            5118: -1,-18
-            5119: 2,-18
-            5120: 2,-16
-            5121: 2,-15
-            5122: 2,-13
-            5123: 1,-12
-            5124: 1,-14
-            5125: -1,-13
-            5126: 0,-14
-            5127: 2,-16
-            5128: -4,-14
-            5129: -7,-24
-            5130: -7,-22
-            5131: -8,-23
-            5132: -10,-23
-            5133: -9,-23
-            5134: -1,-24
-            5135: 8,-23
-            5136: 8,-22
-            5137: 10,-22
-            5138: 9,-23
-            5139: 8,-25
-            5140: 8,-21
-            5141: 8,-19
-            5142: 8,-18
-            5143: 6,-18
-            5144: 5,-18
-            5145: 0,-27
-            5146: 2,-27
-            5147: 10,-23
-            5148: 13,-23
-            5149: 12,-23
-            5150: 13,-21
-            5151: 14,-22
-            5152: 13,-18
-            5153: 14,-18
-            5154: 14,-17
-            5155: 12,-18
-            5156: 11,-18
-            5157: 11,-16
-            5158: 13,-17
-            5159: 11,-30
-            5160: 11,-28
-            5161: 11,-27
-            5162: 11,-26
-            5163: 17,-26
-            5164: 17,-28
-            5165: 17,-28
-            5166: 17,-30
-            5167: 17,-30
-            5168: 18,-23
-            5169: 20,-22
-            5170: 21,-23
-            5171: 19,-22
-            5172: 21,-22
-            5173: 20,-21
-            5174: 24,-22
-            5175: 23,-23
-            5176: 23,-21
-            5177: 23,-23
-            5178: 17,-16
-            5179: 19,-14
-            5180: 18,-13
-            5181: 20,-13
-            5182: 19,-12
-            5183: 22,-11
-            5184: 22,-13
-            5185: 20,-11
-            5186: 24,-13
-            5187: 26,-11
-            5188: 21,-11
-            5189: 20,-11
-            5190: 25,-13
-            5191: 22,-13
-            5192: 23,-12
-            5193: 26,-12
-            5194: 19,-12
-            5195: 23,-13
-            5196: 23,-11
-            5197: 19,-10
-            5198: 26,-11
-            5199: 28,-12
-            5200: 25,-12
-            5201: 23,-16
-            5202: 23,-16
-            5203: 13,-19
-            5204: 23,-34
-            5205: 23,-31
-            5206: 23,-30
-            5207: 23,-29
-            5208: 23,-32
-            5209: 29,-34
-            5210: 29,-33
-            5211: 29,-32
-            5212: 29,-30
-            5213: 29,-29
-            5214: 32,-34
-            5215: 32,-31
-            5216: 32,-30
-            5217: 36,-30
-            5218: 35,-29
-            5219: 33,-26
-            5220: 36,-21
-            5221: 38,-16
-            5222: 37,-15
-            5223: 39,-16
-            5224: 38,-17
-            5225: 38,-15
-            5226: 37,-15
-            5227: 62,-31
-            5228: 62,-33
-            5229: 61,-31
-            5230: 63,-33
-            5231: 63,-33
-            5232: 63,-32
-            5233: 62,-32
-            5234: 62,-32
-            5235: 64,8
-            5236: 63,9
-            5237: 65,9
-            5238: 64,8
-            5239: 64,9
-            5240: 64,10
-            5241: 67,6
-            5242: 68,4
-            5243: 68,6
-            5244: 67,5
-            5245: 68,0
-            5246: 68,1
-            5247: 68,2
-            5248: 67,0
-            5249: 68,-2
-            5250: 67,-3
-            5251: 68,-4
-            5252: 68,-3
-            5253: 68,-3
-            5254: 76,-6
-            5260: 54,-30
-            5261: 52,-31
-            5262: 51,-31
-            5263: 52,-33
-            5264: 52,-34
-            5265: 51,-33
-            5266: 51,-32
-            5267: 52,-35
-            5268: 51,-33
-            5269: 51,-31
-            5270: 52,-35
-            5271: 52,-35
-            5272: 55,-35
-            5273: 54,-34
-            5274: 56,-33
-            5275: 57,-33
-            5276: 55,-34
-            5277: 55,-36
-            5278: 54,-35
-            5279: 55,-34
-            5280: 54,-35
-            5281: 55,-35
-            5282: 55,-34
-            5283: 40,-31
-            5284: 40,-30
-            5285: 40,-30
-            5286: 41,-31
-            5287: 41,-29
-            5288: 42,-29
-            5289: 43,-29
-            5290: 44,-29
-            5291: 44,-31
-            5292: 43,-30
-            5293: 33,-29
-            5294: 15,-39
-            5295: 14,-39
-            5296: 14,-39
-            5297: 9,-40
-            5298: 9,-39
-            5299: 9,-41
-            5300: 8,-40
-            5301: 19,-45
-            5302: 17,-45
-            5303: 16,-44
-            5304: 16,-45
-            5305: 16,-43
-            5306: 19,-45
-            5307: 20,-44
-            5308: 20,-45
-            5309: 18,-44
-            5310: 21,-45
-            5311: 21,-43
-            5312: 15,-48
-            5313: 14,-48
-            5314: 12,-47
-            5315: 12,-48
-            5316: 14,-48
-            5317: 16,-47
-            5318: 14,-48
-            5319: 13,-48
-            5320: 15,-47
-            5327: 21,-54
-            5328: 20,-54
-            5329: 18,-54
-            5330: 16,-54
-            5331: 16,-55
-            5332: 18,-53
-            5333: 19,-53
-            5334: 21,-55
-            5335: 21,-58
-            5336: 21,-59
-            5337: 20,-58
-            5338: 18,-58
-            5339: 17,-58
-            5340: 16,-58
-            5341: 16,-59
-            5342: 19,-59
-            5343: 19,-59
-            5344: 18,-59
-            5345: 27,-46
-            5346: 26,-45
-            5347: 26,-44
-            5348: 27,-45
-            5349: 27,-45
-            5350: 28,-42
-            5351: 29,-42
-            5352: 29,-40
-            5353: 28,-39
-            5354: 28,-39
-            5355: 28,-40
-            5356: 29,-47
-            5357: 28,-47
-            5358: 66,-52
-            5359: 65,-51
-            5360: 66,-52
-            5361: 66,-51
-            5362: 65,-52
-            5363: 66,-51
-            5364: 27,15
-            5365: 28,15
-            5366: 27,14
-            5367: 27,12
-            5368: -23,34
-            5369: -23,35
-            5370: -22,34
-            5371: -27,36
-            5372: -27,34
-            5373: -28,35
-            5374: -27,35
-            5375: -29,36
-            5376: -30,37
-            5377: -30,38
-            5378: -28,35
-            5379: -28,34
-            5380: -29,35
-            5381: -26,36
-            5382: -25,38
-            5383: -26,37
-            5384: -32,36
-            5385: -33,35
-            5386: -33,37
-            5387: -33,35
-            5388: -34,36
-            5389: -33,38
-            5390: -33,35
-            5391: -36,5
-            5392: -42,6
-            5393: -43,4
-            5394: -43,6
-            5395: -42,7
-            5396: -51,9
-            5397: -49,13
-            5398: -42,-5
-            5399: -43,-5
-            5400: -42,-3
-            5401: -45,-4
-            5402: -45,-5
-            5403: -46,-4
-            5404: -43,-3
-            5405: -43,-2
-            5406: -42,-2
-            5407: -60,-29
-            5408: -60,-29
-            5409: -57,-36
-            5410: -58,-36
-            5411: -59,-36
-            5412: -57,-37
-            5413: -58,-35
-            5414: -58,-34
-            5415: -57,-35
-            5416: -59,-34
-            5417: -58,-34
-            5418: -59,-34
-            5419: -60,-34
-            5420: -60,-35
-            5421: -61,-21
-            5422: -62,-21
-            5423: -62,-20
-            5424: -61,-20
-            5425: -61,-20
-            5426: 13,35
-            6077: 52,20
-            6078: 51,21
-            6079: 53,20
-            6080: 53,21
-            6181: 46,14
-            6182: 45,15
-            6183: 46,16
-            6388: 49,-7
-            6389: 48,-6
-            6390: 48,-4
-            6391: 49,-4
-            6392: 52,-7
-            6393: 52,-5
-            6394: 51,-6
-            6395: 52,-2
-            6396: 52,-3
-            6397: 48,-1
-            6398: 48,-2
-            6418: 49,-12
-            6419: 49,-14
-            6420: 49,-15
-            6421: 49,-13
-            6422: 52,-14
-            6423: 52,-13
-            6424: 52,-12
-            6425: 52,-15
-            6426: 52,-15
-            6427: 52,-10
-            6428: 51,1
-            6429: 51,3
-            6430: 51,4
-            6431: 51,8
-            6432: 51,9
-            6433: 51,11
-            6434: 51,13
-            6435: 49,13
-            6436: 49,11
-            6437: 49,9
-            6438: 49,7
-            6439: 49,5
-            6440: 49,3
-            6441: 49,1
-            6454: 42,9
-            6455: 43,9
-            6456: 42,7
-            6457: 43,7
-            6458: 45,7
-            6459: 45,9
-            6460: 46,7
-            6461: 40,4
-            6462: 42,4
-            6463: 43,4
-            6464: 43,2
-            6465: 43,1
-            6466: 43,-2
-            6467: 43,-4
-            6468: 43,-7
-            6469: 43,-6
-            6470: 43,-10
-            6471: 43,-11
-            6472: 45,5
-            6473: 42,5
-            6474: 41,5
-            6553: 90,-18
-            6554: 89,-18
-            6634: 51,-39
-            6635: 52,-39
-            6636: 54,-39
-            6637: 52,-37
-            6647: 51,-30
-            6648: 52,-29
-            6670: -33,-12
-            6671: -33,-10
-            6687: -36,-45
-            6688: -35,-44
-            6689: -35,-46
-            6781: 14,39
-            6782: 13,40
-            6783: 15,42
-            6784: 15,41
-            6785: 16,39
-            6845: 8,-47
-            7124: -34,14
-            7125: -33,15
-            7126: -30,15
-            7127: -31,16
-            7128: -30,17
-            7129: -29,14
-            7130: -29,12
-            7131: -32,12
-            7132: -35,14
-            7133: -37,14
-            7134: -38,13
+            2877: -8,-40
+            2878: -7,-39
+            2879: -5,-40
+            2880: -6,-42
+            2881: -4,-39
+            2882: -6,-40
+            2883: -6,-40
+            2884: -7,-40
+            2885: -7,-39
+            2886: -7,-39
+            2887: -8,-39
+            3547: -60,-66
+            3548: -59,-65
+            3549: -59,-63
+            3550: -59,-61
+            3551: -59,-59
+            3552: -59,-57
+            3553: -60,-57
+            3554: -57,-57
+            3555: -58,-58
+            3556: -56,-57
+            3557: -56,-58
+            3558: -56,-60
+            3559: -56,-62
+            3560: -56,-64
+            3561: -56,-66
+            3562: -58,-66
+            3563: -55,-56
+            3564: -54,-54
+            3565: -54,-52
+            3566: -54,-50
+            3567: -56,-53
+            3568: -56,-52
+            3569: -56,-47
+            3570: -53,-48
+            3571: -52,-46
+            3572: -54,-46
+            3573: -51,-46
+            3574: -50,-48
+            3575: -47,-48
+            3576: -45,-48
+            3577: -43,-46
+            3578: -45,-46
+            3579: -43,-48
+            3580: -42,-48
+            3581: -40,-48
+            3582: -40,-50
+            3583: -40,-52
+            3584: -40,-54
+            3585: -42,-51
+            3586: -42,-53
+            3587: -42,-54
+            3588: -41,-56
+            3589: -39,-57
+            3590: -40,-58
+            3591: -37,-57
+            3592: -37,-58
+            3593: -37,-61
+            3594: -37,-64
+            3595: -37,-65
+            3596: -36,-65
+            3597: -36,-66
+            3598: -39,-66
+            3599: -40,-65
+            3600: -40,-63
+            3601: -40,-60
+            3602: -47,-44
+            3603: -47,-42
+            3604: -47,-39
+            3605: -47,-35
+            3606: -47,-33
+            3607: -49,-33
+            3608: -49,-37
+            3609: -49,-39
+            3610: -49,-41
+            3611: -49,-44
+            3612: -49,-44
+            3613: -49,-43
+            3614: -44,-32
+            3615: -44,-30
+            3616: -43,-31
+            3617: -43,-27
+            3618: -44,-26
+            3619: -43,-26
+            3620: -44,-25
+            3621: -52,-32
+            3622: -52,-30
+            3623: -52,-29
+            3624: -52,-25
+            3625: -52,-22
+            3626: -54,-22
+            3627: -55,-22
+            3628: -52,-20
+            3629: -50,-20
+            3630: -47,-20
+            3631: -46,-20
+            3632: -45,-20
+            3633: -44,-20
+            3634: -44,-22
+            3635: -51,-18
+            3636: -51,-17
+            3637: -49,-17
+            3638: -48,-15
+            3639: -48,-13
+            3640: -50,-13
+            3641: -51,-14
+            3642: -51,-15
+            3643: -44,-15
+            3644: -46,-15
+            3645: -46,-14
+            3646: -54,-24
+            3647: -56,-24
+            3648: -54,-30
+            3649: -56,-29
+            3650: -57,-28
+            3651: -54,-28
+            3652: -61,-29
+            3653: -59,-29
+            3654: -59,-27
+            3655: -59,-25
+            3656: -61,-25
+            3657: -55,-17
+            3658: -55,-15
+            3659: -55,-13
+            3660: -55,-10
+            3661: -53,-17
+            3662: -53,-14
+            3663: -53,-12
+            3664: -53,-11
+            3665: -53,-9
+            3666: -53,-7
+            3667: -53,-6
+            3668: -53,-4
+            3669: -55,-3
+            3670: -55,-7
+            3671: -55,-8
+            3672: -53,0
+            3673: -53,-2
+            3674: -51,-4
+            3675: -49,-4
+            3676: -50,-5
+            3677: -48,-5
+            3686: -53,2
+            3687: -53,4
+            3688: -53,6
+            3689: -53,7
+            3690: -55,7
+            3691: -55,5
+            3692: -55,-1
+            3693: -51,6
+            3694: -50,7
+            3695: -47,7
+            3696: -48,6
+            3697: -46,6
+            3698: -45,7
+            3699: -47,9
+            3700: -45,9
+            3701: -44,9
+            3702: -50,9
+            3703: -50,9
+            3704: -51,11
+            3705: -51,13
+            3706: -50,13
+            3707: -48,13
+            3708: -46,13
+            3709: -48,12
+            3710: -43,11
+            3711: -44,12
+            3712: -43,13
+            3713: -43,12
+            3714: -54,10
+            3715: -53,9
+            3716: -54,9
+            3739: -43,1
+            3740: -40,2
+            3741: -39,1
+            3742: -39,1
+            3743: -40,-1
+            3744: -38,-1
+            3745: -40,-2
+            3746: -39,-2
+            3747: -40,-4
+            3748: -39,-5
+            3749: -38,-5
+            3750: -37,-5
+            3751: -36,-5
+            3752: -38,-4
+            3753: -36,-3
+            3754: -36,-2
+            3755: -36,-4
+            3756: -34,-3
+            3757: -32,-4
+            3758: -34,-1
+            3759: -32,0
+            3760: -35,0
+            3761: -39,3
+            3762: -40,4
+            3763: -38,4
+            3764: -33,1
+            3765: -31,2
+            3766: -31,-1
+            3767: -29,0
+            3768: -32,-2
+            3769: -31,-3
+            3770: -33,-4
+            3771: -32,-5
+            3772: -31,-4
+            3773: -30,-3
+            3774: -28,-3
+            3775: -28,-4
+            3776: -26,-5
+            3777: -27,-2
+            3778: -27,-3
+            3779: -29,0
+            3780: -27,0
+            3781: -27,2
+            3782: -28,3
+            3783: -27,3
+            3784: -27,1
+            3785: -26,-1
+            3786: -32,-1
+            3787: -28,4
+            3788: -26,5
+            3789: -26,6
+            3790: -26,3
+            3791: -26,3
+            3792: -24,2
+            3793: -23,1
+            3794: -25,0
+            3795: -23,-2
+            3796: -25,-3
+            3797: -23,-3
+            3798: -25,-4
+            3799: -23,-5
+            3800: -25,-5
+            3801: -24,-1
+            3802: -25,-1
+            3803: -23,3
+            3804: -15,-1
+            3805: -16,-1
+            3806: -15,0
+            3807: -16,1
+            3808: -16,3
+            3809: -15,3
+            3810: -15,2
+            3811: -15,1
+            3812: -15,1
+            3813: -27,6
+            3814: -27,7
+            3815: -27,9
+            3816: -20,5
+            3817: -21,5
+            3822: -17,5
+            3823: -16,5
+            3824: -16,5
+            3825: -22,11
+            3826: -21,11
+            3827: -22,13
+            3828: -20,14
+            3829: -22,13
+            3830: -22,15
+            3831: -20,14
+            3832: -20,13
+            3833: -20,12
+            3834: -19,11
+            3835: -22,14
+            3836: -23,14
+            3837: -17,11
+            3838: -17,11
+            3839: -17,12
+            3840: -16,11
+            3841: -16,12
+            3842: -17,13
+            3843: -16,14
+            3844: -17,14
+            3845: -16,12
+            3846: -17,12
+            3847: -17,11
+            3850: -39,11
+            3851: -27,11
+            3852: -27,13
+            3853: -27,16
+            3854: -27,17
+            3855: -27,19
+            3856: -27,20
+            3857: -27,21
+            3858: -25,18
+            3859: -25,16
+            3860: -25,14
+            3861: -25,12
+            3862: -25,11
+            3863: -24,18
+            3864: -22,18
+            3865: -23,17
+            3866: -21,17
+            3867: -20,18
+            3868: -19,17
+            3869: -20,20
+            3870: -22,20
+            3871: -24,20
+            3872: -20,21
+            3873: -17,19
+            3874: -16,19
+            3875: -14,19
+            3876: -17,21
+            3877: -15,21
+            3878: -13,21
+            3879: -11,21
+            3880: -13,19
+            3881: -10,19
+            3882: -8,19
+            3883: -6,19
+            3884: -9,21
+            3885: -7,21
+            3886: -5,21
+            3887: -3,21
+            3888: 0,21
+            3889: -5,19
+            3890: -2,19
+            3891: 0,19
+            3892: 0,21
+            3893: 2,21
+            3894: 5,21
+            3895: 6,21
+            3896: 2,19
+            3897: 4,19
+            3898: 7,19
+            3899: 10,19
+            3900: 8,21
+            3901: 10,21
+            3902: 11,21
+            3903: 13,21
+            3904: 12,19
+            3905: 14,19
+            3906: 15,19
+            3907: 17,19
+            3908: 15,23
+            3909: 14,23
+            3910: 13,24
+            3911: 15,25
+            3912: 15,24
+            3913: 11,23
+            3914: 10,23
+            3915: 11,24
+            3916: 17,23
+            3917: 17,25
+            3918: 17,25
+            3919: 16,23
+            3920: 18,19
+            3921: 19,19
+            3922: 19,21
+            3923: 17,21
+            3924: 16,21
+            3925: 21,20
+            3926: 21,18
+            3927: 21,17
+            3928: 19,18
+            3929: 19,15
+            3930: 19,12
+            3931: 19,11
+            3932: 21,16
+            3933: 21,13
+            3934: 21,12
+            3935: 21,10
+            3936: 21,8
+            3937: 21,7
+            3938: 19,9
+            3939: 19,7
+            3940: 19,6
+            3941: 23,10
+            3942: 24,10
+            3943: 26,10
+            3944: 27,10
+            3945: 28,7
+            3946: 27,8
+            3947: 27,6
+            3948: 28,6
+            3949: 30,6
+            3950: 30,8
+            3951: 30,9
+            3952: 30,10
+            3953: 33,10
+            3954: 34,10
+            3955: 31,12
+            3956: 31,13
+            3957: 30,14
+            3958: 31,17
+            3959: 30,17
+            3960: 31,19
+            3961: 31,20
+            3962: 31,22
+            3963: 30,22
+            3964: 28,22
+            3965: 29,23
+            3966: 26,22
+            3967: 24,22
+            3968: 23,22
+            3969: 23,23
+            3970: 23,20
+            3971: 23,18
+            3972: 25,18
+            3973: 25,17
+            3974: 26,18
+            3975: 27,17
+            3976: 26,19
+            3977: 27,20
+            3978: 29,18
+            3979: 27,18
+            3980: 30,17
+            3981: 33,22
+            3982: 35,22
+            3983: 33,19
+            3984: 33,18
+            3985: 35,18
+            3986: 36,17
+            3987: 34,17
+            3988: 35,17
+            3989: 33,13
+            3990: 33,15
+            3991: 33,15
+            3992: 32,13
+            3993: 26,7
+            3994: 23,2
+            3995: 26,2
+            3996: 20,2
+            3997: 21,2
+            3998: 19,4
+            4004: 31,2
+            4005: 33,2
+            4006: 33,4
+            4007: 32,4
+            4008: 35,4
+            4009: 37,4
+            4010: 37,2
+            4011: 40,2
+            4012: 41,2
+            4013: 41,1
+            4014: 38,2
+            4015: 39,-4
+            4016: 37,-4
+            4017: 39,-5
+            4018: 33,-1
+            4019: 31,-1
+            4020: 31,0
+            4021: 33,0
+            4022: 32,1
+            4023: 38,7
+            4024: 54,14
+            4025: 58,14
+            4026: 59,14
+            4027: 60,14
+            4028: 58,16
+            4029: 55,10
+            4030: 55,12
+            4031: 54,12
+            4032: 54,6
+            4033: 59,3
+            4034: 60,4
+            4035: 59,0
+            4036: 55,-5
+            4037: 56,-4
+            4038: 41,-1
+            4039: 41,-3
+            4040: 41,-5
+            4041: 41,-7
+            4042: 41,-10
+            4043: 41,-11
+            4044: 43,-12
+            4045: 43,-14
+            4046: 43,-16
+            4047: 43,-17
+            4048: 41,-15
+            4049: 41,-16
+            4050: 41,-17
+            4051: 41,-19
+            4052: 40,-19
+            4053: 40,-21
+            4054: 42,-21
+            4055: 43,-21
+            4056: 45,-21
+            4061: 45,-19
+            4062: 47,-19
+            4063: 48,-19
+            4064: 51,-19
+            4065: 47,-21
+            4066: 49,-21
+            4067: 47,-22
+            4068: 51,-21
+            4069: 52,-21
+            4070: 52,-23
+            4071: 53,-24
+            4072: 56,-24
+            4073: 57,-24
+            4074: 58,-24
+            4075: 58,-23
+            4076: 59,-21
+            4077: 60,-21
+            4078: 61,-20
+            4079: 59,-19
+            4080: 61,-19
+            4081: 60,-17
+            4082: 60,-17
+            4083: 58,-18
+            4084: 58,-19
+            4085: 56,-19
+            4086: 55,-19
+            4087: 53,-19
+            4088: 60,-15
+            4089: 58,-15
+            4090: 59,-14
+            4091: 57,-13
+            4092: 57,-12
+            4093: 60,-13
+            4094: 60,-12
+            4095: 60,-14
+            4096: 61,-13
+            4097: 63,-13
+            4098: 64,-12
+            4099: 65,-14
+            4100: 63,-14
+            4101: 63,-16
+            4102: 65,-16
+            4103: 65,-18
+            4104: 65,-20
+            4105: 63,-18
+            4106: 63,-20
+            4107: 63,-21
+            4108: 65,-21
+            4109: 62,-23
+            4110: 61,-24
+            4111: 64,-24
+            4112: 63,-25
+            4113: 64,-26
+            4114: 65,-27
+            4115: 66,-26
+            4116: 65,-24
+            4117: 65,-23
+            4118: 65,-23
+            4122: 68,-21
+            4123: 69,-21
+            4124: 69,-23
+            4125: 69,-24
+            4127: 69,-27
+            4128: 70,-26
+            4129: 70,-26
+            4130: 71,-27
+            4131: 71,-28
+            4132: 70,-28
+            4133: 68,-28
+            4134: 69,-29
+            4135: 70,-30
+            4136: 69,-30
+            4137: 70,-29
+            4138: 70,-29
+            4139: 70,-29
+            4140: 71,-30
+            4141: 71,-17
+            4142: 68,-17
+            4143: 67,-19
+            4144: 70,-17
+            4145: 70,-19
+            4146: 71,-18
+            4147: 68,-18
+            4148: 69,-19
+            4168: 69,-9
+            4169: 68,-9
+            4170: 67,-9
+            4171: 70,-10
+            4172: 77,-18
+            4173: 75,-18
+            4174: 76,-19
+            4175: 77,-18
+            4176: 76,-17
+            4177: 76,-15
+            4178: 75,-15
+            4179: 76,-13
+            4180: 77,-14
+            4181: 74,-14
+            4182: 74,-16
+            4183: 73,-14
+            4184: 74,-17
+            4185: 74,-18
+            4186: 72,-17
+            4187: 73,-19
+            4188: 73,-17
+            4189: 74,-16
+            4190: 73,-15
+            4191: 74,-16
+            4192: 74,-15
+            4193: 76,-18
+            4194: 79,-14
+            4195: 80,-13
+            4196: 81,-14
+            4197: 79,-14
+            4198: 80,-15
+            4199: 81,-13
+            4200: 80,-19
+            4201: 79,-18
+            4202: 80,-18
+            4203: 80,-19
+            4204: 79,-19
+            4205: 80,-19
+            4206: 81,-19
+            4207: 80,-17
+            4208: 80,-18
+            4209: 79,-19
+            4210: 50,-13
+            4211: 51,-14
+            4212: 50,-13
+            4213: 51,-13
+            4214: 50,-14
+            4215: 50,-14
+            4216: 48,-13
+            4217: 48,-14
+            4218: 48,-13
+            4219: 53,-13
+            4220: 53,-14
+            4221: 53,-12
+            4222: 53,-14
+            4223: 53,-13
+            4224: 53,-14
+            4225: 50,-15
+            4226: 51,-15
+            4227: 50,-14
+            4228: 51,-13
+            4229: 50,-12
+            4230: 50,-12
+            4231: 48,-12
+            4232: 50,-12
+            4233: 51,-13
+            4234: 47,-24
+            4235: 49,-25
+            4236: 48,-26
+            4237: 47,-25
+            4238: 49,-25
+            4239: 48,-23
+            4240: 47,-28
+            4241: 49,-29
+            4242: 47,-30
+            4243: 48,-32
+            4244: 49,-31
+            4245: 48,-33
+            4246: 47,-33
+            4247: 49,-33
+            4248: 48,-34
+            4249: 47,-34
+            4250: 43,-36
+            4251: 40,-36
+            4252: 37,-35
+            4253: 36,-35
+            4254: 37,-36
+            4255: 40,-36
+            4256: 43,-35
+            4257: 43,-35
+            4258: 41,-35
+            4259: 43,-35
+            4260: 43,-34
+            4286: 33,-34
+            4287: 31,-34
+            4288: 33,-32
+            4289: 32,-32
+            4290: 32,-31
+            4291: 32,-30
+            4292: 33,-28
+            4293: 31,-29
+            4294: 33,-31
+            4295: 33,-31
+            4296: 35,-30
+            4297: 36,-30
+            4298: 36,-29
+            4299: 33,-25
+            4300: 31,-25
+            4301: 33,-25
+            4302: 31,-25
+            4303: 33,-25
+            4304: 32,-26
+            4305: 31,-25
+            4306: 32,-24
+            4307: 32,-25
+            4308: 31,-24
+            4309: 40,-25
+            4310: 39,-24
+            4311: 40,-26
+            4312: 42,-25
+            4313: 42,-25
+            4314: 44,-24
+            4315: 42,-25
+            4316: 44,-25
+            4317: 45,-25
+            4318: 42,-26
+            4319: 43,-25
+            4320: 43,-25
+            4321: 41,-25
+            4322: 40,-25
+            4323: 40,-25
+            4324: 40,-24
+            4325: 35,-23
+            4326: 37,-23
+            4327: 36,-23
+            4328: 35,-23
+            4329: 38,-21
+            4330: 35,-21
+            4331: 33,-21
+            4332: 33,-22
+            4333: 32,-22
+            4334: 32,-21
+            4335: 37,-19
+            4336: 34,-19
+            4337: 32,-19
+            4338: 31,-19
+            4339: 28,-19
+            4340: 27,-19
+            4341: 27,-20
+            4342: 27,-21
+            4343: 30,-21
+            4344: 29,-21
+            4345: 29,-23
+            4346: 29,-24
+            4347: 29,-25
+            4348: 29,-26
+            4349: 27,-22
+            4350: 27,-24
+            4351: 27,-25
+            4352: 26,-25
+            4353: 25,-25
+            4354: 29,-27
+            4355: 27,-27
+            4356: 25,-27
+            4357: 24,-27
+            4358: 21,-27
+            4359: 21,-25
+            4360: 20,-25
+            4361: 19,-25
+            4362: 19,-26
+            4363: 19,-28
+            4364: 19,-28
+            4365: 19,-30
+            4366: 19,-31
+            4367: 19,-32
+            4368: 21,-30
+            4369: 21,-33
+            4370: 21,-34
+            4371: 21,-34
+            4372: 19,-34
+            4373: 20,-36
+            4374: 20,-37
+            4375: 19,-37
+            4376: 20,-39
+            4377: 21,-38
+            4378: 22,-39
+            4379: 21,-37
+            4380: 24,-37
+            4381: 23,-38
+            4382: 25,-37
+            4383: 25,-38
+            4384: 24,-38
+            4385: 25,-38
+            4386: 17,-34
+            4387: 17,-35
+            4388: 16,-34
+            4389: 14,-34
+            4390: 17,-32
+            4391: 15,-32
+            4392: 13,-32
+            4393: 11,-32
+            4394: 10,-32
+            4395: 12,-34
+            4396: 9,-34
+            4397: 8,-34
+            4398: 7,-34
+            4399: 7,-32
+            4400: 7,-32
+            4401: 6,-32
+            4402: 9,-30
+            4403: 8,-29
+            4404: 7,-29
+            4405: 7,-29
+            4406: 6,-28
+            4407: 8,-27
+            4408: 9,-27
+            4409: 7,-28
+            4410: 6,-27
+            4411: 5,-29
+            4412: 7,-30
+            4413: 9,-30
+            4414: 3,-30
+            4415: 1,-30
+            4416: 3,-32
+            4417: 2,-32
+            4418: 2,-33
+            4419: 0,-33
+            4420: -1,-33
+            4421: -1,-32
+            4422: 0,-30
+            4423: -3,-30
+            4424: -4,-30
+            4425: -6,-30
+            4426: -7,-30
+            4427: -9,-30
+            4428: -6,-32
+            4429: -5,-32
+            4430: -3,-32
+            4431: -8,-32
+            4432: -8,-33
+            4433: -9,-32
+            4434: -10,-32
+            4435: -11,-32
+            4436: -13,-32
+            4437: -10,-30
+            4438: -11,-30
+            4439: -13,-30
+            4440: -15,-30
+            4441: -16,-30
+            4442: -12,-29
+            4443: -12,-30
+            4444: -16,-32
+            4445: -17,-33
+            4446: -17,-32
+            4447: -19,-32
+            4448: -18,-30
+            4449: -20,-30
+            4450: -22,-30
+            4451: -23,-30
+            4452: -23,-29
+            4453: -22,-32
+            4454: -24,-32
+            4455: -24,-32
+            4456: -26,-30
+            4457: -26,-29
+            4458: -26,-27
+            4459: -26,-25
+            4460: -24,-27
+            4461: -24,-26
+            4462: -24,-25
+            4463: -24,-24
+            4464: -26,-23
+            4465: -26,-22
+            4466: -26,-20
+            4467: -24,-21
+            4468: -24,-19
+            4469: -24,-18
+            4470: -24,-16
+            4471: -26,-17
+            4472: -26,-16
+            4473: -26,-14
+            4474: -26,-13
+            4475: -26,-12
+            4476: -26,-10
+            4477: -26,-9
+            4478: -25,-9
+            4479: -24,-11
+            4480: -23,-11
+            4481: -23,-10
+            4482: -23,-9
+            4483: -24,-5
+            4484: -24,-4
+            4485: -24,-2
+            4486: -19,-11
+            4487: -19,-10
+            4488: -20,-10
+            4489: -20,-9
+            4490: -19,-9
+            4491: -30,-21
+            4492: -30,-19
+            4493: -29,-19
+            4494: -30,-18
+            4495: -32,-21
+            4496: -32,-19
+            4497: -33,-18
+            4498: -36,-15
+            4499: -36,-14
+            4500: -33,-14
+            4501: -33,-14
+            4502: -33,-15
+            4503: -30,-14
+            4504: -36,-10
+            4505: -37,-9
+            4506: -37,-10
+            4507: -29,-10
+            4508: -30,-11
+            4509: -30,-9
+            4510: -28,-10
+            4511: -40,-11
+            4512: -41,-10
+            4513: -41,-9
+            4514: -40,-9
+            4515: -41,-10
+            4516: -41,-10
+            4517: -49,-18
+            4518: -38,-33
+            4519: -36,-33
+            4520: -33,-33
+            4521: -32,-33
+            4522: -31,-33
+            4523: -31,-31
+            4524: -31,-29
+            4525: -31,-28
+            4526: -31,-26
+            4527: -33,-26
+            4528: -35,-26
+            4529: -36,-26
+            4530: -37,-26
+            4531: -38,-26
+            4532: -38,-27
+            4533: -38,-29
+            4534: -38,-30
+            4535: -38,-31
+            4536: -38,-29
+            4537: -38,-26
+            4538: -40,-26
+            4539: -40,-25
+            4540: -41,-25
+            4541: -41,-26
+            4542: -41,-28
+            4543: -41,-29
+            4544: -41,-30
+            4545: -41,-32
+            4546: -41,-33
+            4547: -41,-34
+            4548: -39,-33
+            4549: -40,-34
+            4550: -35,-34
+            4551: -34,-34
+            4552: -32,-34
+            4553: -31,-34
+            4554: -30,-34
+            4555: -30,-33
+            4556: -28,-34
+            4557: -28,-32
+            4558: -28,-31
+            4559: -28,-29
+            4560: -28,-27
+            4561: -28,-26
+            4562: -29,-25
+            4563: -30,-25
+            4564: -30,-26
+            4565: -32,-25
+            4566: -33,-26
+            4567: -35,-25
+            4568: -32,6
+            4569: -32,7
+            4570: -32,6
+            4571: -36,6
+            4572: -36,5
+            4573: -36,7
+            4574: -34,6
+            4575: -34,5
+            4576: -35,6
+            4577: -33,6
+            4578: -35,-4
+            4579: -35,-2
+            4580: -36,-5
+            4581: -35,-2
+            4582: -34,-2
+            4583: -35,-1
+            4595: -25,28
+            4596: -26,28
+            4597: -18,32
+            4598: -17,31
+            4599: -17,33
+            4600: -18,32
+            4601: -15,34
+            4602: -15,32
+            4603: -15,31
+            4604: -13,31
+            4605: -12,31
+            4606: -15,34
+            4607: -15,34
+            4608: -12,39
+            4609: -13,40
+            4610: -14,40
+            4611: -15,40
+            4612: -16,40
+            4613: -16,40
+            4614: -13,40
+            4615: -12,40
+            4616: -12,38
+            4617: -12,40
+            4623: -5,40
+            4624: -6,40
+            4625: -6,42
+            4626: -6,43
+            4627: -5,42
+            4628: -6,43
+            4629: -6,45
+            4630: -6,46
+            4631: -6,47
+            4632: -5,46
+            4633: -4,48
+            4634: -5,46
+            4635: -2,48
+            4636: -4,46
+            4637: -1,47
+            4638: -3,45
+            4639: 0,46
+            4640: -3,47
+            4641: -1,45
+            4642: -3,46
+            4643: 1,45
+            4644: 1,47
+            4645: 0,46
+            4646: 1,48
+            4647: 2,48
+            4648: 3,47
+            4649: 2,45
+            4650: 2,44
+            4651: 2,43
+            4652: 2,42
+            4653: 1,42
+            4654: 3,42
+            4655: -2,43
+            4656: -1,41
+            4657: -3,40
+            4658: -3,40
+            4659: 1,51
+            4660: -2,50
+            4661: -3,50
+            4662: -2,51
+            4663: 0,51
+            4664: -1,52
+            4665: -2,51
+            4666: -2,53
+            4667: 1,53
+            4668: 2,51
+            4669: 2,50
+            4670: 0,50
+            4671: -4,45
+            4672: -4,47
+            4699: 6,42
+            4700: 5,41
+            4701: 5,39
+            4702: 7,39
+            4703: 8,39
+            4704: 9,41
+            4705: 9,40
+            4706: 8,42
+            4707: 8,41
+            4708: 15,37
+            4709: 14,37
+            4710: 14,35
+            4711: 14,34
+            4712: 13,35
+            4713: 13,36
+            4714: 15,34
+            4715: 16,35
+            4716: 15,36
+            4717: 15,34
+            4718: 15,35
+            4719: 15,37
+            4720: 14,37
+            4721: 15,30
+            4722: 14,29
+            4723: 14,29
+            4724: 15,28
+            4725: 14,29
+            4726: 14,32
+            4727: 13,32
+            4728: 15,24
+            4752: 2,24
+            4753: 1,24
+            4754: 1,24
+            4755: 2,23
+            4756: 4,23
+            4757: 4,24
+            4758: 3,26
+            4759: 4,28
+            4760: 2,27
+            4761: 2,27
+            4762: 3,27
+            4763: -2,25
+            4764: -3,25
+            4765: -3,23
+            4766: -2,24
+            4767: -4,23
+            4768: -4,25
+            4804: -14,28
+            4805: -15,28
+            4806: -14,29
+            4807: -13,26
+            4808: -10,26
+            4809: -9,27
+            4810: -10,28
+            4811: -7,28
+            4812: -8,26
+            4813: -5,28
+            4814: -7,24
+            4815: -8,24
+            4816: -7,23
+            4817: -6,24
+            4818: -6,23
+            4819: -7,23
+            4820: -8,23
+            4821: -8,23
+            4822: -12,23
+            4823: -11,24
+            4824: -10,23
+            4825: -10,24
+            4826: -10,24
+            4827: -12,24
+            4828: -12,24
+            4829: -14,24
+            4830: -14,23
+            4831: -16,24
+            4832: -14,24
+            4833: -15,23
+            4834: -16,24
+            4835: -14,25
+            4836: -10,25
+            4837: -7,25
+            4838: -1,28
+            4839: -3,27
+            4840: -1,30
+            4841: -1,33
+            4842: -1,34
+            4843: -1,37
+            4844: -3,37
+            4845: -3,38
+            4846: -1,37
+            4847: -2,37
+            4848: -1,40
+            4849: -3,41
+            4850: -3,43
+            4851: -2,43
+            4852: -20,25
+            4853: -21,25
+            4854: -19,25
+            4855: -21,25
+            4856: -22,17
+            4857: -23,17
+            4858: -22,5
+            4859: -22,5
+            4860: -22,5
+            4861: -19,-28
+            4862: -16,-28
+            4863: -16,-27
+            4864: -15,-28
+            4865: -16,-26
+            4866: -15,-27
+            4867: -15,-28
+            4868: -15,-26
+            4869: -15,-26
+            4870: -14,-26
+            4881: -25,-34
+            4882: -23,-34
+            4883: -22,-34
+            4884: -21,-34
+            4885: -20,-34
+            4886: -20,-37
+            4887: -20,-36
+            4888: -19,-38
+            4889: -19,-36
+            4890: -22,-37
+            4891: -23,-37
+            4892: -23,-38
+            4893: -23,-36
+            4894: -24,-37
+            4895: -26,-37
+            4896: -26,-36
+            4897: -26,-37
+            4898: -28,-40
+            4899: -27,-40
+            4900: -25,-40
+            4901: -24,-40
+            4902: -23,-40
+            4903: -21,-40
+            4904: -19,-40
+            4905: -21,-40
+            4906: -24,-40
+            4907: -26,-40
+            4908: -32,-40
+            4909: -31,-40
+            4910: -33,-39
+            4911: -33,-40
+            4912: -32,-39
+            4913: -31,-39
+            4914: -34,-39
+            4915: -33,-40
+            4916: -39,-38
+            4917: -38,-38
+            4918: -38,-53
+            4919: -38,-54
+            4920: -37,-53
+            4921: -37,-54
+            4922: -14,-39
+            4923: -13,-38
+            4924: -13,-39
+            4925: -13,-40
+            4926: -13,-41
+            4927: -13,-39
+            4928: -13,-40
+            4929: -13,-41
+            4930: -13,-39
+            4931: -13,-40
+            4932: -13,-39
+            4933: -13,-40
+            4936: -5,-41
+            4937: -5,-40
+            4938: -6,-42
+            4939: -5,-36
+            4940: -6,-36
+            4941: -4,-35
+            4942: -4,-36
+            4943: 0,-36
+            4944: -2,-36
+            4945: 1,-35
+            4946: 1,-37
+            4947: 1,-38
+            4948: 2,-37
+            4949: 2,-38
+            4950: 0,-37
+            4951: 3,-37
+            4952: -1,-36
+            4956: -6,-28
+            4957: -6,-27
+            4958: -5,-27
+            4959: -6,-26
+            4960: -2,-27
+            4961: -3,-26
+            4962: -2,-28
+            4963: -1,-27
+            4964: 0,-27
+            4965: 0,-27
+            4966: -2,-27
+            4967: -2,-27
+            4968: 0,-24
+            4969: -2,-24
+            4970: -2,-23
+            4971: 0,-22
+            4972: 1,-22
+            4973: 1,-21
+            4974: -4,-19
+            4975: -5,-19
+            4976: -7,-19
+            4977: -9,-19
+            4978: -6,-19
+            4979: -7,-17
+            4980: -8,-17
+            4981: -9,-16
+            4982: -9,-16
+            4983: -5,-16
+            4984: -4,-14
+            4985: -5,-15
+            4986: -8,-16
+            4987: -8,-15
+            4988: -14,-14
+            4989: -12,-14
+            4990: -12,-16
+            4991: -13,-18
+            4992: -14,-16
+            4993: -13,-16
+            4994: -13,-19
+            4995: -14,-19
+            4996: -2,-17
+            4997: -2,-15
+            4998: -2,-13
+            4999: -2,-12
+            5000: -1,-15
+            5001: -1,-16
+            5002: -1,-17
+            5003: 1,-17
+            5004: -1,-18
+            5005: 2,-18
+            5006: 2,-16
+            5007: 2,-15
+            5008: 2,-13
+            5009: 1,-12
+            5010: 1,-14
+            5011: -1,-13
+            5012: 0,-14
+            5013: 2,-16
+            5014: -4,-14
+            5015: -7,-24
+            5016: -7,-22
+            5017: -8,-23
+            5018: -10,-23
+            5019: -9,-23
+            5020: -1,-24
+            5021: 8,-23
+            5022: 8,-22
+            5023: 10,-22
+            5024: 9,-23
+            5025: 8,-25
+            5026: 8,-21
+            5027: 8,-19
+            5028: 8,-18
+            5029: 6,-18
+            5030: 5,-18
+            5031: 0,-27
+            5032: 2,-27
+            5033: 10,-23
+            5034: 13,-23
+            5035: 12,-23
+            5036: 13,-21
+            5037: 14,-22
+            5038: 13,-18
+            5039: 14,-18
+            5040: 14,-17
+            5041: 12,-18
+            5042: 11,-18
+            5043: 11,-16
+            5044: 13,-17
+            5045: 11,-30
+            5046: 11,-28
+            5047: 11,-27
+            5048: 11,-26
+            5049: 17,-26
+            5050: 17,-28
+            5051: 17,-28
+            5052: 17,-30
+            5053: 17,-30
+            5054: 18,-23
+            5055: 20,-22
+            5056: 21,-23
+            5057: 19,-22
+            5058: 21,-22
+            5059: 20,-21
+            5060: 24,-22
+            5061: 23,-23
+            5062: 23,-21
+            5063: 23,-23
+            5064: 17,-16
+            5065: 19,-14
+            5066: 18,-13
+            5067: 20,-13
+            5068: 19,-12
+            5069: 22,-11
+            5070: 22,-13
+            5071: 20,-11
+            5072: 24,-13
+            5073: 26,-11
+            5074: 21,-11
+            5075: 20,-11
+            5076: 25,-13
+            5077: 22,-13
+            5078: 23,-12
+            5079: 26,-12
+            5080: 19,-12
+            5081: 23,-13
+            5082: 23,-11
+            5083: 19,-10
+            5084: 26,-11
+            5085: 28,-12
+            5086: 25,-12
+            5087: 23,-16
+            5088: 23,-16
+            5089: 13,-19
+            5090: 23,-34
+            5091: 23,-31
+            5092: 23,-30
+            5093: 23,-29
+            5094: 23,-32
+            5095: 29,-34
+            5096: 29,-33
+            5097: 29,-32
+            5098: 29,-30
+            5099: 29,-29
+            5100: 32,-34
+            5101: 32,-31
+            5102: 32,-30
+            5103: 36,-30
+            5104: 35,-29
+            5105: 33,-26
+            5106: 36,-21
+            5107: 38,-16
+            5108: 37,-15
+            5109: 39,-16
+            5110: 38,-17
+            5111: 38,-15
+            5112: 37,-15
+            5113: 62,-31
+            5114: 62,-33
+            5115: 61,-31
+            5116: 63,-33
+            5117: 63,-33
+            5118: 63,-32
+            5119: 62,-32
+            5120: 62,-32
+            5121: 64,8
+            5122: 63,9
+            5123: 65,9
+            5124: 64,8
+            5125: 64,9
+            5126: 64,10
+            5127: 67,6
+            5128: 68,4
+            5129: 68,6
+            5130: 67,5
+            5131: 68,0
+            5132: 68,1
+            5133: 68,2
+            5134: 67,0
+            5135: 68,-2
+            5136: 67,-3
+            5137: 68,-4
+            5138: 68,-3
+            5139: 68,-3
+            5140: 76,-6
+            5146: 54,-30
+            5147: 52,-31
+            5148: 51,-31
+            5149: 52,-33
+            5150: 52,-34
+            5151: 51,-33
+            5152: 51,-32
+            5153: 52,-35
+            5154: 51,-33
+            5155: 51,-31
+            5156: 52,-35
+            5157: 52,-35
+            5158: 55,-35
+            5159: 54,-34
+            5160: 56,-33
+            5161: 57,-33
+            5162: 55,-34
+            5163: 55,-36
+            5164: 54,-35
+            5165: 55,-34
+            5166: 54,-35
+            5167: 55,-35
+            5168: 55,-34
+            5169: 40,-31
+            5170: 40,-30
+            5171: 40,-30
+            5172: 41,-31
+            5173: 41,-29
+            5174: 42,-29
+            5175: 43,-29
+            5176: 44,-29
+            5177: 44,-31
+            5178: 43,-30
+            5179: 33,-29
+            5180: 15,-39
+            5181: 14,-39
+            5182: 14,-39
+            5183: 9,-40
+            5184: 9,-39
+            5185: 9,-41
+            5186: 8,-40
+            5187: 19,-45
+            5188: 17,-45
+            5189: 16,-44
+            5190: 16,-45
+            5191: 16,-43
+            5192: 19,-45
+            5193: 20,-44
+            5194: 20,-45
+            5195: 18,-44
+            5196: 21,-45
+            5197: 21,-43
+            5198: 15,-48
+            5199: 14,-48
+            5200: 12,-47
+            5201: 12,-48
+            5202: 14,-48
+            5203: 16,-47
+            5204: 14,-48
+            5205: 13,-48
+            5206: 15,-47
+            5213: 21,-54
+            5214: 20,-54
+            5215: 18,-54
+            5216: 16,-54
+            5217: 16,-55
+            5218: 18,-53
+            5219: 19,-53
+            5220: 21,-55
+            5221: 21,-58
+            5222: 21,-59
+            5223: 20,-58
+            5224: 18,-58
+            5225: 17,-58
+            5226: 16,-58
+            5227: 16,-59
+            5228: 19,-59
+            5229: 19,-59
+            5230: 18,-59
+            5231: 27,-46
+            5232: 26,-45
+            5233: 26,-44
+            5234: 27,-45
+            5235: 27,-45
+            5236: 28,-42
+            5237: 29,-42
+            5238: 29,-40
+            5239: 28,-39
+            5240: 28,-39
+            5241: 28,-40
+            5242: 29,-47
+            5243: 28,-47
+            5244: 66,-52
+            5245: 65,-51
+            5246: 66,-52
+            5247: 66,-51
+            5248: 65,-52
+            5249: 66,-51
+            5250: 27,15
+            5251: 28,15
+            5252: 27,14
+            5253: 27,12
+            5254: -23,34
+            5255: -23,35
+            5256: -22,34
+            5257: -27,36
+            5258: -27,34
+            5259: -28,35
+            5260: -27,35
+            5261: -29,36
+            5262: -30,37
+            5263: -30,38
+            5264: -28,35
+            5265: -28,34
+            5266: -29,35
+            5267: -26,36
+            5268: -25,38
+            5269: -26,37
+            5270: -32,36
+            5271: -33,35
+            5272: -33,37
+            5273: -33,35
+            5274: -34,36
+            5275: -33,38
+            5276: -33,35
+            5277: -36,5
+            5278: -42,6
+            5279: -43,4
+            5280: -43,6
+            5281: -42,7
+            5282: -51,9
+            5283: -49,13
+            5284: -42,-5
+            5285: -43,-5
+            5286: -42,-3
+            5287: -45,-4
+            5288: -45,-5
+            5289: -46,-4
+            5290: -43,-3
+            5291: -43,-2
+            5292: -42,-2
+            5293: -60,-29
+            5294: -60,-29
+            5295: -57,-36
+            5296: -58,-36
+            5297: -59,-36
+            5298: -57,-37
+            5299: -58,-35
+            5300: -58,-34
+            5301: -57,-35
+            5302: -59,-34
+            5303: -58,-34
+            5304: -59,-34
+            5305: -60,-34
+            5306: -60,-35
+            5307: -61,-21
+            5308: -62,-21
+            5309: -62,-20
+            5310: -61,-20
+            5311: -61,-20
+            5312: 13,35
+            5949: 52,20
+            5950: 51,21
+            5951: 53,20
+            5952: 53,21
+            6232: 49,-7
+            6233: 48,-6
+            6234: 48,-4
+            6235: 49,-4
+            6236: 52,-7
+            6237: 52,-5
+            6238: 51,-6
+            6239: 52,-2
+            6240: 52,-3
+            6241: 48,-1
+            6242: 48,-2
+            6262: 49,-12
+            6263: 49,-14
+            6264: 49,-15
+            6265: 49,-13
+            6266: 52,-14
+            6267: 52,-13
+            6268: 52,-12
+            6269: 52,-15
+            6270: 52,-15
+            6271: 52,-10
+            6272: 51,1
+            6273: 51,3
+            6274: 51,4
+            6275: 51,8
+            6276: 51,9
+            6277: 51,11
+            6278: 51,13
+            6279: 49,13
+            6280: 49,11
+            6281: 49,9
+            6282: 49,7
+            6283: 49,5
+            6284: 49,3
+            6285: 49,1
+            6298: 42,9
+            6299: 43,9
+            6300: 42,7
+            6301: 43,7
+            6302: 45,7
+            6303: 45,9
+            6304: 46,7
+            6305: 40,4
+            6306: 42,4
+            6307: 43,4
+            6308: 43,2
+            6309: 43,1
+            6310: 43,-2
+            6311: 43,-4
+            6312: 43,-7
+            6313: 43,-6
+            6314: 43,-10
+            6315: 43,-11
+            6316: 45,5
+            6317: 42,5
+            6318: 41,5
+            6397: 90,-18
+            6398: 89,-18
+            6478: 51,-39
+            6479: 52,-39
+            6480: 54,-39
+            6481: 52,-37
+            6491: 51,-30
+            6492: 52,-29
+            6514: -33,-12
+            6515: -33,-10
+            6531: -36,-45
+            6532: -35,-44
+            6533: -35,-46
+            6623: 14,39
+            6624: 13,40
+            6625: 15,42
+            6626: 15,41
+            6627: 16,39
+            6687: 8,-47
+            6845: -34,14
+            6846: -33,15
+            6847: -30,15
+            6848: -31,16
+            6849: -30,17
+            6850: -29,14
+            6851: -29,12
+            6852: -32,12
+            6853: -35,14
+            6854: -37,14
+            6855: -38,13
+            6947: 43,13
+            6948: 42,11
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            2991: -43,17
+            2931: -43,17
         - node:
             cleanable: True
             color: '#835432FF'
             id: DirtHeavyMonotile
           decals:
-            2899: -38,29
-            2900: -36,28
-            2901: -34,26
-            2902: -34,24
-            2903: -36,22
-            2904: -37,25
-            2905: -37,26
-            2906: -37,27
-            2907: -38,27
-            2908: -36,26
+            2839: -38,29
+            2840: -36,28
+            2841: -34,26
+            2842: -34,24
+            2843: -36,22
+            2844: -37,25
+            2845: -37,26
+            2846: -37,27
+            2847: -38,27
+            2848: -36,26
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            6578: 88,-21
-            6579: 88,-20
-            6580: 91,-20
-            6583: 87,-20
-            6586: 88,-19
+            6422: 88,-21
+            6423: 88,-20
+            6424: 91,-20
+            6427: 87,-20
+            6430: 88,-19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            3155: 4,-31
-            3156: 0,-31
-            3157: -4,-31
-            3158: -8,-31
-            3159: -10,-31
-            3160: -13,-31
-            3161: -17,-31
-            3162: -18,-31
-            3163: -21,-31
-            3164: -25,-31
-            3165: -25,-27
-            3166: -25,-24
-            3167: -25,-22
-            3168: -25,-19
-            3169: -25,-18
-            3170: -25,-13
-            3171: -25,-11
-            3172: -24,-10
-            3173: -24,-8
-            3174: -22,-2
-            3175: -22,0
-            3176: -22,3
-            3177: -20,8
-            3178: -22,9
-            3179: -24,8
-            3180: -25,9
-            3181: -26,8
-            3182: -26,12
-            3183: -26,15
-            3184: -26,17
-            3185: -25,20
-            3186: -23,19
-            3187: -20,19
-            3188: -18,20
-            3189: -15,20
-            3190: -12,20
-            3191: -7,20
-            3192: -3,20
-            3193: -1,20
-            3194: 2,20
-            3195: 6,20
-            3196: 9,20
-            3197: 11,20
-            3198: 14,20
-            3199: 17,20
-            3200: 20,19
-            3201: 20,17
-            3202: 20,15
-            3203: 20,11
-            3204: 20,9
-            3205: 20,6
-            3206: 20,3
-            3207: 22,3
-            3208: 25,3
-            3209: 27,3
-            3210: 30,3
-            3211: 33,3
-            3212: 36,3
-            3213: 41,3
-            3214: 42,2
-            3215: 42,0
-            3216: 42,-3
-            3217: 42,-6
-            3218: 42,-9
-            3219: 42,-11
-            3220: 42,-15
-            3221: 42,-18
-            3222: 42,-20
-            3223: 44,-20
-            3224: 42,-13
-            3225: 42,-10
-            3226: 42,-7
-            3227: 42,-5
-            3228: 42,-2
-            3229: 42,1
-            3230: 39,3
-            3231: 37,3
-            3232: 35,3
-            3233: 32,3
-            3234: 31,3
-            3235: 26,3
-            3236: 22,3
-            3237: 20,6
-            3238: 20,9
-            3239: 20,12
-            3240: 20,15
-            3241: 20,19
-            3242: 19,20
-            3243: 12,20
-            3244: 8,20
-            3245: 5,20
-            3246: 2,20
-            3247: -1,20
-            3248: -5,20
-            3249: -9,20
-            3250: -12,20
-            3251: -16,20
-            3253: -19,19
-            3254: -26,20
-            3255: -26,16
-            3256: -26,11
-            3257: -26,8
-            3258: -23,8
-            3259: -22,9
-            3260: -21,8
-            3261: -20,9
-            3262: -22,3
-            3263: -22,0
-            3264: -22,-3
-            3265: -22,-5
-            3266: -23,-7
-            3267: -25,-7
-            3268: -23,-8
-            3269: -25,-10
-            3270: -25,-10
-            3271: -25,-14
-            3272: -25,-18
-            3273: -25,-21
-            3274: -25,-25
-            3275: -25,-28
-            3276: -23,-31
-            3277: -20,-31
-            3278: -15,-31
-            3279: -9,-31
-            3280: -5,-31
-            3281: 1,-31
-            3282: 1,-32
-            3283: 7,-31
-            3284: 5,-31
-            3285: 8,-32
-            3286: 9,-33
-            3287: 12,-33
-            3288: 15,-33
-            3289: 18,-33
-            3290: 19,-33
-            3291: 20,-29
-            3292: 20,-27
-            3293: 21,-26
-            3294: 24,-26
-            3295: 27,-26
-            3296: 28,-26
-            3297: 28,-22
-            3298: 28,-21
-            3299: 28,-20
-            3300: 32,-20
-            3301: 35,-20
-            3302: 39,-20
-            3303: 42,-20
-            3304: 40,-20
-            3305: 42,-17
-            3306: 42,-19
-            3307: 49,-20
-            3308: 52,-20
-            3309: 47,-20
-            3310: 53,-20
-            3311: 53,-22
-            3312: 53,-23
-            3313: 54,-20
-            3314: 56,-20
-            3315: 58,-20
-            3316: 58,-20
-            3317: 58,-22
-            3318: 58,-23
-            3319: 58,-22
-            3320: 49,-20
-            3321: 50,-20
-            3322: 44,-13
-            3323: 41,-13
-            3324: 39,-1
-            3325: 37,-1
-            3326: 36,-1
-            3327: 50,6
-            3328: 50,2
-            3329: 50,14
-            3330: 46,-7
-            3331: 45,-8
-            3332: 46,-4
-            3333: 46,-5
-            3334: 45,-1
-            3335: 46,-2
-            3336: 54,-1
-            3337: 55,-1
-            3338: 55,-7
-            3339: 58,-4
-            3340: 59,-6
-            3341: 60,-5
-            3342: 62,-6
-            3343: 61,-6
-            3344: 55,7
-            3345: 54,7
-            3346: 59,15
-            3347: 58,15
-            3348: 60,16
-            3349: 60,3
-            3350: 60,1
-            3351: 63,1
-            3352: 62,1
-            3353: 62,0
-            3354: 62,3
-            3355: 62,4
-            3356: 28,3
-            3357: 28,3
-            3358: 24,8
-            3359: 24,6
-            3360: 23,8
-            3361: 25,7
-            3362: 24,7
-            3363: 24,6
-            3364: 25,11
-            3365: 25,13
-            3366: 25,14
-            3367: 23,15
-            3368: 22,12
-            3369: 23,12
-            3370: 23,14
-            3371: 23,11
-            3372: 26,19
-            3373: 24,20
-            3374: 25,21
-            3375: 26,19
-            3376: 25,20
-            3377: 29,20
-            3378: 29,19
-            3379: 30,19
-            3380: 29,21
-            3381: -19,26
-            3382: -21,28
-            3383: -20,26
-            3384: -20,28
-            3385: -7,40
-            3386: 3,40
-            3387: -26,19
-            3388: -17,11
-            3389: -16,11
-            3390: -16,13
-            3391: -17,13
-            3399: -30,3
-            3400: -32,3
-            3401: -37,3
-            3402: -36,2
-            3403: -35,2
-            3404: -37,1
-            3405: -33,1
-            3406: -32,2
-            3407: -32,1
-            3408: -31,2
-            3409: -33,2
-            3410: -38,0
-            3411: -37,0
-            3412: -34,0
-            3413: -33,0
-            3414: -31,0
-            3415: -30,0
-            3416: -55,6
-            3417: -54,6
-            3418: -54,4
-            3419: -54,2
-            3420: -56,5
-            3421: -55,4
-            3422: -53,1
-            3423: -51,1
-            3424: -49,1
-            3425: -47,1
-            3426: -45,1
-            3427: -44,1
-            3428: -43,1
-            3429: -54,1
-            3430: -54,-4
-            3431: -55,-4
-            3432: -54,-8
-            3433: -54,-10
-            3434: -54,-12
-            3435: -54,-14
-            3436: -54,-16
-            3437: -54,-19
-            3438: -53,-21
-            3439: -51,-21
-            3440: -54,-21
-            3441: -54,-20
-            3442: -54,-18
-            3443: -48,-21
-            3444: -48,-23
-            3445: -48,-24
-            3446: -50,-25
-            3447: -47,-25
-            3448: -45,-25
-            3449: -45,-26
-            3450: -45,-29
-            3451: -44,-28
-            3452: -43,-28
-            3453: -45,-31
-            3454: -48,-32
-            3455: -49,-32
-            3456: -51,-32
-            3457: -51,-30
-            3458: -51,-28
-            3459: -51,-26
-            3460: -48,-33
-            3461: -54,-26
-            3462: -56,-25
-            3463: -55,-25
-            3464: -56,-26
-            3465: -57,-26
-            3466: -55,-26
-            3467: -56,-25
-            3468: -48,-36
-            3469: -48,-38
-            3470: -48,-40
-            3471: -48,-42
-            3472: -48,-44
-            3473: -48,-47
-            3474: -49,-47
-            3475: -51,-47
-            3476: -53,-47
-            3477: -54,-47
-            3478: -45,-47
-            3479: -45,-47
-            3480: -43,-47
-            3481: -41,-47
-            3482: -41,-47
-            3483: -41,-50
-            3484: -41,-51
-            3485: -41,-54
-            3486: -36,-58
-            3487: -36,-60
-            3488: -36,-63
-            3489: -36,-64
-            3490: -36,-56
-            3491: -37,-56
-            3492: -41,-61
-            3493: -42,-62
-            3494: -41,-64
-            3495: -41,-64
-            3496: -42,-62
-            3497: -41,-48
-            3498: -53,-47
-            3499: -55,-47
-            3500: -55,-49
-            3501: -55,-52
-            3502: -55,-54
-            3503: -60,-58
-            3504: -60,-60
-            3505: -60,-62
-            3506: -60,-63
-            3507: -60,-64
-            3508: -58,-56
-            3509: -60,-56
-            3510: -55,-64
-            3511: -55,-62
-            3512: -54,-61
-            3513: -54,-63
-            3514: -54,-64
-            3515: -8,-28
-            3516: -7,-26
-            3517: -8,-27
-            3518: -8,-27
-            3519: 7,-22
-            3520: 5,-22
-            3521: 4,-23
-            3522: 4,-20
-            3523: 4,-19
-            3524: 7,-20
-            3525: 7,-21
-            3526: 7,-24
-            3527: 7,-25
-            3528: 10,-16
-            3529: 10,-18
-            3530: 10,-18
-            3531: 12,-29
-            3532: 12,-28
-            3533: 12,-26
-            3534: 13,-25
-            3535: 14,-25
-            3536: 14,-26
-            3537: 15,-25
-            3538: 16,-26
-            3539: 16,-29
-            3540: -4,-36
-            3541: -4,-37
-            3542: -6,-37
-            3543: 34,-3
-            3544: 32,-2
-            3545: 32,-3
-            3546: 31,-2
-            3547: 31,-3
-            3548: 31,-35
-            3549: 33,-35
-            3550: 32,-37
-            3551: 33,-36
-            3552: 33,-38
-            3553: 32,-36
-            3554: 31,-38
-            3555: 47,-36
-            3556: 47,-35
-            3557: 49,-35
-            3558: 49,-37
-            3559: 47,-37
-            3560: 47,-38
-            3561: 49,-38
-            3562: 47,-39
-            3563: 24,-29
-            3564: 26,-29
-            3565: 27,-29
-            3566: 28,-29
-            3567: 25,-34
-            3568: 27,-34
-            3569: 28,-34
-            3570: 26,-34
-            3571: 28,-43
-            3572: 29,-43
-            3573: 28,-45
-            3574: 29,-45
-            3575: 28,-46
-            3576: 29,-46
-            3577: 19,-46
-            3578: 18,-46
-            3579: 18,-47
-            3580: 19,-49
-            3581: 19,-49
-            3582: 18,-50
-            3583: 19,-50
-            3584: 18,-48
-            3585: 16,-48
-            3586: 14,-48
-            3587: 12,-47
-            3588: 10,-40
-            3589: 11,-39
-            3590: 11,-40
-            3591: 11,-40
-            3592: 8,-31
-            3593: 8,-31
-            3594: 5,-14
-            3595: 6,-14
-            3596: 6,-15
-            3597: 5,-15
-            3598: 4,-15
-            3599: 4,-15
-            3600: 25,7
-            3601: 20,16
-            3602: 20,18
-            3603: 15,26
-            3604: 14,26
-            3605: 13,26
-            3606: 13,26
-            3607: -44,10
-            3608: -45,10
-            3609: -46,10
-            3610: -47,10
-            3611: -49,10
-            3612: -50,10
-            3613: -50,12
-            3614: -47,12
-            3615: -48,1
-            3616: -47,1
-            3617: -48,-41
-            3618: -38,-56
-            3619: -38,-56
-            3620: -42,-57
-            3621: -55,-57
-            3753: -50,0
-            3754: -50,2
-            3755: -48,2
-            3756: -46,2
-            3757: -45,2
-            3758: -44,0
-            3759: -46,0
-            3760: -48,0
-            3792: -51,3
-            3793: -49,3
-            3794: -47,3
-            3795: -45,3
-            3796: -44,5
-            3797: -46,5
-            3798: -48,5
-            3799: -50,5
-            3800: -50,-1
-            3801: -49,-1
-            3802: -47,-1
-            3803: -46,-1
-            3804: -44,-1
-            3805: -44,-3
-            3806: -46,-3
-            3807: -47,-3
-            3808: -49,-3
-            3809: -50,-3
-            3810: -48,-3
-            3811: -46,-3
-            3812: -48,3
-            3813: -46,3
-            3893: -21,6
-            3894: -21,7
-            3895: -22,6
-            3896: -21,7
-            4093: 19,1
-            4094: 21,1
-            4095: 22,1
-            4096: 23,1
-            4097: 23,1
-            4162: 40,-22
-            4163: 41,-22
-            4164: 43,-22
-            4165: 44,-22
-            4224: 61,-25
-            4225: 62,-25
-            4226: 62,-26
-            4231: 68,-23
-            4254: 68,-15
-            4255: 68,-13
-            4256: 68,-14
-            4257: 67,-12
-            4258: 70,-12
-            4259: 70,-14
-            4260: 68,-11
-            4261: 71,-12
-            4262: 70,-14
-            4263: 70,-15
-            4264: 71,-13
-            4265: 69,-13
-            4266: 69,-12
-            4267: 68,-10
-            4268: 67,-10
-            4269: 68,-8
-            4270: 69,-8
-            4271: 70,-9
-            4272: 70,-10
-            4366: 39,-34
-            4367: 40,-34
-            4368: 39,-34
-            4369: 42,-34
-            4370: 40,-34
-            4371: 41,-33
-            4372: 34,-36
-            4373: 34,-35
-            4374: 35,-36
-            4375: 38,-37
-            4376: 43,-37
-            4377: 43,-37
-            4378: 46,-37
-            4379: 46,-35
-            4380: 46,-37
-            4381: 47,-37
-            4382: 48,-36
-            4383: 48,-37
-            4384: 46,-39
-            4385: 44,-39
-            4386: 41,-39
-            4387: 37,-39
-            4388: 35,-39
-            4389: 39,-38
-            4390: 33,-38
-            4690: -20,6
-            4691: -20,7
-            4692: -21,6
-            4693: -20,7
-            4694: -20,6
-            4695: -21,12
-            4696: -25,29
-            4697: -25,28
-            4698: -26,30
-            4699: -26,28
-            4700: -26,29
-            4724: -16,40
-            4725: -17,41
-            4726: -15,39
-            4727: -13,41
-            4728: -12,39
-            4779: -2,46
-            4780: -4,46
-            4781: -1,48
-            4782: 0,47
-            4783: -3,50
-            4784: 0,51
-            4785: 2,47
-            4786: 2,45
-            4787: 2,43
-            4788: 2,40
-            4789: -6,40
-            4790: -7,40
-            4791: -7,40
-            4792: -4,46
-            4793: -5,45
-            4794: -6,46
-            4795: 7,41
-            4796: 6,42
-            4797: 9,40
-            4798: 6,39
-            4799: 8,40
-            4800: 6,39
-            4801: 8,39
-            4802: 7,42
-            4803: 7,41
-            4804: 5,41
-            4835: 14,34
-            4836: 13,36
-            4837: 14,37
-            4838: 16,37
-            4839: 14,36
-            4840: 5,30
-            4841: 4,30
-            4842: 3,32
-            4843: 5,32
-            4844: 5,32
-            4845: 4,31
-            4846: 4,31
-            4847: 3,32
-            4848: 3,28
-            4849: 2,27
-            4850: 1,28
-            4851: 3,27
-            4852: 4,26
-            4853: 3,25
-            4854: 4,24
-            4855: 3,23
-            4856: 1,24
-            4857: 2,23
-            4875: -3,25
-            4876: -4,23
-            4877: -2,23
-            4878: -3,24
-            4879: 0,24
-            4880: 0,23
-            4881: -16,29
-            4882: -15,26
-            4883: -15,28
-            4884: -13,28
-            4885: -13,29
-            4886: -9,28
-            4887: -10,26
-            4888: -9,27
-            4889: -11,28
-            4890: -8,29
-            4891: -9,26
-            4892: -6,27
-            4893: -6,26
-            4894: -6,28
-            4895: -3,29
-            4896: -4,27
-            4897: -1,28
-            4898: -3,29
-            4899: -2,30
-            4900: -3,32
-            4901: -2,33
-            4902: -2,34
-            4903: -8,33
-            4904: -7,32
-            4905: -8,32
-            4906: -9,33
-            4907: -6,34
-            4908: -6,33
-            4909: -13,34
-            4977: -17,-28
-            4978: -19,-28
-            4979: -20,-27
-            4980: -20,-26
-            4981: -20,-27
-            4982: -15,-28
-            4983: -14,-28
-            4984: -14,-27
-            4985: -14,-29
-            4986: -17,-29
-            5048: -14,-38
-            5049: -14,-38
-            5067: -6,-37
-            5068: -5,-37
-            5069: -4,-37
-            5255: 78,-28
-            5256: 79,-28
-            5257: 78,-28
-            5258: 78,-27
-            5259: 78,-29
-            5321: 13,-45
-            5322: 12,-45
-            5323: 12,-50
-            5324: 12,-49
-            5325: 16,-49
-            5326: 15,-49
-            6129: 81,-34
-            6130: 82,-35
-            6131: 81,-35
-            6132: 81,-35
-            6158: -2,41
-            6159: -2,42
-            6160: -3,42
-            6161: -3,42
-            6162: -1,43
-            6184: 46,15
-            6185: 47,15
-            6186: 47,15
-            6187: 45,16
-            6399: 49,-1
-            6400: 51,-1
-            6401: 50,-2
-            6402: 49,-3
-            6403: 49,-5
-            6404: 51,-5
-            6405: 51,-3
-            6406: 50,-8
-            6407: 49,-8
-            6408: 48,-7
-            6409: 52,-8
-            6410: 54,-7
-            6411: 49,-10
-            6412: 50,-11
-            6413: 48,-11
-            6414: 51,-10
-            6415: 51,-11
-            6416: 52,-11
-            6417: 53,-11
-            6442: 50,2
-            6443: 50,4
-            6444: 50,9
-            6445: 50,12
-            6446: 50,13
-            6447: 47,9
-            6448: 47,7
-            6449: 41,8
-            6450: 41,7
-            6451: 40,8
-            6452: 40,7
-            6453: 44,8
-            6475: 46,4
-            6476: 45,4
-            6477: 46,2
-            6478: 45,2
-            6479: 45,1
-            6480: 46,5
-            6481: 40,5
-            6482: 44,4
-            6483: 44,7
-            6484: 55,3
-            6485: 54,2
-            6486: 53,3
-            6487: 55,4
-            6488: 57,4
-            6489: 56,2
-            6490: 55,1
-            6491: 55,6
-            6492: 53,7
-            6493: 53,6
-            6494: 55,8
-            6495: 56,10
-            6496: 55,10
-            6497: 53,12
-            6498: 53,11
-            6499: 57,14
-            6509: -1,-23
-            6510: 0,-23
-            6511: -4,-23
-            6512: -5,-23
-            6513: 35,19
-            6514: 34,19
-            6515: 35,20
-            6516: -8,27
-            6517: -12,27
-            6518: -10,27
-            6519: -14,27
-            6520: -15,27
-            6521: -15,27
-            6555: 88,-18
-            6556: 87,-18
-            6557: 91,-19
-            6558: 91,-18
-            6559: 92,-19
-            6638: 51,-36
-            6639: 51,-37
-            6640: 53,-39
-            6641: 54,-40
-            6642: 51,-35
-            6649: 51,-29
-            6655: 51,-26
-            6656: 52,-27
-            6672: -32,-12
-            6673: -34,-11
-            6674: -32,-10
-            6675: -33,-9
-            6676: -34,-9
-            6680: 61,-21
-            6681: -24,-42
-            6683: -25,-42
-            6684: -22,-42
-            6685: -22,-42
-            6692: -37,-45
-            6693: -38,-44
-            6694: -38,-46
-            6695: -37,-46
-            6786: 13,41
-            6787: 15,39
-            6788: 16,41
-            6824: 33,-2
-            6825: 34,-2
-            6826: 34,-2
-            6844: 7,-47
-            6983: -21,10
-            6984: -21,10
-            6985: -22,10
-            6986: -20,10
-            6987: -24,13
-            7135: -35,12
-            7136: -33,11
-            7137: -32,13
-            7138: -31,13
-            7139: -32,16
-            7140: -34,16
-            7141: -34,17
-            7142: -32,17
-            7143: -30,17
-            7144: -29,16
-            7145: -29,13
-            7146: -29,11
-            7147: -32,12
-            7148: -37,14
-            7149: -38,13
-            7150: -39,14
-            7160: -35,17
-            7161: -35,11
-            7162: -34,11
-            7163: -31,11
-            7164: -30,11
-            7165: -33,16
-            7166: -38,10
-            7167: -29,15
-            7168: -29,15
-            7169: -29,16
-            7170: -29,17
-            7171: -32,17
+            3090: 4,-31
+            3091: 0,-31
+            3092: -4,-31
+            3093: -8,-31
+            3094: -10,-31
+            3095: -13,-31
+            3096: -17,-31
+            3097: -18,-31
+            3098: -21,-31
+            3099: -25,-31
+            3100: -25,-27
+            3101: -25,-24
+            3102: -25,-22
+            3103: -25,-19
+            3104: -25,-18
+            3105: -25,-13
+            3106: -25,-11
+            3107: -24,-10
+            3108: -24,-8
+            3109: -22,-2
+            3110: -22,0
+            3111: -22,3
+            3112: -20,8
+            3113: -22,9
+            3114: -24,8
+            3115: -25,9
+            3116: -26,8
+            3117: -26,12
+            3118: -26,15
+            3119: -26,17
+            3120: -25,20
+            3121: -23,19
+            3122: -20,19
+            3123: -18,20
+            3124: -15,20
+            3125: -12,20
+            3126: -7,20
+            3127: -3,20
+            3128: -1,20
+            3129: 2,20
+            3130: 6,20
+            3131: 9,20
+            3132: 11,20
+            3133: 14,20
+            3134: 17,20
+            3135: 20,19
+            3136: 20,17
+            3137: 20,15
+            3138: 20,11
+            3139: 20,9
+            3140: 20,6
+            3141: 20,3
+            3142: 22,3
+            3143: 25,3
+            3144: 27,3
+            3145: 30,3
+            3146: 33,3
+            3147: 36,3
+            3148: 41,3
+            3149: 42,2
+            3150: 42,0
+            3151: 42,-3
+            3152: 42,-6
+            3153: 42,-9
+            3154: 42,-11
+            3155: 42,-15
+            3156: 42,-18
+            3157: 42,-20
+            3158: 44,-20
+            3159: 42,-13
+            3160: 42,-10
+            3161: 42,-7
+            3162: 42,-5
+            3163: 42,-2
+            3164: 42,1
+            3165: 39,3
+            3166: 37,3
+            3167: 35,3
+            3168: 32,3
+            3169: 31,3
+            3170: 26,3
+            3171: 22,3
+            3172: 20,6
+            3173: 20,9
+            3174: 20,12
+            3175: 20,15
+            3176: 20,19
+            3177: 19,20
+            3178: 12,20
+            3179: 8,20
+            3180: 5,20
+            3181: 2,20
+            3182: -1,20
+            3183: -5,20
+            3184: -9,20
+            3185: -12,20
+            3186: -16,20
+            3188: -19,19
+            3189: -26,20
+            3190: -26,16
+            3191: -26,11
+            3192: -26,8
+            3193: -23,8
+            3194: -22,9
+            3195: -21,8
+            3196: -20,9
+            3197: -22,3
+            3198: -22,0
+            3199: -22,-3
+            3200: -22,-5
+            3201: -23,-7
+            3202: -25,-7
+            3203: -23,-8
+            3204: -25,-10
+            3205: -25,-10
+            3206: -25,-14
+            3207: -25,-18
+            3208: -25,-21
+            3209: -25,-25
+            3210: -25,-28
+            3211: -23,-31
+            3212: -20,-31
+            3213: -15,-31
+            3214: -9,-31
+            3215: -5,-31
+            3216: 1,-31
+            3217: 1,-32
+            3218: 7,-31
+            3219: 5,-31
+            3220: 8,-32
+            3221: 9,-33
+            3222: 12,-33
+            3223: 15,-33
+            3224: 18,-33
+            3225: 19,-33
+            3226: 20,-29
+            3227: 20,-27
+            3228: 21,-26
+            3229: 24,-26
+            3230: 27,-26
+            3231: 28,-26
+            3232: 28,-22
+            3233: 28,-21
+            3234: 28,-20
+            3235: 32,-20
+            3236: 35,-20
+            3237: 39,-20
+            3238: 42,-20
+            3239: 40,-20
+            3240: 42,-17
+            3241: 42,-19
+            3242: 49,-20
+            3243: 52,-20
+            3244: 47,-20
+            3245: 53,-20
+            3246: 53,-22
+            3247: 53,-23
+            3248: 54,-20
+            3249: 56,-20
+            3250: 58,-20
+            3251: 58,-20
+            3252: 58,-22
+            3253: 58,-23
+            3254: 58,-22
+            3255: 49,-20
+            3256: 50,-20
+            3257: 44,-13
+            3258: 41,-13
+            3259: 39,-1
+            3260: 37,-1
+            3261: 36,-1
+            3262: 50,6
+            3263: 50,2
+            3264: 50,14
+            3265: 46,-7
+            3266: 45,-8
+            3267: 46,-4
+            3268: 46,-5
+            3269: 45,-1
+            3270: 46,-2
+            3271: 54,-1
+            3272: 55,-1
+            3273: 55,-7
+            3274: 62,-6
+            3275: 61,-6
+            3276: 55,7
+            3277: 54,7
+            3278: 59,15
+            3279: 58,15
+            3280: 60,16
+            3281: 60,3
+            3282: 60,1
+            3283: 63,1
+            3284: 62,1
+            3285: 62,0
+            3286: 62,3
+            3287: 62,4
+            3288: 28,3
+            3289: 28,3
+            3290: 24,8
+            3291: 24,6
+            3292: 23,8
+            3293: 25,7
+            3294: 24,7
+            3295: 24,6
+            3296: 25,11
+            3297: 25,13
+            3298: 25,14
+            3299: 23,15
+            3300: 22,12
+            3301: 23,12
+            3302: 23,14
+            3303: 23,11
+            3304: 26,19
+            3305: 24,20
+            3306: 25,21
+            3307: 26,19
+            3308: 25,20
+            3309: 29,20
+            3310: 29,19
+            3311: 30,19
+            3312: 29,21
+            3313: -19,26
+            3314: -21,28
+            3315: -20,26
+            3316: -20,28
+            3317: -7,40
+            3318: 3,40
+            3319: -26,19
+            3320: -17,11
+            3321: -16,11
+            3322: -16,13
+            3323: -17,13
+            3324: -30,3
+            3325: -32,3
+            3326: -37,3
+            3327: -36,2
+            3328: -35,2
+            3329: -37,1
+            3330: -33,1
+            3331: -32,2
+            3332: -32,1
+            3333: -31,2
+            3334: -33,2
+            3335: -38,0
+            3336: -37,0
+            3337: -34,0
+            3338: -33,0
+            3339: -31,0
+            3340: -30,0
+            3341: -55,6
+            3342: -54,6
+            3343: -54,4
+            3344: -54,2
+            3345: -56,5
+            3346: -55,4
+            3347: -53,1
+            3348: -51,1
+            3349: -49,1
+            3350: -47,1
+            3351: -45,1
+            3352: -44,1
+            3353: -43,1
+            3354: -54,1
+            3355: -54,-4
+            3356: -55,-4
+            3357: -54,-8
+            3358: -54,-10
+            3359: -54,-12
+            3360: -54,-14
+            3361: -54,-16
+            3362: -54,-19
+            3363: -53,-21
+            3364: -51,-21
+            3365: -54,-21
+            3366: -54,-20
+            3367: -54,-18
+            3368: -48,-21
+            3369: -48,-23
+            3370: -48,-24
+            3371: -50,-25
+            3372: -47,-25
+            3373: -45,-25
+            3374: -45,-26
+            3375: -45,-29
+            3376: -44,-28
+            3377: -43,-28
+            3378: -45,-31
+            3379: -48,-32
+            3380: -49,-32
+            3381: -51,-32
+            3382: -51,-30
+            3383: -51,-28
+            3384: -51,-26
+            3385: -48,-33
+            3386: -54,-26
+            3387: -56,-25
+            3388: -55,-25
+            3389: -56,-26
+            3390: -57,-26
+            3391: -55,-26
+            3392: -56,-25
+            3393: -48,-36
+            3394: -48,-38
+            3395: -48,-40
+            3396: -48,-42
+            3397: -48,-44
+            3398: -48,-47
+            3399: -49,-47
+            3400: -51,-47
+            3401: -53,-47
+            3402: -54,-47
+            3403: -45,-47
+            3404: -45,-47
+            3405: -43,-47
+            3406: -41,-47
+            3407: -41,-47
+            3408: -41,-50
+            3409: -41,-51
+            3410: -41,-54
+            3411: -36,-58
+            3412: -36,-60
+            3413: -36,-63
+            3414: -36,-64
+            3415: -36,-56
+            3416: -37,-56
+            3417: -41,-61
+            3418: -42,-62
+            3419: -41,-64
+            3420: -41,-64
+            3421: -42,-62
+            3422: -41,-48
+            3423: -53,-47
+            3424: -55,-47
+            3425: -55,-49
+            3426: -55,-52
+            3427: -55,-54
+            3428: -60,-58
+            3429: -60,-60
+            3430: -60,-62
+            3431: -60,-63
+            3432: -60,-64
+            3433: -58,-56
+            3434: -60,-56
+            3435: -55,-64
+            3436: -55,-62
+            3437: -54,-61
+            3438: -54,-63
+            3439: -54,-64
+            3440: -8,-28
+            3441: -7,-26
+            3442: -8,-27
+            3443: -8,-27
+            3444: 7,-22
+            3445: 5,-22
+            3446: 4,-23
+            3447: 4,-20
+            3448: 4,-19
+            3449: 7,-20
+            3450: 7,-21
+            3451: 7,-24
+            3452: 7,-25
+            3453: 10,-16
+            3454: 10,-18
+            3455: 10,-18
+            3456: 12,-29
+            3457: 12,-28
+            3458: 12,-26
+            3459: 13,-25
+            3460: 14,-25
+            3461: 14,-26
+            3462: 15,-25
+            3463: 16,-26
+            3464: 16,-29
+            3465: -4,-36
+            3466: -4,-37
+            3467: -6,-37
+            3468: 34,-3
+            3469: 32,-2
+            3470: 32,-3
+            3471: 31,-2
+            3472: 31,-3
+            3473: 31,-35
+            3474: 33,-35
+            3475: 32,-37
+            3476: 33,-36
+            3477: 33,-38
+            3478: 32,-36
+            3479: 31,-38
+            3480: 47,-36
+            3481: 47,-35
+            3482: 49,-35
+            3483: 49,-37
+            3484: 47,-37
+            3485: 47,-38
+            3486: 49,-38
+            3487: 47,-39
+            3488: 24,-29
+            3489: 26,-29
+            3490: 27,-29
+            3491: 28,-29
+            3492: 25,-34
+            3493: 27,-34
+            3494: 28,-34
+            3495: 26,-34
+            3496: 28,-43
+            3497: 29,-43
+            3498: 28,-45
+            3499: 29,-45
+            3500: 28,-46
+            3501: 29,-46
+            3502: 19,-46
+            3503: 18,-46
+            3504: 18,-47
+            3505: 19,-49
+            3506: 19,-49
+            3507: 18,-50
+            3508: 19,-50
+            3509: 18,-48
+            3510: 16,-48
+            3511: 14,-48
+            3512: 12,-47
+            3513: 10,-40
+            3514: 11,-39
+            3515: 11,-40
+            3516: 11,-40
+            3517: 8,-31
+            3518: 8,-31
+            3519: 5,-14
+            3520: 6,-14
+            3521: 6,-15
+            3522: 5,-15
+            3523: 4,-15
+            3524: 4,-15
+            3525: 25,7
+            3526: 20,16
+            3527: 20,18
+            3528: 15,26
+            3529: 14,26
+            3530: 13,26
+            3531: 13,26
+            3532: -44,10
+            3533: -45,10
+            3534: -46,10
+            3535: -47,10
+            3536: -49,10
+            3537: -50,10
+            3538: -50,12
+            3539: -47,12
+            3540: -48,1
+            3541: -47,1
+            3542: -48,-41
+            3543: -38,-56
+            3544: -38,-56
+            3545: -42,-57
+            3546: -55,-57
+            3678: -50,0
+            3679: -50,2
+            3680: -48,2
+            3681: -46,2
+            3682: -45,2
+            3683: -44,0
+            3684: -46,0
+            3685: -48,0
+            3717: -51,3
+            3718: -49,3
+            3719: -47,3
+            3720: -45,3
+            3721: -44,5
+            3722: -46,5
+            3723: -48,5
+            3724: -50,5
+            3725: -50,-1
+            3726: -49,-1
+            3727: -47,-1
+            3728: -46,-1
+            3729: -44,-1
+            3730: -44,-3
+            3731: -46,-3
+            3732: -47,-3
+            3733: -49,-3
+            3734: -50,-3
+            3735: -48,-3
+            3736: -46,-3
+            3737: -48,3
+            3738: -46,3
+            3818: -21,6
+            3819: -21,7
+            3820: -22,6
+            3821: -21,7
+            3999: 19,1
+            4000: 21,1
+            4001: 22,1
+            4002: 23,1
+            4003: 23,1
+            4057: 40,-22
+            4058: 41,-22
+            4059: 43,-22
+            4060: 44,-22
+            4119: 61,-25
+            4120: 62,-25
+            4121: 62,-26
+            4126: 68,-23
+            4149: 68,-15
+            4150: 68,-13
+            4151: 68,-14
+            4152: 67,-12
+            4153: 70,-12
+            4154: 70,-14
+            4155: 68,-11
+            4156: 71,-12
+            4157: 70,-14
+            4158: 70,-15
+            4159: 71,-13
+            4160: 69,-13
+            4161: 69,-12
+            4162: 68,-10
+            4163: 67,-10
+            4164: 68,-8
+            4165: 69,-8
+            4166: 70,-9
+            4167: 70,-10
+            4261: 39,-34
+            4262: 40,-34
+            4263: 39,-34
+            4264: 42,-34
+            4265: 40,-34
+            4266: 41,-33
+            4267: 34,-36
+            4268: 34,-35
+            4269: 35,-36
+            4270: 38,-37
+            4271: 43,-37
+            4272: 43,-37
+            4273: 46,-37
+            4274: 46,-35
+            4275: 46,-37
+            4276: 47,-37
+            4277: 48,-36
+            4278: 48,-37
+            4279: 46,-39
+            4280: 44,-39
+            4281: 41,-39
+            4282: 37,-39
+            4283: 35,-39
+            4284: 39,-38
+            4285: 33,-38
+            4584: -20,6
+            4585: -20,7
+            4586: -21,6
+            4587: -20,7
+            4588: -20,6
+            4589: -21,12
+            4590: -25,29
+            4591: -25,28
+            4592: -26,30
+            4593: -26,28
+            4594: -26,29
+            4618: -16,40
+            4619: -17,41
+            4620: -15,39
+            4621: -13,41
+            4622: -12,39
+            4673: -2,46
+            4674: -4,46
+            4675: -1,48
+            4676: 0,47
+            4677: -3,50
+            4678: 0,51
+            4679: 2,47
+            4680: 2,45
+            4681: 2,43
+            4682: 2,40
+            4683: -6,40
+            4684: -7,40
+            4685: -7,40
+            4686: -4,46
+            4687: -5,45
+            4688: -6,46
+            4689: 7,41
+            4690: 6,42
+            4691: 9,40
+            4692: 6,39
+            4693: 8,40
+            4694: 6,39
+            4695: 8,39
+            4696: 7,42
+            4697: 7,41
+            4698: 5,41
+            4729: 14,34
+            4730: 13,36
+            4731: 14,37
+            4732: 16,37
+            4733: 14,36
+            4734: 5,30
+            4735: 4,30
+            4736: 3,32
+            4737: 5,32
+            4738: 5,32
+            4739: 4,31
+            4740: 4,31
+            4741: 3,32
+            4742: 3,28
+            4743: 2,27
+            4744: 1,28
+            4745: 3,27
+            4746: 4,26
+            4747: 3,25
+            4748: 4,24
+            4749: 3,23
+            4750: 1,24
+            4751: 2,23
+            4769: -3,25
+            4770: -4,23
+            4771: -2,23
+            4772: -3,24
+            4773: 0,24
+            4774: 0,23
+            4775: -16,29
+            4776: -15,26
+            4777: -15,28
+            4778: -13,28
+            4779: -13,29
+            4780: -9,28
+            4781: -10,26
+            4782: -9,27
+            4783: -11,28
+            4784: -8,29
+            4785: -9,26
+            4786: -6,27
+            4787: -6,26
+            4788: -6,28
+            4789: -3,29
+            4790: -4,27
+            4791: -1,28
+            4792: -3,29
+            4793: -2,30
+            4794: -3,32
+            4795: -2,33
+            4796: -2,34
+            4797: -8,33
+            4798: -7,32
+            4799: -8,32
+            4800: -9,33
+            4801: -6,34
+            4802: -6,33
+            4803: -13,34
+            4871: -17,-28
+            4872: -19,-28
+            4873: -20,-27
+            4874: -20,-26
+            4875: -20,-27
+            4876: -15,-28
+            4877: -14,-28
+            4878: -14,-27
+            4879: -14,-29
+            4880: -17,-29
+            4934: -14,-38
+            4935: -14,-38
+            4953: -6,-37
+            4954: -5,-37
+            4955: -4,-37
+            5141: 78,-28
+            5142: 79,-28
+            5143: 78,-28
+            5144: 78,-27
+            5145: 78,-29
+            5207: 13,-45
+            5208: 12,-45
+            5209: 12,-50
+            5210: 12,-49
+            5211: 16,-49
+            5212: 15,-49
+            6001: 81,-34
+            6002: 82,-35
+            6003: 81,-35
+            6004: 81,-35
+            6030: -2,41
+            6031: -2,42
+            6032: -3,42
+            6033: -3,42
+            6034: -1,43
+            6243: 49,-1
+            6244: 51,-1
+            6245: 50,-2
+            6246: 49,-3
+            6247: 49,-5
+            6248: 51,-5
+            6249: 51,-3
+            6250: 50,-8
+            6251: 49,-8
+            6252: 48,-7
+            6253: 52,-8
+            6254: 54,-7
+            6255: 49,-10
+            6256: 50,-11
+            6257: 48,-11
+            6258: 51,-10
+            6259: 51,-11
+            6260: 52,-11
+            6261: 53,-11
+            6286: 50,2
+            6287: 50,4
+            6288: 50,9
+            6289: 50,12
+            6290: 50,13
+            6291: 47,9
+            6292: 47,7
+            6293: 41,8
+            6294: 41,7
+            6295: 40,8
+            6296: 40,7
+            6297: 44,8
+            6319: 46,4
+            6320: 45,4
+            6321: 46,2
+            6322: 45,2
+            6323: 45,1
+            6324: 46,5
+            6325: 40,5
+            6326: 44,4
+            6327: 44,7
+            6328: 55,3
+            6329: 54,2
+            6330: 53,3
+            6331: 55,4
+            6332: 57,4
+            6333: 56,2
+            6334: 55,1
+            6335: 55,6
+            6336: 53,7
+            6337: 53,6
+            6338: 55,8
+            6339: 56,10
+            6340: 55,10
+            6341: 53,12
+            6342: 53,11
+            6343: 57,14
+            6353: -1,-23
+            6354: 0,-23
+            6355: -4,-23
+            6356: -5,-23
+            6357: 35,19
+            6358: 34,19
+            6359: 35,20
+            6360: -8,27
+            6361: -12,27
+            6362: -10,27
+            6363: -14,27
+            6364: -15,27
+            6365: -15,27
+            6399: 88,-18
+            6400: 87,-18
+            6401: 91,-19
+            6402: 91,-18
+            6403: 92,-19
+            6482: 51,-36
+            6483: 51,-37
+            6484: 53,-39
+            6485: 54,-40
+            6486: 51,-35
+            6493: 51,-29
+            6499: 51,-26
+            6500: 52,-27
+            6516: -32,-12
+            6517: -34,-11
+            6518: -32,-10
+            6519: -33,-9
+            6520: -34,-9
+            6524: 61,-21
+            6525: -24,-42
+            6527: -25,-42
+            6528: -22,-42
+            6529: -22,-42
+            6536: -37,-45
+            6537: -38,-44
+            6538: -38,-46
+            6539: -37,-46
+            6628: 13,41
+            6629: 15,39
+            6630: 16,41
+            6666: 33,-2
+            6667: 34,-2
+            6668: 34,-2
+            6686: 7,-47
+            6791: -20,10
+            6792: -24,13
+            6856: -35,12
+            6857: -33,11
+            6858: -32,13
+            6859: -31,13
+            6860: -32,16
+            6861: -34,16
+            6862: -34,17
+            6863: -32,17
+            6864: -30,17
+            6865: -29,16
+            6866: -29,13
+            6867: -29,11
+            6868: -32,12
+            6869: -37,14
+            6870: -38,13
+            6871: -39,14
+            6881: -35,17
+            6882: -35,11
+            6883: -34,11
+            6884: -31,11
+            6885: -30,11
+            6886: -33,16
+            6887: -38,10
+            6888: -29,15
+            6889: -29,15
+            6890: -29,16
+            6891: -29,17
+            6892: -32,17
+            6935: 44,11
+            6936: 45,12
+            6937: 44,14
+            6938: 43,15
+            6939: 44,16
+            6940: 47,14
+            6941: 41,12
+            6942: 41,13
+            6943: 41,11
+            6944: 41,11
+            6945: 47,11
+            6946: 47,12
+            6958: 44,15
+            6959: 44,15
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            2990: -44,17
-            6606: 13,-30
-            6607: 16,-30
-            6608: 12,-30
-            6609: 12,-30
+            2930: -44,17
+            6450: 13,-30
+            6451: 16,-30
+            6452: 12,-30
+            6453: 12,-30
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            6581: 89,-21
-            6582: 90,-20
+            6425: 89,-21
+            6426: 90,-20
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            6500: 57,4
-            6501: 57,2
-            6502: 54,3
-            6503: 56,1
-            6504: 49,-15
-            6505: 52,-15
-            6506: 43,4
-            6691: -36,-44
-            6789: 14,42
-            6790: 14,40
-            6791: 16,42
-            7151: -34,13
-            7152: -32,13
-            7153: -31,15
-            7154: -30,16
-            7155: -29,11
-            7156: -35,13
-            7157: -33,13
+            6344: 57,4
+            6345: 57,2
+            6346: 54,3
+            6347: 56,1
+            6348: 49,-15
+            6349: 52,-15
+            6350: 43,4
+            6535: -36,-44
+            6631: 14,42
+            6632: 14,40
+            6633: 16,42
+            6872: -34,13
+            6873: -32,13
+            6874: -31,15
+            6875: -30,16
+            6876: -29,11
+            6877: -35,13
+            6878: -33,13
+            6954: 44,13
+            6955: 46,13
+            6956: 46,12
+            6957: 42,11
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            2989: -44,16
+            2929: -44,16
         - node:
             cleanable: True
             color: '#FFFFFF47'
             id: DirtMedium
           decals:
-            6614: 11,-29
-            6615: 11,-29
+            6458: 11,-29
+            6459: 11,-29
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            6584: 91,-21
-            6585: 90,-21
+            6428: 91,-21
+            6429: 90,-21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            3923: -16,11
-            3924: -17,12
-            6650: 52,-30
-            6677: -32,-9
-            6678: -34,-12
-            6690: -36,-46
-            6792: 13,39
-            6793: 13,42
-            6794: 16,40
-            6795: 13,38
-            6796: 13,38
-            6846: 9,-47
-            6971: -33,15
-            7158: -30,13
-            7159: -38,14
+            3848: -16,11
+            3849: -17,12
+            6494: 52,-30
+            6521: -32,-9
+            6522: -34,-12
+            6534: -36,-46
+            6634: 13,39
+            6635: 13,42
+            6636: 16,40
+            6637: 13,38
+            6638: 13,38
+            6688: 9,-47
+            6790: -33,15
+            6879: -30,13
+            6880: -38,14
+            6949: 42,12
+            6950: 42,13
+            6951: 46,11
+            6952: 47,13
+            6953: 46,14
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            2988: -44,15
+            2928: -44,15
         - node:
             color: '#FFFFFFFF'
             id: FlowersBROne
           decals:
-            880: -47,-2
-            907: -50,-7
-            1936: 56,-22
+            855: -47,-2
+            882: -50,-7
+            1876: 56,-22
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRThree
@@ -6585,255 +6597,250 @@ entities:
             color: '#FFFFFFFF'
             id: FlowersBRThree
           decals:
-            3017: 80.70172,-6.173584
+            2957: 80.70172,-6.173584
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRTwo
           decals:
             562: -24,6
-            878: -45,4
+            853: -45,4
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr1
           decals:
-            911: -45,-7
-            932: -49,-29
-            1498: -51,-49
-            6874: 57.036556,-21.73806
+            886: -45,-7
+            907: -49,-29
+            1448: -51,-49
+            6716: 57.036556,-21.73806
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr3
           decals:
-            1108: 42,-31
+            1083: 42,-31
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv1
           decals:
-            879: -49,-2
-            912: -51,-7
-            1499: -49,-49
+            854: -49,-2
+            887: -51,-7
+            1449: -49,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Flowerspv1
           decals:
-            3018: 80.04127,-7.0725327
+            2958: 80.04127,-7.0725327
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv3
           decals:
             540: -39,6
             561: -24,4
-            909: -48,-9
-            1107: 42,-30
-            1745: 57,18
+            884: -48,-9
+            1082: 42,-30
+            1695: 57,18
         - node:
             color: '#FFFFFFFF'
             id: Flowersy1
           decals:
-            1935: 55,-23
+            1875: 55,-23
         - node:
             color: '#FFFFFFFF'
             id: Flowersy2
           decals:
             539: -38,5
-            910: -45,-9
-            933: -48,-30
-            1500: -46,-49
+            885: -45,-9
+            908: -48,-30
+            1450: -46,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Flowersy2
           decals:
-            3019: 81.08699,-7.6962934
+            2959: 81.08699,-7.6962934
         - node:
             color: '#FFFFFFFF'
             id: Flowersy3
           decals:
-            877: -50,4
-            908: -47,-7
-            2232: 25,1
+            852: -50,4
+            883: -47,-7
+            2172: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Flowersy4
           decals:
             542: -28,7
-            1728: 59,19
-        - node:
-            color: '#EFB34196'
-            id: FullTileOverlayGreyscale
-          decals:
-            6163: 43,13
+            1678: 59,19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassa2
           decals:
-            3007: 80,-6
+            2947: 80,-6
         - node:
             color: '#FFFFFFFF'
             id: Grassa3
           decals:
-            899: -51,-7
+            874: -51,-7
         - node:
             color: '#FFFFFFFF'
             id: Grassa4
           decals:
-            1492: -47,-49
-            1942: 53.52114,-21.634073
+            1442: -47,-49
+            1882: 53.52114,-21.634073
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassa4
           decals:
-            3006: 80,-8
+            2946: 80,-8
         - node:
             color: '#FFFFFFFF'
             id: Grassa5
           decals:
-            898: -49,-7
-            1493: -45,-49
-            1943: 57.536766,-22.899698
+            873: -49,-7
+            1443: -45,-49
+            1883: 57.536766,-22.899698
         - node:
             color: '#FFFFFFFF'
             id: Grassb1
           decals:
-            902: -45,-8
+            877: -45,-8
         - node:
             color: '#FFFFFFFF'
             id: Grassb2
           decals:
-            937: -49,-28
-            1729: 60,19
+            912: -49,-28
+            1679: 60,19
         - node:
             color: '#FFFFFFFF'
             id: Grassb3
           decals:
-            900: -51,-8
-            901: -45,-7
+            875: -51,-8
+            876: -45,-7
         - node:
             color: '#FFFFFFFF'
             id: Grassb4
           decals:
-            897: -48,-9
-            1491: -50,-49
-            1941: 54.661766,-23.446573
+            872: -48,-9
+            1441: -50,-49
+            1881: 54.661766,-23.446573
         - node:
             color: '#FFFFFFFF'
             id: Grassb5
           decals:
-            903: -50,-9
-            6872: 56.88979,-22.312899
+            878: -50,-9
+            6714: 56.88979,-22.312899
         - node:
             color: '#FFFFFFFF'
             id: Grassc1
           decals:
-            896: -46,-8
+            871: -46,-8
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassc1
           decals:
-            3009: 79.637665,-6.118546
+            2949: 79.637665,-6.118546
         - node:
             color: '#FFFFFFFF'
             id: Grassc2
           decals:
-            895: -47,-7
+            870: -47,-7
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassc2
           decals:
-            3010: 81.362175,-7.1642623
+            2950: 81.362175,-7.1642623
         - node:
             color: '#FFFFFFFF'
             id: Grassc4
           decals:
-            893: -51,-9
-            894: -49,-8
+            868: -51,-9
+            869: -49,-8
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassc4
           decals:
-            3008: 79.56428,-7.366067
+            2948: 79.56428,-7.366067
         - node:
             color: '#FFFFFFFF'
             id: Grassd1
           decals:
-            889: -50,-8
-            892: -47,-9
+            864: -50,-8
+            867: -47,-9
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassd1
           decals:
-            3011: 79.14232,-8.063211
+            2951: 79.14232,-8.063211
         - node:
             color: '#FFFFFFFF'
             id: Grassd2
           decals:
-            891: -45,-9
-            1945: 53.52114,-22.368448
-            6873: 57.379013,-21.12653
+            866: -45,-9
+            1885: 53.52114,-22.368448
+            6715: 57.379013,-21.12653
         - node:
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
-            890: -48,-7
-            935: -48,-27
-            1946: 57.73989,-21.884073
+            865: -48,-7
+            910: -48,-27
+            1886: 57.73989,-21.884073
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
-            3012: 79.05059,-6.320351
-            3013: 80.53661,-6.6872687
+            2952: 79.05059,-6.320351
+            2953: 80.53661,-6.6872687
         - node:
             color: '#FFFFFFFF'
             id: Grasse1
           decals:
-            888: -46,-7
-            936: -47,-28
+            863: -46,-7
+            911: -47,-28
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grasse1
           decals:
-            3016: 81.784134,-6.4304266
+            2956: 81.784134,-6.4304266
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grasse2
           decals:
-            3014: 80.518265,-8.02652
+            2954: 80.518265,-8.02652
         - node:
             color: '#FFFFFFFF'
             id: Grasse3
           decals:
-            887: -50,-7
-            934: -47,-30
-            1746: 57,19
-            1944: 55.95864,-23.352823
+            862: -50,-7
+            909: -47,-30
+            1696: 57,19
+            1884: 55.95864,-23.352823
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grasse3
           decals:
-            3015: 80.72007,-6.0451627
+            2955: 80.72007,-6.0451627
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale
           decals:
-            6233: 44,7
+            6077: 44,7
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale
           decals:
-            1187: 4,30
-            1188: 5,30
+            1162: 4,30
+            1163: 5,30
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale
@@ -6845,35 +6852,35 @@ entities:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale180
           decals:
-            1025: 39,-35
-            1026: 36,-36
-            1027: 37,-36
-            1028: 38,-36
-            1029: 39,-36
-            1030: 40,-36
-            1031: 42,-36
-            1032: 41,-36
-            1033: 43,-36
-            1034: 44,-36
-            1037: 38,-35
-            1038: 37,-35
-            1039: 36,-35
-            1040: 41,-35
-            1041: 40,-35
-            1042: 42,-35
-            1043: 43,-35
-            1044: 44,-35
+            1000: 39,-35
+            1001: 36,-36
+            1002: 37,-36
+            1003: 38,-36
+            1004: 39,-36
+            1005: 40,-36
+            1006: 42,-36
+            1007: 41,-36
+            1008: 43,-36
+            1009: 44,-36
+            1012: 38,-35
+            1013: 37,-35
+            1014: 36,-35
+            1015: 41,-35
+            1016: 40,-35
+            1017: 42,-35
+            1018: 43,-35
+            1019: 44,-35
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
           decals:
-            6234: 44,9
+            6078: 44,9
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale180
           decals:
-            1189: 4,32
-            1190: 5,32
+            1164: 4,32
+            1165: 5,32
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale180
@@ -6885,12 +6892,12 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale270
           decals:
-            6235: 45,8
+            6079: 45,8
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
           decals:
-            1186: 6,31
+            1161: 6,31
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale270
@@ -6900,12 +6907,12 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
           decals:
-            6236: 43,8
+            6080: 43,8
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale90
           decals:
-            1185: 3,31
+            1160: 3,31
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale90
@@ -6936,70 +6943,79 @@ entities:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            6573: 89,-20
-            6574: 90,-20
+            6417: 89,-20
+            6418: 90,-20
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1789: 58,-24
-            1790: 58,-23
-            2165: -4,-36
-            2183: -56,-59
-            2184: -56,-66
+            1729: 58,-24
+            1730: 58,-23
+            2105: -4,-36
+            2123: -56,-59
+            2124: -56,-66
         - node:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
             352: 39,-22
-            3145: 25,22
-            3146: 29,22
-            6142: -44,24
+            3080: 25,22
+            3081: 29,22
+            6014: -44,24
+            6893: 44,11
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            2199: -40,-59
-            2200: -40,-66
-            6143: -45,23
+            2139: -40,-59
+            2140: -40,-66
+            6015: -45,23
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
             351: 45,-22
-            1770: 63,-26
-            6144: -44,22
+            1710: 63,-26
+            6016: -44,22
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1271: 23,12
-            6145: -43,23
+            1246: 23,12
+            6017: -43,23
         - node:
             color: '#52B4E996'
             id: MiniTileCheckerAOverlay
           decals:
-            2217: 13,25
-            2218: 14,25
-            2219: 15,25
-            2220: 15,24
-            2221: 15,23
-            2222: 14,23
-            2223: 14,24
-            2224: 13,24
-            2225: 13,23
+            2157: 13,25
+            2158: 14,25
+            2159: 15,25
+            2160: 15,24
+            2161: 15,23
+            2162: 14,23
+            2163: 14,24
+            2164: 13,24
+            2165: 13,23
+        - node:
+            color: '#EFB34196'
+            id: MiniTileCheckerBOverlay
+          decals:
+            6912: 42,11
+            6913: 42,12
+            6914: 46,11
+            6915: 46,12
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineE
           decals:
-            6720: 9,39
-            6721: 9,40
-            6722: 9,41
-            6723: 9,42
+            6562: 9,39
+            6563: 9,40
+            6564: 9,41
+            6565: 9,42
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
@@ -7014,7 +7030,7 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
           decals:
-            3252: -19,20
+            3187: -19,20
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineS
@@ -7029,1144 +7045,1144 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineW
           decals:
-            6724: 5,39
-            6725: 5,40
-            6726: 5,41
-            6727: 5,42
+            6566: 5,39
+            6567: 5,40
+            6568: 5,41
+            6569: 5,42
         - node:
             color: '#C6FF917F'
             id: MiniTileInnerOverlayNW
           decals:
-            7081: -29,12
+            6802: -29,12
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayE
           decals:
-            7073: -35,13
-            7074: -35,14
-            7075: -35,15
+            6794: -35,13
+            6795: -35,14
+            6796: -35,15
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayN
           decals:
-            7072: -32,12
+            6793: -32,12
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayS
           decals:
-            7076: -32,16
-            7077: -31,16
-            7078: -30,16
+            6797: -32,16
+            6798: -31,16
+            6799: -30,16
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayW
           decals:
-            7079: -29,13
-            7080: -29,14
+            6800: -29,13
+            6801: -29,14
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerNe
           decals:
-            2403: -43,-25
-            2489: -40,-46
+            2343: -43,-25
+            2429: -40,-46
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerNw
           decals:
-            2303: -26,-9
-            2347: -55,7
-            2488: -56,-46
-            2589: 27,-19
-            2799: -27,21
+            2243: -26,-9
+            2287: -55,7
+            2428: -56,-46
+            2529: 27,-19
+            2739: -27,21
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerSe
           decals:
-            2291: -23,-11
-            2415: -46,-33
-            2419: -43,-32
+            2231: -23,-11
+            2355: -46,-33
+            2359: -43,-32
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerSw
           decals:
-            2411: -52,-32
-            2414: -50,-33
-            2565: 7,-34
-            2669: 40,1
-            2698: 19,2
+            2351: -52,-32
+            2354: -50,-33
+            2505: 7,-34
+            2609: 40,1
+            2638: 19,2
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerNe
           decals:
-            2266: -23,-30
-            2315: -25,9
-            2404: -44,-25
-            2534: -28,-30
-            2817: 77,-19
-            2818: 77,-15
+            2206: -23,-30
+            2255: -25,9
+            2344: -44,-25
+            2474: -28,-30
+            2757: 77,-19
+            2758: 77,-15
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerNw
           decals:
-            2304: -25,-9
-            2533: -41,-30
-            2581: 27,-25
-            2633: 57,-19
+            2244: -25,-9
+            2473: -41,-30
+            2521: 27,-25
+            2573: 57,-19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerSe
           decals:
-            2290: -24,-11
-            2416: -46,-32
-            2422: -47,-33
-            2487: -54,-48
-            2532: -28,-27
-            2637: 59,-21
-            2815: 77,-13
-            2816: 77,-17
+            2230: -24,-11
+            2356: -46,-32
+            2362: -47,-33
+            2427: -54,-48
+            2472: -28,-27
+            2577: 59,-21
+            2755: 77,-13
+            2756: 77,-17
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerSw
           decals:
-            2413: -50,-32
-            2423: -49,-33
-            2486: -42,-48
-            2531: -41,-27
-            2563: 7,-32
-            2642: 52,-21
-            2668: 41,1
-            2670: 40,2
-            2738: 19,19
+            2353: -50,-32
+            2363: -49,-33
+            2426: -42,-48
+            2471: -41,-27
+            2503: 7,-32
+            2582: 52,-21
+            2608: 41,1
+            2610: 40,2
+            2678: 19,19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineE
           decals:
-            2267: -23,-29
-            2268: -24,-25
-            2269: -24,-24
-            2270: -24,-23
-            2271: -24,-23
-            2272: -24,-20
-            2273: -24,-20
-            2274: -24,-20
-            2275: -24,-21
-            2276: -24,-21
-            2277: -24,-20
-            2278: -24,-19
-            2279: -24,-19
-            2280: -24,-19
-            2281: -24,-17
-            2282: -24,-17
-            2283: -24,-16
-            2284: -24,-16
-            2285: -24,-16
-            2286: -24,-15
-            2287: -24,-14
-            2288: -24,-14
-            2289: -24,-13
-            2292: -23,-10
-            2293: -23,-9
-            2294: -23,-8
-            2305: -25,4
-            2306: -25,5
-            2307: -25,6
-            2308: -25,7
-            2320: -43,0
-            2321: -43,1
-            2322: -43,2
-            2323: -43,3
-            2324: -43,-1
-            2363: -53,-6
-            2364: -53,-7
-            2365: -53,-7
-            2366: -53,-8
-            2367: -53,-9
-            2368: -53,-9
-            2369: -53,-10
-            2370: -53,-12
-            2378: -53,-13
-            2379: -53,-13
-            2380: -53,-15
-            2381: -53,-15
-            2382: -53,-15
-            2384: -53,-14
-            2385: -53,-16
-            2386: -53,-17
-            2387: -53,-18
-            2393: -44,-20
-            2394: -44,-21
-            2395: -44,-22
-            2396: -44,-22
-            2397: -44,-23
-            2398: -44,-23
-            2399: -44,-24
-            2400: -43,-25
-            2401: -43,-26
-            2402: -43,-27
-            2420: -43,-31
-            2421: -43,-30
-            2426: -47,-35
-            2427: -47,-36
-            2428: -47,-36
-            2429: -47,-38
-            2430: -47,-39
-            2431: -47,-40
-            2442: -47,-41
-            2443: -47,-42
-            2444: -47,-42
-            2445: -47,-43
-            2446: -47,-44
-            2447: -47,-44
-            2498: -40,-47
-            2499: -40,-48
-            2500: -40,-50
-            2501: -40,-50
-            2502: -40,-51
-            2503: -40,-51
-            2504: -40,-51
-            2505: -40,-52
-            2506: -40,-53
-            2507: -40,-53
-            2508: -40,-53
-            2509: -40,-54
-            2510: -54,-51
-            2511: -54,-51
-            2512: -54,-52
-            2513: -54,-52
-            2514: -54,-53
-            2515: -54,-53
-            2516: -54,-54
-            2527: -28,-29
-            2528: -28,-28
-            2638: 59,-22
-            2643: 43,-17
-            2644: 43,-16
-            2645: 43,-15
-            2646: 43,-15
-            2652: 43,-12
-            2653: 43,-11
-            2718: 21,10
-            2719: 21,11
-            2720: 21,11
-            2721: 21,12
-            2722: 21,12
-            2723: 21,12
-            2724: 21,13
-            2725: 21,14
-            2726: 21,15
-            2813: 77,-14
-            2814: 77,-18
-            3144: -54,-50
-            6809: -24,-18
+            2207: -23,-29
+            2208: -24,-25
+            2209: -24,-24
+            2210: -24,-23
+            2211: -24,-23
+            2212: -24,-20
+            2213: -24,-20
+            2214: -24,-20
+            2215: -24,-21
+            2216: -24,-21
+            2217: -24,-20
+            2218: -24,-19
+            2219: -24,-19
+            2220: -24,-19
+            2221: -24,-17
+            2222: -24,-17
+            2223: -24,-16
+            2224: -24,-16
+            2225: -24,-16
+            2226: -24,-15
+            2227: -24,-14
+            2228: -24,-14
+            2229: -24,-13
+            2232: -23,-10
+            2233: -23,-9
+            2234: -23,-8
+            2245: -25,4
+            2246: -25,5
+            2247: -25,6
+            2248: -25,7
+            2260: -43,0
+            2261: -43,1
+            2262: -43,2
+            2263: -43,3
+            2264: -43,-1
+            2303: -53,-6
+            2304: -53,-7
+            2305: -53,-7
+            2306: -53,-8
+            2307: -53,-9
+            2308: -53,-9
+            2309: -53,-10
+            2310: -53,-12
+            2318: -53,-13
+            2319: -53,-13
+            2320: -53,-15
+            2321: -53,-15
+            2322: -53,-15
+            2324: -53,-14
+            2325: -53,-16
+            2326: -53,-17
+            2327: -53,-18
+            2333: -44,-20
+            2334: -44,-21
+            2335: -44,-22
+            2336: -44,-22
+            2337: -44,-23
+            2338: -44,-23
+            2339: -44,-24
+            2340: -43,-25
+            2341: -43,-26
+            2342: -43,-27
+            2360: -43,-31
+            2361: -43,-30
+            2366: -47,-35
+            2367: -47,-36
+            2368: -47,-36
+            2369: -47,-38
+            2370: -47,-39
+            2371: -47,-40
+            2382: -47,-41
+            2383: -47,-42
+            2384: -47,-42
+            2385: -47,-43
+            2386: -47,-44
+            2387: -47,-44
+            2438: -40,-47
+            2439: -40,-48
+            2440: -40,-50
+            2441: -40,-50
+            2442: -40,-51
+            2443: -40,-51
+            2444: -40,-51
+            2445: -40,-52
+            2446: -40,-53
+            2447: -40,-53
+            2448: -40,-53
+            2449: -40,-54
+            2450: -54,-51
+            2451: -54,-51
+            2452: -54,-52
+            2453: -54,-52
+            2454: -54,-53
+            2455: -54,-53
+            2456: -54,-54
+            2467: -28,-29
+            2468: -28,-28
+            2578: 59,-22
+            2583: 43,-17
+            2584: 43,-16
+            2585: 43,-15
+            2586: 43,-15
+            2592: 43,-12
+            2593: 43,-11
+            2658: 21,10
+            2659: 21,11
+            2660: 21,11
+            2661: 21,12
+            2662: 21,12
+            2663: 21,12
+            2664: 21,13
+            2665: 21,14
+            2666: 21,15
+            2753: 77,-14
+            2754: 77,-18
+            3079: -54,-50
+            6651: -24,-18
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineN
           decals:
-            2260: -22,-30
-            2261: -21,-30
-            2262: -20,-30
-            2263: -20,-30
-            2264: -18,-30
-            2265: -19,-30
-            2309: -19,9
-            2310: -20,9
-            2311: -21,9
-            2312: -22,9
-            2313: -24,9
-            2314: -23,9
-            2334: -51,7
-            2335: -50,7
-            2336: -49,7
-            2337: -48,7
-            2338: -47,7
-            2339: -47,7
-            2340: -46,7
-            2341: -45,7
-            2342: -42,7
-            2343: -43,7
-            2344: -54,7
-            2345: -55,7
-            2346: -53,7
-            2448: -54,-46
-            2449: -51,-46
-            2450: -50,-46
-            2451: -50,-46
-            2452: -51,-46
-            2453: -53,-46
-            2454: -54,-46
-            2455: -54,-46
-            2456: -53,-46
-            2457: -52,-46
-            2458: -54,-46
-            2459: -55,-46
-            2460: -46,-46
-            2461: -45,-46
-            2462: -45,-46
-            2463: -44,-46
-            2464: -44,-46
-            2465: -43,-46
-            2466: -43,-46
-            2467: -42,-46
-            2468: -42,-46
-            2469: -41,-46
-            2553: -11,-30
-            2554: -10,-30
-            2555: -10,-30
-            2579: 25,-25
-            2580: 26,-25
-            2590: 28,-19
-            2591: 29,-19
-            2592: 29,-19
-            2593: 31,-19
-            2594: 31,-19
-            2595: 32,-19
-            2596: 32,-19
-            2597: 32,-19
-            2598: 34,-19
-            2599: 34,-19
-            2600: 34,-19
-            2601: 33,-19
-            2602: 35,-19
-            2603: 35,-19
-            2604: 36,-19
-            2605: 36,-19
-            2606: 37,-19
-            2607: 37,-19
-            2608: 39,-19
-            2609: 39,-19
-            2610: 40,-19
-            2611: 40,-19
-            2612: 40,-19
-            2613: 41,-19
-            2614: 42,-19
-            2615: 42,-19
-            2616: 43,-19
-            2617: 44,-19
-            2618: 44,-19
-            2619: 45,-19
-            2620: 47,-19
-            2621: 47,-19
-            2622: 48,-19
-            2623: 49,-19
-            2624: 49,-19
-            2625: 50,-19
-            2626: 51,-19
-            2627: 52,-19
-            2628: 52,-19
-            2629: 54,-19
-            2630: 55,-19
-            2631: 56,-19
-            2632: 53,-19
-            2675: 37,4
-            2676: 35,4
-            2677: 34,4
-            2678: 33,4
-            2679: 32,4
-            2680: 32,4
-            2681: 31,4
-            2741: 20,21
-            2742: 19,21
-            2743: 19,21
-            2744: 18,21
-            2745: 16,21
-            2746: 16,21
-            2747: 16,21
-            2748: 16,21
-            2749: 15,21
-            2750: 13,21
-            2751: 13,21
-            2752: 12,21
-            2753: 11,21
-            2754: 10,21
-            2755: 10,21
-            2756: 9,21
-            2757: 8,21
-            2796: -26,21
-            2806: 66,-17
-            2807: 68,-17
-            2808: 67,-17
-            2809: 69,-17
-            2810: 70,-17
-            2811: 70,-17
-            2812: 71,-17
+            2200: -22,-30
+            2201: -21,-30
+            2202: -20,-30
+            2203: -20,-30
+            2204: -18,-30
+            2205: -19,-30
+            2249: -19,9
+            2250: -20,9
+            2251: -21,9
+            2252: -22,9
+            2253: -24,9
+            2254: -23,9
+            2274: -51,7
+            2275: -50,7
+            2276: -49,7
+            2277: -48,7
+            2278: -47,7
+            2279: -47,7
+            2280: -46,7
+            2281: -45,7
+            2282: -42,7
+            2283: -43,7
+            2284: -54,7
+            2285: -55,7
+            2286: -53,7
+            2388: -54,-46
+            2389: -51,-46
+            2390: -50,-46
+            2391: -50,-46
+            2392: -51,-46
+            2393: -53,-46
+            2394: -54,-46
+            2395: -54,-46
+            2396: -53,-46
+            2397: -52,-46
+            2398: -54,-46
+            2399: -55,-46
+            2400: -46,-46
+            2401: -45,-46
+            2402: -45,-46
+            2403: -44,-46
+            2404: -44,-46
+            2405: -43,-46
+            2406: -43,-46
+            2407: -42,-46
+            2408: -42,-46
+            2409: -41,-46
+            2493: -11,-30
+            2494: -10,-30
+            2495: -10,-30
+            2519: 25,-25
+            2520: 26,-25
+            2530: 28,-19
+            2531: 29,-19
+            2532: 29,-19
+            2533: 31,-19
+            2534: 31,-19
+            2535: 32,-19
+            2536: 32,-19
+            2537: 32,-19
+            2538: 34,-19
+            2539: 34,-19
+            2540: 34,-19
+            2541: 33,-19
+            2542: 35,-19
+            2543: 35,-19
+            2544: 36,-19
+            2545: 36,-19
+            2546: 37,-19
+            2547: 37,-19
+            2548: 39,-19
+            2549: 39,-19
+            2550: 40,-19
+            2551: 40,-19
+            2552: 40,-19
+            2553: 41,-19
+            2554: 42,-19
+            2555: 42,-19
+            2556: 43,-19
+            2557: 44,-19
+            2558: 44,-19
+            2559: 45,-19
+            2560: 47,-19
+            2561: 47,-19
+            2562: 48,-19
+            2563: 49,-19
+            2564: 49,-19
+            2565: 50,-19
+            2566: 51,-19
+            2567: 52,-19
+            2568: 52,-19
+            2569: 54,-19
+            2570: 55,-19
+            2571: 56,-19
+            2572: 53,-19
+            2615: 37,4
+            2616: 35,4
+            2617: 34,4
+            2618: 33,4
+            2619: 32,4
+            2620: 32,4
+            2621: 31,4
+            2681: 20,21
+            2682: 19,21
+            2683: 19,21
+            2684: 18,21
+            2685: 16,21
+            2686: 16,21
+            2687: 16,21
+            2688: 16,21
+            2689: 15,21
+            2690: 13,21
+            2691: 13,21
+            2692: 12,21
+            2693: 11,21
+            2694: 10,21
+            2695: 10,21
+            2696: 9,21
+            2697: 8,21
+            2736: -26,21
+            2746: 66,-17
+            2747: 68,-17
+            2748: 67,-17
+            2749: 69,-17
+            2750: 70,-17
+            2751: 70,-17
+            2752: 71,-17
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineS
           decals:
-            2250: -25,-32
-            2251: -23,-32
-            2252: -24,-32
-            2253: -22,-32
-            2254: -22,-32
-            2255: -21,-32
-            2256: -19,-32
-            2257: -19,-32
-            2258: -18,-32
-            2259: -18,-32
-            2325: -45,-5
-            2326: -46,-5
-            2327: -47,-5
-            2328: -48,-5
-            2329: -48,-5
-            2330: -50,-5
-            2331: -50,-5
-            2332: -49,-5
-            2333: -51,-5
-            2412: -51,-32
-            2417: -45,-32
-            2418: -44,-32
-            2470: -53,-48
-            2471: -52,-48
-            2472: -51,-48
-            2473: -50,-48
-            2474: -50,-48
-            2475: -49,-48
-            2476: -50,-48
-            2477: -50,-48
-            2478: -48,-48
-            2479: -48,-48
-            2480: -47,-48
-            2481: -47,-48
-            2482: -46,-48
-            2483: -45,-48
-            2484: -44,-48
-            2485: -43,-48
-            2535: -16,-32
-            2536: -14,-32
-            2537: -14,-32
-            2538: -14,-32
-            2539: -15,-32
-            2540: -14,-32
-            2541: -14,-32
-            2542: -13,-32
-            2543: -12,-32
-            2544: -12,-32
-            2545: -11,-32
-            2546: -11,-32
-            2547: -10,-32
-            2548: -10,-32
-            2549: -7,-32
-            2550: -6,-32
-            2551: -5,-32
-            2552: -5,-32
-            2556: -4,-32
-            2557: -3,-32
-            2558: -3,-32
-            2559: -3,-32
-            2560: -2,-32
-            2561: 3,-32
-            2562: 6,-32
-            2566: 8,-34
-            2567: 9,-34
-            2568: 9,-34
-            2569: 11,-34
-            2570: 11,-34
-            2571: 12,-34
-            2572: 12,-34
-            2573: 13,-34
-            2574: 13,-34
-            2575: 14,-34
-            2576: 15,-34
-            2577: 15,-34
-            2578: 16,-34
-            2636: 60,-21
-            2671: 38,2
-            2672: 36,2
-            2673: 37,2
-            2674: 38,2
-            2682: 34,2
-            2683: 33,2
-            2684: 32,2
-            2685: 31,2
-            2686: 31,2
-            2687: 27,2
-            2688: 26,2
-            2689: 26,2
-            2690: 25,2
-            2691: 24,2
-            2692: 23,2
-            2693: 23,2
-            2694: 21,2
-            2695: 21,2
-            2696: 22,2
-            2697: 20,2
-            2739: 18,19
-            2740: 16,19
-            2758: 14,19
-            2759: 13,19
-            2760: 12,19
-            2761: 11,19
-            2762: 10,19
-            2763: 10,19
-            2764: 9,19
-            2765: 9,19
-            2766: 8,19
-            2767: 6,19
-            2768: 6,19
-            2769: 7,19
-            2770: 5,19
-            2771: 0,19
-            2772: 0,19
-            2773: -1,19
-            2774: -1,19
-            2775: -2,19
-            2776: -3,19
-            2777: -3,19
-            2778: -4,19
-            2779: -5,19
-            2780: -6,19
-            2781: -6,19
-            2782: -7,19
-            2783: -7,19
-            2784: -8,19
-            2785: -8,19
-            2786: -8,19
-            2787: -11,19
-            2788: -11,19
-            2789: -13,19
-            2790: -13,19
-            2791: -14,19
-            2792: -12,19
-            2793: -16,19
-            2794: -16,19
-            2795: -18,19
-            2800: 66,-19
-            2801: 67,-19
-            2802: 68,-19
-            2803: 69,-19
-            2804: 70,-19
-            2805: 71,-19
-            3041: 1,19
-            3042: 2,19
+            2190: -25,-32
+            2191: -23,-32
+            2192: -24,-32
+            2193: -22,-32
+            2194: -22,-32
+            2195: -21,-32
+            2196: -19,-32
+            2197: -19,-32
+            2198: -18,-32
+            2199: -18,-32
+            2265: -45,-5
+            2266: -46,-5
+            2267: -47,-5
+            2268: -48,-5
+            2269: -48,-5
+            2270: -50,-5
+            2271: -50,-5
+            2272: -49,-5
+            2273: -51,-5
+            2352: -51,-32
+            2357: -45,-32
+            2358: -44,-32
+            2410: -53,-48
+            2411: -52,-48
+            2412: -51,-48
+            2413: -50,-48
+            2414: -50,-48
+            2415: -49,-48
+            2416: -50,-48
+            2417: -50,-48
+            2418: -48,-48
+            2419: -48,-48
+            2420: -47,-48
+            2421: -47,-48
+            2422: -46,-48
+            2423: -45,-48
+            2424: -44,-48
+            2425: -43,-48
+            2475: -16,-32
+            2476: -14,-32
+            2477: -14,-32
+            2478: -14,-32
+            2479: -15,-32
+            2480: -14,-32
+            2481: -14,-32
+            2482: -13,-32
+            2483: -12,-32
+            2484: -12,-32
+            2485: -11,-32
+            2486: -11,-32
+            2487: -10,-32
+            2488: -10,-32
+            2489: -7,-32
+            2490: -6,-32
+            2491: -5,-32
+            2492: -5,-32
+            2496: -4,-32
+            2497: -3,-32
+            2498: -3,-32
+            2499: -3,-32
+            2500: -2,-32
+            2501: 3,-32
+            2502: 6,-32
+            2506: 8,-34
+            2507: 9,-34
+            2508: 9,-34
+            2509: 11,-34
+            2510: 11,-34
+            2511: 12,-34
+            2512: 12,-34
+            2513: 13,-34
+            2514: 13,-34
+            2515: 14,-34
+            2516: 15,-34
+            2517: 15,-34
+            2518: 16,-34
+            2576: 60,-21
+            2611: 38,2
+            2612: 36,2
+            2613: 37,2
+            2614: 38,2
+            2622: 34,2
+            2623: 33,2
+            2624: 32,2
+            2625: 31,2
+            2626: 31,2
+            2627: 27,2
+            2628: 26,2
+            2629: 26,2
+            2630: 25,2
+            2631: 24,2
+            2632: 23,2
+            2633: 23,2
+            2634: 21,2
+            2635: 21,2
+            2636: 22,2
+            2637: 20,2
+            2679: 18,19
+            2680: 16,19
+            2698: 14,19
+            2699: 13,19
+            2700: 12,19
+            2701: 11,19
+            2702: 10,19
+            2703: 10,19
+            2704: 9,19
+            2705: 9,19
+            2706: 8,19
+            2707: 6,19
+            2708: 6,19
+            2709: 7,19
+            2710: 5,19
+            2711: 0,19
+            2712: 0,19
+            2713: -1,19
+            2714: -1,19
+            2715: -2,19
+            2716: -3,19
+            2717: -3,19
+            2718: -4,19
+            2719: -5,19
+            2720: -6,19
+            2721: -6,19
+            2722: -7,19
+            2723: -7,19
+            2724: -8,19
+            2725: -8,19
+            2726: -8,19
+            2727: -11,19
+            2728: -11,19
+            2729: -13,19
+            2730: -13,19
+            2731: -14,19
+            2732: -12,19
+            2733: -16,19
+            2734: -16,19
+            2735: -18,19
+            2740: 66,-19
+            2741: 67,-19
+            2742: 68,-19
+            2743: 69,-19
+            2744: 70,-19
+            2745: 71,-19
+            2976: 1,19
+            2977: 2,19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineW
           decals:
-            2233: -26,-21
-            2234: -26,-20
-            2235: -26,-18
-            2236: -26,-19
-            2237: -26,-17
-            2242: -26,-25
-            2243: -26,-24
-            2244: -26,-27
-            2245: -26,-26
-            2246: -26,-28
-            2247: -26,-29
-            2248: -26,-30
-            2249: -26,-31
-            2295: -25,-8
-            2296: -26,-10
-            2297: -26,-11
-            2298: -26,-16
-            2299: -26,-15
-            2300: -26,-15
-            2301: -26,-14
-            2302: -26,-13
-            2316: -27,7
-            2317: -27,8
-            2318: -27,6
-            2319: -27,5
-            2348: -55,5
-            2349: -55,3
-            2350: -55,2
-            2351: -55,1
-            2352: -55,0
-            2353: -55,-1
-            2354: -55,-3
-            2355: -55,-6
-            2356: -55,-6
-            2357: -55,-7
-            2358: -55,-7
-            2359: -55,-8
-            2360: -55,-9
-            2361: -55,-9
-            2362: -55,-11
-            2371: -55,-10
-            2372: -55,-11
-            2373: -55,-12
-            2374: -55,-13
-            2375: -55,-13
-            2376: -55,-15
-            2377: -55,-15
-            2383: -55,-14
-            2388: -55,-16
-            2389: -55,-17
-            2390: -55,-18
-            2391: -55,-20
-            2392: -55,-21
-            2405: -52,-28
-            2406: -52,-29
-            2407: -52,-30
-            2408: -52,-30
-            2409: -52,-31
-            2410: -52,-32
-            2424: -49,-35
-            2425: -49,-36
-            2432: -49,-38
-            2433: -49,-38
-            2434: -49,-39
-            2435: -49,-40
-            2436: -49,-40
-            2437: -49,-41
-            2438: -49,-42
-            2439: -49,-43
-            2440: -49,-43
-            2441: -49,-44
-            2490: -42,-50
-            2491: -42,-50
-            2492: -42,-51
-            2493: -42,-51
-            2494: -42,-52
-            2495: -42,-52
-            2496: -42,-53
-            2497: -42,-54
-            2517: -56,-54
-            2518: -56,-53
-            2519: -56,-52
-            2520: -56,-52
-            2521: -56,-51
-            2522: -56,-51
-            2523: -56,-48
-            2524: -56,-48
-            2525: -56,-47
-            2526: -56,-50
-            2529: -41,-29
-            2530: -41,-28
-            2564: 7,-33
-            2582: 27,-23
-            2583: 27,-23
-            2584: 27,-23
-            2585: 27,-22
-            2586: 27,-24
-            2587: 27,-21
-            2588: 27,-20
-            2634: 57,-18
-            2635: 57,-17
-            2639: 52,-24
-            2640: 52,-23
-            2641: 52,-22
-            2647: 41,-17
-            2648: 41,-16
-            2649: 41,-15
-            2650: 41,-12
-            2651: 41,-11
-            2654: 41,-9
-            2655: 41,-8
-            2656: 41,-7
-            2657: 41,-7
-            2658: 41,-6
-            2659: 41,-5
-            2660: 41,-5
-            2661: 41,-4
-            2662: 41,-3
-            2663: 41,-3
-            2664: 41,-1
-            2665: 41,-1
-            2666: 41,-1
-            2667: 41,-2
-            2699: 19,3
-            2700: 19,4
-            2701: 19,4
-            2702: 19,4
-            2703: 19,5
-            2704: 19,5
-            2705: 19,7
-            2706: 19,8
-            2707: 19,8
-            2708: 19,8
-            2709: 19,10
-            2710: 19,10
-            2711: 19,11
-            2712: 19,10
-            2713: 19,10
-            2714: 19,12
-            2715: 19,10
-            2716: 19,9
-            2717: 19,9
-            2727: 19,13
-            2728: 19,14
-            2729: 19,14
-            2730: 19,14
-            2731: 19,15
-            2732: 19,15
-            2733: 19,15
-            2734: 19,16
-            2735: 19,16
-            2736: 19,18
-            2737: 19,18
-            2797: -27,20
-            2798: -27,18
+            2173: -26,-21
+            2174: -26,-20
+            2175: -26,-18
+            2176: -26,-19
+            2177: -26,-17
+            2182: -26,-25
+            2183: -26,-24
+            2184: -26,-27
+            2185: -26,-26
+            2186: -26,-28
+            2187: -26,-29
+            2188: -26,-30
+            2189: -26,-31
+            2235: -25,-8
+            2236: -26,-10
+            2237: -26,-11
+            2238: -26,-16
+            2239: -26,-15
+            2240: -26,-15
+            2241: -26,-14
+            2242: -26,-13
+            2256: -27,7
+            2257: -27,8
+            2258: -27,6
+            2259: -27,5
+            2288: -55,5
+            2289: -55,3
+            2290: -55,2
+            2291: -55,1
+            2292: -55,0
+            2293: -55,-1
+            2294: -55,-3
+            2295: -55,-6
+            2296: -55,-6
+            2297: -55,-7
+            2298: -55,-7
+            2299: -55,-8
+            2300: -55,-9
+            2301: -55,-9
+            2302: -55,-11
+            2311: -55,-10
+            2312: -55,-11
+            2313: -55,-12
+            2314: -55,-13
+            2315: -55,-13
+            2316: -55,-15
+            2317: -55,-15
+            2323: -55,-14
+            2328: -55,-16
+            2329: -55,-17
+            2330: -55,-18
+            2331: -55,-20
+            2332: -55,-21
+            2345: -52,-28
+            2346: -52,-29
+            2347: -52,-30
+            2348: -52,-30
+            2349: -52,-31
+            2350: -52,-32
+            2364: -49,-35
+            2365: -49,-36
+            2372: -49,-38
+            2373: -49,-38
+            2374: -49,-39
+            2375: -49,-40
+            2376: -49,-40
+            2377: -49,-41
+            2378: -49,-42
+            2379: -49,-43
+            2380: -49,-43
+            2381: -49,-44
+            2430: -42,-50
+            2431: -42,-50
+            2432: -42,-51
+            2433: -42,-51
+            2434: -42,-52
+            2435: -42,-52
+            2436: -42,-53
+            2437: -42,-54
+            2457: -56,-54
+            2458: -56,-53
+            2459: -56,-52
+            2460: -56,-52
+            2461: -56,-51
+            2462: -56,-51
+            2463: -56,-48
+            2464: -56,-48
+            2465: -56,-47
+            2466: -56,-50
+            2469: -41,-29
+            2470: -41,-28
+            2504: 7,-33
+            2522: 27,-23
+            2523: 27,-23
+            2524: 27,-23
+            2525: 27,-22
+            2526: 27,-24
+            2527: 27,-21
+            2528: 27,-20
+            2574: 57,-18
+            2575: 57,-17
+            2579: 52,-24
+            2580: 52,-23
+            2581: 52,-22
+            2587: 41,-17
+            2588: 41,-16
+            2589: 41,-15
+            2590: 41,-12
+            2591: 41,-11
+            2594: 41,-9
+            2595: 41,-8
+            2596: 41,-7
+            2597: 41,-7
+            2598: 41,-6
+            2599: 41,-5
+            2600: 41,-5
+            2601: 41,-4
+            2602: 41,-3
+            2603: 41,-3
+            2604: 41,-1
+            2605: 41,-1
+            2606: 41,-1
+            2607: 41,-2
+            2639: 19,3
+            2640: 19,4
+            2641: 19,4
+            2642: 19,4
+            2643: 19,5
+            2644: 19,5
+            2645: 19,7
+            2646: 19,8
+            2647: 19,8
+            2648: 19,8
+            2649: 19,10
+            2650: 19,10
+            2651: 19,11
+            2652: 19,10
+            2653: 19,10
+            2654: 19,12
+            2655: 19,10
+            2656: 19,9
+            2657: 19,9
+            2667: 19,13
+            2668: 19,14
+            2669: 19,14
+            2670: 19,14
+            2671: 19,15
+            2672: 19,15
+            2673: 19,15
+            2674: 19,16
+            2675: 19,16
+            2676: 19,18
+            2677: 19,18
+            2737: -27,20
+            2738: -27,18
         - node:
             color: '#52B4E996'
             id: MonoOverlay
           decals:
-            6228: 44,8
+            6072: 44,8
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale
           decals:
-            1035: 36,-36
+            1010: 36,-36
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale
           decals:
-            6230: 43,9
+            6074: 43,9
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale
           decals:
-            1523: -27,11
-            1524: -27,15
-            1525: -27,16
-            1526: -27,12
-            1527: -27,13
-            1528: -27,14
-            1634: -52,-26
-            1635: -52,-27
-            1636: -52,-25
-            1637: -52,-24
+            1473: -27,11
+            1474: -27,15
+            1475: -27,16
+            1476: -27,12
+            1477: -27,13
+            1478: -27,14
+            1584: -52,-26
+            1585: -52,-27
+            1586: -52,-25
+            1587: -52,-24
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale
           decals:
-            1548: -17,-30
-            1549: -16,-30
-            1550: -15,-30
-            1551: -14,-30
-            1552: -13,-30
-            1614: 5,-27
-            1615: 5,-28
-            1616: 5,-29
-            1617: 5,-30
-            1618: 3,-30
-            1619: 2,-30
-            1620: 1,-30
-            1621: 0,-30
-            1622: -1,-30
-            1623: -3,-30
-            1624: -2,-30
-            1625: -4,-30
-            1626: -5,-30
-            1627: -6,-30
-            1628: -7,-30
-            1629: -8,-30
-            1666: 6,21
-            1667: 5,21
-            1668: 2,21
-            1669: 1,21
-            1670: 0,21
-            1671: -1,21
-            1672: -4,21
-            1673: -5,21
-            1674: -6,21
-            1675: -7,21
-            1676: -8,21
-            1677: -11,21
-            1678: -12,21
-            1679: -13,21
-            1680: -14,21
-            1681: -15,21
-            1682: -16,21
-            1696: 28,4
-            1697: 27,4
-            1698: 23,4
-            1699: 22,4
-            1915: 57,-17
-            1916: 58,-17
-            1917: 59,-17
-            1918: 60,-17
-            1919: 61,-17
-            2148: -1,-33
-            6209: 38,4
-            6210: 40,4
-            6211: 41,4
-            6212: 42,4
-            6213: 43,4
+            1498: -17,-30
+            1499: -16,-30
+            1500: -15,-30
+            1501: -14,-30
+            1502: -13,-30
+            1564: 5,-27
+            1565: 5,-28
+            1566: 5,-29
+            1567: 5,-30
+            1568: 3,-30
+            1569: 2,-30
+            1570: 1,-30
+            1571: 0,-30
+            1572: -1,-30
+            1573: -3,-30
+            1574: -2,-30
+            1575: -4,-30
+            1576: -5,-30
+            1577: -6,-30
+            1578: -7,-30
+            1579: -8,-30
+            1616: 6,21
+            1617: 5,21
+            1618: 2,21
+            1619: 1,21
+            1620: 0,21
+            1621: -1,21
+            1622: -4,21
+            1623: -5,21
+            1624: -6,21
+            1625: -7,21
+            1626: -8,21
+            1627: -11,21
+            1628: -12,21
+            1629: -13,21
+            1630: -14,21
+            1631: -15,21
+            1632: -16,21
+            1646: 28,4
+            1647: 27,4
+            1648: 23,4
+            1649: 22,4
+            1855: 57,-17
+            1856: 58,-17
+            1857: 59,-17
+            1858: 60,-17
+            1859: 61,-17
+            2088: -1,-33
+            6053: 38,4
+            6054: 40,4
+            6055: 41,4
+            6056: 42,4
+            6057: 43,4
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
           decals:
-            1193: 6,30
-            1630: -51,-20
-            1631: -50,-20
-            1632: -49,-20
-            1633: -48,-20
+            1168: 6,30
+            1580: -51,-20
+            1581: -50,-20
+            1582: -49,-20
+            1583: -48,-20
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale
           decals:
-            1572: 12,-32
-            1573: 11,-32
-            1574: 13,-32
-            1575: 14,-32
-            1576: 15,-32
-            1577: 16,-32
-            1578: 17,-32
-            1579: 19,-32
-            1580: 19,-30
-            1581: 19,-29
-            1582: 19,-27
-            1583: 19,-26
-            1584: 19,-25
-            1585: 20,-25
-            1586: 21,-25
-            1587: 22,-25
-            1588: 23,-25
-            1589: 24,-25
-            1601: 19,-31
+            1522: 12,-32
+            1523: 11,-32
+            1524: 13,-32
+            1525: 14,-32
+            1526: 15,-32
+            1527: 16,-32
+            1528: 17,-32
+            1529: 19,-32
+            1530: 19,-30
+            1531: 19,-29
+            1532: 19,-27
+            1533: 19,-26
+            1534: 19,-25
+            1535: 20,-25
+            1536: 21,-25
+            1537: 22,-25
+            1538: 23,-25
+            1539: 24,-25
+            1551: 19,-31
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1708: 37,-21
-            1709: 50,-21
-            1710: 34,-21
-            1711: 36,-21
-            1712: 35,-21
-            1925: 51,-21
-            2021: 29,-21
-            2022: 29,-22
-            2023: 29,-23
-            2024: 29,-24
-            2025: 29,-25
-            2026: 29,-26
-            2027: 29,-27
-            2028: 28,-27
-            2029: 27,-27
-            2030: 26,-27
-            2031: 25,-27
-            2032: 24,-27
-            2033: 23,-27
-            2034: 21,-27
-            2035: 21,-29
-            2036: 21,-30
-            2037: 21,-31
-            2038: 21,-32
-            2039: 21,-33
-            2040: 21,-34
-            2041: 20,-34
-            2042: 19,-34
+            1658: 37,-21
+            1659: 50,-21
+            1660: 34,-21
+            1661: 36,-21
+            1662: 35,-21
+            1865: 51,-21
+            1961: 29,-21
+            1962: 29,-22
+            1963: 29,-23
+            1964: 29,-24
+            1965: 29,-25
+            1966: 29,-26
+            1967: 29,-27
+            1968: 28,-27
+            1969: 27,-27
+            1970: 26,-27
+            1971: 25,-27
+            1972: 24,-27
+            1973: 23,-27
+            1974: 21,-27
+            1975: 21,-29
+            1976: 21,-30
+            1977: 21,-31
+            1978: 21,-32
+            1979: 21,-33
+            1980: 21,-34
+            1981: 20,-34
+            1982: 19,-34
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
-            6231: 45,7
+            6075: 45,7
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1536: -25,11
-            1537: -25,12
-            1538: -25,13
-            1539: -25,14
-            1540: -25,15
-            1541: -25,16
-            1542: -25,17
-            1700: 21,5
-            1701: 21,7
-            1702: 21,8
-            1703: 21,9
-            1704: 21,16
-            1705: 21,18
-            1706: 21,19
-            1707: 21,20
-            1920: 61,-17
-            1921: 61,-18
-            1922: 61,-19
-            1923: 61,-20
-            2144: -1,-33
-            2145: 0,-33
-            2146: 1,-33
-            2147: 2,-33
-            6214: 43,4
-            6215: 43,3
-            6216: 43,2
-            6217: 43,1
-            6218: 43,-1
-            6219: 43,-2
-            6220: 43,-3
-            6221: 43,-4
-            6222: 43,-5
-            6223: 43,-6
-            6224: 43,-7
-            6225: 43,-8
-            6226: 43,-9
-            6227: 43,-10
+            1486: -25,11
+            1487: -25,12
+            1488: -25,13
+            1489: -25,14
+            1490: -25,15
+            1491: -25,16
+            1492: -25,17
+            1650: 21,5
+            1651: 21,7
+            1652: 21,8
+            1653: 21,9
+            1654: 21,16
+            1655: 21,18
+            1656: 21,19
+            1657: 21,20
+            1860: 61,-17
+            1861: 61,-18
+            1862: 61,-19
+            1863: 61,-20
+            2084: -1,-33
+            2085: 0,-33
+            2086: 1,-33
+            2087: 2,-33
+            6058: 43,4
+            6059: 43,3
+            6060: 43,2
+            6061: 43,1
+            6062: 43,-1
+            6063: 43,-2
+            6064: 43,-3
+            6065: 43,-4
+            6066: 43,-5
+            6067: 43,-6
+            6068: 43,-7
+            6069: 43,-8
+            6070: 43,-9
+            6071: 43,-10
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1194: 3,32
+            1169: 3,32
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1568: 9,-27
-            1569: 9,-29
-            1570: 9,-30
-            1571: 9,-31
+            1518: 9,-27
+            1519: 9,-29
+            1520: 9,-30
+            1521: 9,-31
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1595: 19,-25
-            1596: 19,-26
-            1597: 19,-27
-            1598: 19,-29
-            1599: 19,-30
-            6232: 43,7
+            1545: 19,-25
+            1546: 19,-26
+            1547: 19,-27
+            1548: 19,-29
+            1549: 19,-30
+            6076: 43,7
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1529: -27,11
-            1530: -27,12
-            1531: -27,13
-            1532: -27,14
-            1533: -27,15
-            1534: -27,16
-            1535: -27,17
-            1600: 19,-31
-            1638: -52,-27
-            1639: -52,-26
-            1640: -52,-25
-            1641: -52,-24
-            1642: -52,-23
-            1713: 34,-21
-            1714: 35,-21
-            1715: 36,-21
-            1716: 37,-21
-            1717: 50,-21
-            1926: 51,-21
-            2043: 19,-34
-            2044: 20,-34
-            2045: 21,-34
-            2052: 23,-27
-            2053: 24,-27
-            2054: 25,-27
-            2055: 26,-27
-            2056: 27,-27
-            2057: 28,-27
-            2058: 29,-27
+            1479: -27,11
+            1480: -27,12
+            1481: -27,13
+            1482: -27,14
+            1483: -27,15
+            1484: -27,16
+            1485: -27,17
+            1550: 19,-31
+            1588: -52,-27
+            1589: -52,-26
+            1590: -52,-25
+            1591: -52,-24
+            1592: -52,-23
+            1663: 34,-21
+            1664: 35,-21
+            1665: 36,-21
+            1666: 37,-21
+            1667: 50,-21
+            1866: 51,-21
+            1983: 19,-34
+            1984: 20,-34
+            1985: 21,-34
+            1992: 23,-27
+            1993: 24,-27
+            1994: 25,-27
+            1995: 26,-27
+            1996: 27,-27
+            1997: 28,-27
+            1998: 29,-27
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1191: 6,32
+            1166: 6,32
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1565: 5,-29
-            1566: 5,-28
-            1567: 5,-27
-            2139: -1,-33
-            2140: 1,-33
-            2141: 0,-33
-            2142: 2,-33
+            1515: 5,-29
+            1516: 5,-28
+            1517: 5,-27
+            2079: -1,-33
+            2080: 1,-33
+            2081: 0,-33
+            2082: 2,-33
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1036: 44,-36
+            1011: 44,-36
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1590: 19,-25
-            1591: 20,-25
-            1592: 21,-25
-            1593: 22,-25
-            1594: 23,-25
-            6191: 40,4
-            6192: 38,4
-            6193: 41,4
-            6194: 42,4
-            6195: 43,4
-            6196: 43,3
-            6197: 43,2
-            6198: 43,1
-            6199: 43,-1
-            6200: 43,-2
-            6201: 43,-3
-            6202: 43,-4
-            6203: 43,-5
-            6204: 43,-6
-            6205: 43,-7
-            6206: 43,-10
-            6207: 43,-9
-            6208: 43,-8
-            6229: 45,9
+            1540: 19,-25
+            1541: 20,-25
+            1542: 21,-25
+            1543: 22,-25
+            1544: 23,-25
+            6035: 40,4
+            6036: 38,4
+            6037: 41,4
+            6038: 42,4
+            6039: 43,4
+            6040: 43,3
+            6041: 43,2
+            6042: 43,1
+            6043: 43,-1
+            6044: 43,-2
+            6045: 43,-3
+            6046: 43,-4
+            6047: 43,-5
+            6048: 43,-6
+            6049: 43,-7
+            6050: 43,-10
+            6051: 43,-9
+            6052: 43,-8
+            6073: 45,9
         - node:
             color: '#79150096'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1517: -25,11
-            1518: -25,12
-            1519: -25,13
-            1520: -25,15
-            1521: -25,14
-            1522: -25,16
+            1467: -25,11
+            1468: -25,12
+            1469: -25,13
+            1470: -25,15
+            1471: -25,14
+            1472: -25,16
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1543: -16,-30
-            1544: -15,-30
-            1545: -14,-30
-            1546: -13,-30
-            1547: -17,-30
+            1493: -16,-30
+            1494: -15,-30
+            1495: -14,-30
+            1496: -13,-30
+            1497: -17,-30
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1683: 21,20
-            1684: 21,19
-            1685: 21,18
-            1686: 21,16
-            1687: 21,9
-            1688: 21,8
-            1689: 21,7
-            1690: 21,5
-            1691: 21,4
-            1692: 22,4
-            1693: 23,4
-            1694: 27,4
-            1695: 28,4
+            1633: 21,20
+            1634: 21,19
+            1635: 21,18
+            1636: 21,16
+            1637: 21,9
+            1638: 21,8
+            1639: 21,7
+            1640: 21,5
+            1641: 21,4
+            1642: 22,4
+            1643: 23,4
+            1644: 27,4
+            1645: 28,4
         - node:
             color: '#D381C996'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1908: 61,-17
-            1909: 60,-17
-            1910: 59,-17
-            1911: 58,-17
-            1912: 61,-18
-            1913: 61,-19
-            1914: 61,-20
-            1924: 57,-17
+            1848: 61,-17
+            1849: 60,-17
+            1850: 59,-17
+            1851: 58,-17
+            1852: 61,-18
+            1853: 61,-19
+            1854: 61,-20
+            1864: 57,-17
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1602: 17,-32
-            1603: 16,-32
-            1604: 15,-32
-            1605: 14,-32
-            1606: 13,-32
-            1607: 12,-32
-            1608: 11,-32
-            1609: 9,-32
-            1610: 9,-31
-            1611: 9,-30
-            1612: 9,-29
-            1613: 9,-27
-            1643: -51,-20
-            1644: -50,-20
-            1645: -49,-20
-            1646: -48,-20
-            1647: -52,-20
-            1648: -62,-22
-            2046: 21,-34
-            2047: 21,-33
-            2048: 21,-32
-            2049: 21,-31
-            2050: 21,-30
-            2051: 21,-29
-            2059: 29,-27
-            2060: 29,-26
-            2061: 29,-25
-            2062: 29,-24
-            2063: 29,-23
-            2064: 29,-22
+            1552: 17,-32
+            1553: 16,-32
+            1554: 15,-32
+            1555: 14,-32
+            1556: 13,-32
+            1557: 12,-32
+            1558: 11,-32
+            1559: 9,-32
+            1560: 9,-31
+            1561: 9,-30
+            1562: 9,-29
+            1563: 9,-27
+            1593: -51,-20
+            1594: -50,-20
+            1595: -49,-20
+            1596: -48,-20
+            1597: -52,-20
+            1598: -62,-22
+            1986: 21,-34
+            1987: 21,-33
+            1988: 21,-32
+            1989: 21,-31
+            1990: 21,-30
+            1991: 21,-29
+            1999: 29,-27
+            2000: 29,-26
+            2001: 29,-25
+            2002: 29,-24
+            2003: 29,-23
+            2004: 29,-22
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1192: 3,30
-            1649: -16,21
-            1650: -15,21
-            1651: -14,21
-            1652: -13,21
-            1653: -12,21
-            1654: -11,21
-            1655: -8,21
-            1656: -7,21
-            1657: -6,21
-            1658: -5,21
-            1659: -4,21
-            1660: -1,21
-            1661: 0,21
-            1662: 1,21
-            1663: 2,21
-            1664: 5,21
-            1665: 6,21
+            1167: 3,30
+            1599: -16,21
+            1600: -15,21
+            1601: -14,21
+            1602: -13,21
+            1603: -12,21
+            1604: -11,21
+            1605: -8,21
+            1606: -7,21
+            1607: -6,21
+            1608: -5,21
+            1609: -4,21
+            1610: -1,21
+            1611: 0,21
+            1612: 1,21
+            1613: 2,21
+            1614: 5,21
+            1615: 6,21
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1553: -8,-30
-            1554: -7,-30
-            1555: -6,-30
-            1556: -5,-30
-            1557: -4,-30
-            1558: -3,-30
-            1559: -2,-30
-            1560: 0,-30
-            1561: -1,-30
-            1562: 1,-30
-            1563: 2,-30
-            1564: 3,-30
-            2143: 2,-33
+            1503: -8,-30
+            1504: -7,-30
+            1505: -6,-30
+            1506: -5,-30
+            1507: -4,-30
+            1508: -3,-30
+            1509: -2,-30
+            1510: 0,-30
+            1511: -1,-30
+            1512: 1,-30
+            1513: 2,-30
+            1514: 3,-30
+            2083: 2,-33
         - node:
             color: '#FFFFFFFF'
             id: Rock01
           decals:
-            1494: -52,-49
+            1444: -52,-49
         - node:
             color: '#FFFFFFFF'
             id: Rock03
           decals:
-            904: -49,-9
-            1495: -47,-49
+            879: -49,-9
+            1445: -47,-49
         - node:
             color: '#FFFFFFFF'
             id: Rock04
           decals:
-            882: -47,4
+            857: -47,4
         - node:
             color: '#FFFFFFFF'
             id: Rock05
           decals:
-            881: -49,-2
+            856: -49,-2
         - node:
             color: '#FFFFFFFF'
             id: Rock06
           decals:
-            884: -51,4
-            906: -46,-7
-            1497: -46,-49
-            1730: 58,19
+            859: -51,4
+            881: -46,-7
+            1447: -46,-49
+            1680: 58,19
         - node:
             color: '#FFFFFFFF'
             id: Rock07
           decals:
-            883: -46,-2
-            905: -50,-8
-            1496: -51,-49
-            1731: 61,19
+            858: -46,-2
+            880: -50,-8
+            1446: -51,-49
+            1681: 61,19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Rust
           decals:
-            2931: -5,-39
-            2932: -7,-40
-            2933: -6,-41
-            2934: -7,-41
-            2935: -8,-39
-            2936: -8,-42
+            2871: -5,-39
+            2872: -7,-40
+            2873: -6,-41
+            2874: -7,-41
+            2875: -8,-39
+            2876: -8,-42
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign1
@@ -8202,11 +8218,17 @@ entities:
             id: SpaceStationSign7
           decals:
             487: -31,0
+        - node:
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            6973: 57.998478,-4.7559896
+            6974: 60.004295,-4.7682204
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            1141: -3,24
+            1116: -3,24
         - node:
             color: '#EFB34196'
             id: ThreeQuarterTileOverlayGreyscale
@@ -8216,7 +8238,7 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            1140: -2,23
+            1115: -2,23
         - node:
             color: '#EFB34196'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -8226,7 +8248,7 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            1139: -3,23
+            1114: -3,23
         - node:
             color: '#EFB34196'
             id: ThreeQuarterTileOverlayGreyscale270
@@ -8236,7 +8258,7 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            1138: -2,24
+            1113: -2,24
         - node:
             color: '#EFB34196'
             id: ThreeQuarterTileOverlayGreyscale90
@@ -8246,19 +8268,19 @@ entities:
             color: '#FFFFFFB1'
             id: VentSmall
           decals:
-            2865: -36,22
+            2805: -36,22
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNE
           decals:
-            1182: 6,32
-            6543: 91,-13
+            1157: 6,32
+            6387: 91,-13
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
-            1181: 3,32
-            6544: 88,-13
+            1156: 3,32
+            6388: 88,-13
         - node:
             color: '#EFB34196'
             id: WarnCornerSE
@@ -8268,7 +8290,7 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            6542: 91,-16
+            6386: 91,-16
         - node:
             color: '#EFB34196'
             id: WarnCornerSW
@@ -8278,48 +8300,49 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
-            6541: 88,-16
+            6385: 88,-16
+            6897: 46,15
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallGreyscaleNE
           decals:
-            7089: -35,12
+            6810: -35,12
         - node:
             color: '#52B4E996'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            6699: 49,-11
-            6700: 52,-11
+            6543: 49,-11
+            6544: 52,-11
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            7088: -35,16
+            6809: -35,16
         - node:
             color: '#52B4E996'
             id: WarnCornerSmallGreyscaleSW
           decals:
-            6697: 49,-11
-            6698: 52,-11
+            6541: 49,-11
+            6542: 52,-11
         - node:
             color: '#EFB34118'
             id: WarnCornerSmallNE
           decals:
-            6621: 12,-30
-            6622: 12,-30
+            6465: 12,-30
+            6466: 12,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNE
           decals:
-            6768: 14,39
-            6769: 14,39
-            6770: 14,39
-            6771: 14,39
+            6610: 14,39
+            6611: 14,39
+            6612: 14,39
+            6613: 14,39
         - node:
             color: '#EFB3416C'
             id: WarnCornerSmallNE
           decals:
-            6620: 12,-30
+            6464: 12,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNE
@@ -8329,30 +8352,32 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNE
           decals:
-            1315: 25,23
-            1316: 29,23
-            2073: 11,-47
-            6278: 51,13
-            6366: 51,-11
+            1290: 25,23
+            1291: 29,23
+            2013: 11,-47
+            6122: 51,13
+            6210: 51,-11
+            6900: 46,15
+            6998: 57,-5
         - node:
             color: '#EFB34118'
             id: WarnCornerSmallNW
           decals:
-            6623: 16,-30
-            6624: 16,-30
+            6467: 16,-30
+            6468: 16,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNW
           decals:
-            6764: 16,39
-            6765: 16,39
-            6766: 16,39
-            6767: 16,39
+            6606: 16,39
+            6607: 16,39
+            6608: 16,39
+            6609: 16,39
         - node:
             color: '#EFB3416C'
             id: WarnCornerSmallNW
           decals:
-            6619: 16,-30
+            6463: 16,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNW
@@ -8363,18 +8388,19 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNW
           decals:
-            1080: 39,-1
-            1317: 25,23
-            1318: 29,23
-            2074: 14,-47
+            1055: 39,-1
+            1292: 25,23
+            1293: 29,23
+            2014: 14,-47
+            6977: 61,-5
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallSE
           decals:
-            6760: 14,42
-            6761: 14,42
-            6762: 14,42
-            6763: 14,42
+            6602: 14,42
+            6603: 14,42
+            6604: 14,42
+            6605: 14,42
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallSE
@@ -8387,16 +8413,16 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSE
           decals:
-            1437: 55,-33
-            6277: 51,15
+            1412: 55,-33
+            6121: 51,15
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallSW
           decals:
-            6756: 16,42
-            6757: 16,42
-            6758: 16,42
-            6759: 16,42
+            6598: 16,42
+            6599: 16,42
+            6600: 16,42
+            6601: 16,42
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallSW
@@ -8407,14 +8433,14 @@ entities:
             color: '#EFB34131'
             id: WarnLineE
           decals:
-            6732: 14,40
-            6733: 14,40
-            6734: 14,41
-            6735: 14,41
-            6744: 14,40
-            6745: 14,40
-            6746: 14,41
-            6747: 14,41
+            6574: 14,40
+            6575: 14,40
+            6576: 14,41
+            6577: 14,41
+            6586: 14,40
+            6587: 14,40
+            6588: 14,41
+            6589: 14,41
         - node:
             color: '#EFB34196'
             id: WarnLineE
@@ -8442,78 +8468,93 @@ entities:
             279: 29,-13
             280: 29,-12
             281: 29,-11
-            6175: 47,14
-            6176: 47,14
-            6177: 47,15
-            6178: 47,15
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            1183: 6,31
-            1184: 6,30
-            1432: 55,-36
-            1433: 55,-34
-            1434: 55,-35
-            1850: 73,-14
-            1851: 73,-15
-            1852: 73,-17
-            1853: 73,-16
-            1854: 73,-18
-            1855: 73,-19
-            6141: -45,23
-            6275: 51,14
-            6365: 51,-10
-            6539: 91,-15
-            6540: 91,-14
-            6667: -33,-11
-            6668: -33,-10
+            1158: 6,31
+            1159: 6,30
+            1407: 55,-36
+            1408: 55,-34
+            1409: 55,-35
+            1790: 73,-14
+            1791: 73,-15
+            1792: 73,-17
+            1793: 73,-16
+            1794: 73,-18
+            1795: 73,-19
+            6013: -45,23
+            6119: 51,14
+            6209: 51,-10
+            6383: 91,-15
+            6384: 91,-14
+            6511: -33,-11
+            6512: -33,-10
+            6898: 46,16
+            6997: 57,-4
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleE
           decals:
-            6367: 52,-12
-            6368: 52,-13
-            6369: 52,-14
-            6370: 52,-15
-            6371: 49,-12
-            6372: 49,-13
-            6373: 49,-14
-            6374: 49,-15
+            6211: 52,-12
+            6212: 52,-13
+            6213: 52,-14
+            6214: 52,-15
+            6215: 49,-12
+            6216: 49,-13
+            6217: 49,-14
+            6218: 49,-15
+        - node:
+            color: '#EFB34196'
+            id: WarnLineGreyscaleN
+          decals:
+            6910: 42,13
+            6911: 46,13
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleN
           decals:
-            7082: -34,12
-            7083: -33,12
-            7084: -31,12
-            7085: -30,12
+            6803: -34,12
+            6804: -33,12
+            6805: -31,12
+            6806: -30,12
+        - node:
+            color: '#52B4E996'
+            id: WarnLineGreyscaleS
+          decals:
+            6993: 59,-8
+        - node:
+            color: '#EFB34196'
+            id: WarnLineGreyscaleS
+          decals:
+            6908: 42,13
+            6909: 46,13
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
           decals:
-            7086: -34,16
-            7087: -33,16
+            6807: -34,16
+            6808: -33,16
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleW
           decals:
-            6375: 49,-15
-            6376: 49,-14
-            6377: 49,-13
-            6378: 49,-12
-            6379: 52,-12
-            6380: 52,-13
-            6381: 52,-14
-            6382: 52,-15
+            6219: 49,-15
+            6220: 49,-14
+            6221: 49,-13
+            6222: 49,-12
+            6223: 52,-12
+            6224: 52,-13
+            6225: 52,-14
+            6226: 52,-15
         - node:
             color: '#EFB34131'
             id: WarnLineN
           decals:
-            6752: 15,42
-            6753: 15,42
-            6754: 15,42
-            6755: 15,42
+            6594: 15,42
+            6595: 15,42
+            6596: 15,42
+            6597: 15,42
         - node:
             color: '#EFB34196'
             id: WarnLineN
@@ -8531,52 +8572,50 @@ entities:
             271: 26,-14
             272: 27,-14
             273: 28,-14
-            1472: 46,14
-            6165: 46,14
-            6166: 46,14
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            1435: 56,-33
-            1436: 57,-33
-            1895: 69,-30
-            1896: 68,-30
-            1897: 70,-30
-            1898: 71,-30
-            1968: 23,-38
-            1969: 24,-38
-            1970: 25,-38
-            2065: 11,-48
-            2066: 12,-48
-            2067: 14,-48
-            2068: 13,-48
-            2069: 15,-48
-            2070: 16,-48
-            2122: 0,-38
-            2123: 1,-38
-            2124: 2,-38
-            6138: -44,24
-            6533: 89,-16
-            6534: 90,-16
-            6797: 33,-14
-            6798: 34,-14
-            6799: 35,-14
-            6841: 7,-47
-            6842: 8,-47
-            6843: 9,-47
+            1410: 56,-33
+            1411: 57,-33
+            1835: 69,-30
+            1836: 68,-30
+            1837: 70,-30
+            1838: 71,-30
+            1908: 23,-38
+            1909: 24,-38
+            1910: 25,-38
+            2005: 11,-48
+            2006: 12,-48
+            2007: 14,-48
+            2008: 13,-48
+            2009: 15,-48
+            2010: 16,-48
+            2062: 0,-38
+            2063: 1,-38
+            2064: 2,-38
+            6010: -44,24
+            6377: 89,-16
+            6378: 90,-16
+            6639: 33,-14
+            6640: 34,-14
+            6641: 35,-14
+            6683: 7,-47
+            6684: 8,-47
+            6685: 9,-47
+            6896: 47,15
         - node:
             color: '#EFB34131'
             id: WarnLineS
           decals:
-            6736: 16,40
-            6737: 16,40
-            6738: 16,41
-            6739: 16,41
-            6740: 16,41
-            6741: 16,40
-            6742: 16,41
-            6743: 16,40
+            6578: 16,40
+            6579: 16,40
+            6580: 16,41
+            6581: 16,41
+            6582: 16,41
+            6583: 16,40
+            6584: 16,41
+            6585: 16,40
         - node:
             color: '#EFB34196'
             id: WarnLineS
@@ -8604,51 +8643,47 @@ entities:
             275: 16,-11
             276: 16,-10
             277: 16,-9
-            6169: 45,16
-            6170: 45,15
-            6171: 45,14
-            6172: 45,14
-            6173: 45,15
-            6174: 45,16
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            1769: 61,-24
-            1782: 61,-23
-            1996: 26,-43
-            1997: 26,-46
-            6139: -43,23
-            6276: 57,14
-            6537: 88,-15
-            6538: 88,-14
-            6665: -33,-10
-            6666: -33,-11
+            1709: 61,-24
+            1722: 61,-23
+            1936: 26,-43
+            1937: 26,-46
+            6011: -43,23
+            6120: 57,14
+            6381: 88,-15
+            6382: 88,-14
+            6509: -33,-10
+            6510: -33,-11
+            6895: 46,16
+            6976: 61,-4
         - node:
             color: '#EFB34118'
             id: WarnLineW
           decals:
-            6625: 13,-30
-            6626: 13,-30
-            6627: 14,-30
-            6628: 14,-30
-            6629: 15,-30
-            6630: 15,-30
+            6469: 13,-30
+            6470: 13,-30
+            6471: 14,-30
+            6472: 14,-30
+            6473: 15,-30
+            6474: 15,-30
         - node:
             color: '#EFB34131'
             id: WarnLineW
           decals:
-            6748: 15,39
-            6749: 15,39
-            6750: 15,39
-            6751: 15,39
+            6590: 15,39
+            6591: 15,39
+            6592: 15,39
+            6593: 15,39
         - node:
             color: '#EFB3416C'
             id: WarnLineW
           decals:
-            6616: 13,-30
-            6617: 14,-30
-            6618: 15,-30
+            6460: 13,-30
+            6461: 14,-30
+            6462: 15,-30
         - node:
             color: '#EFB34196'
             id: WarnLineW
@@ -8665,64 +8700,66 @@ entities:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            1069: 36,-1
-            1070: 37,-1
-            1079: 38,-1
-            1179: 4,32
-            1180: 5,32
-            1309: 30,23
-            1310: 31,23
-            1311: 23,23
-            1312: 24,23
-            1313: 26,23
-            1314: 28,23
-            1800: 68,-11
-            1801: 69,-11
-            1802: 70,-11
-            1891: 68,-29
-            1892: 70,-29
-            1893: 69,-29
-            1894: 71,-29
-            1965: 23,-37
-            1966: 25,-37
-            1967: 24,-37
-            2016: 28,-38
-            2017: 29,-38
-            2071: 12,-47
-            2072: 13,-47
-            2132: 9,-39
-            2133: 10,-39
-            2134: 8,-39
-            2135: 11,-39
-            2149: -5,-35
-            2163: -6,-35
-            2164: -4,-35
-            6140: -44,22
-            6363: 52,-11
-            6364: 53,-11
-            6535: 89,-13
-            6536: 90,-13
-            6800: 33,-11
-            6801: 34,-11
-            6802: 35,-11
+            1044: 36,-1
+            1045: 37,-1
+            1054: 38,-1
+            1154: 4,32
+            1155: 5,32
+            1284: 30,23
+            1285: 31,23
+            1286: 23,23
+            1287: 24,23
+            1288: 26,23
+            1289: 28,23
+            1740: 68,-11
+            1741: 69,-11
+            1742: 70,-11
+            1831: 68,-29
+            1832: 70,-29
+            1833: 69,-29
+            1834: 71,-29
+            1905: 23,-37
+            1906: 25,-37
+            1907: 24,-37
+            1956: 28,-38
+            1957: 29,-38
+            2011: 12,-47
+            2012: 13,-47
+            2072: 9,-39
+            2073: 10,-39
+            2074: 8,-39
+            2075: 11,-39
+            2089: -5,-35
+            2103: -6,-35
+            2104: -4,-35
+            6012: -44,22
+            6207: 52,-11
+            6208: 53,-11
+            6379: 89,-13
+            6380: 90,-13
+            6642: 33,-11
+            6643: 34,-11
+            6644: 35,-11
+            6899: 47,15
+            6975: 59,-5
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinBox
           decals:
-            6137: -44,23
+            6009: -44,23
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
           decals:
             402: -18,-13
-            996: 44,-29
+            971: 44,-29
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNw
           decals:
             379: -22,7
-            995: 40,-29
-            6810: -19,-13
+            970: 40,-29
+            6652: -19,-13
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSe
@@ -8746,11 +8783,11 @@ entities:
             462: -30,-5
             463: -40,-5
             521: -38,3
-            655: -39,-16
-            858: -52,5
-            1178: -15,31
-            1733: 60,18
-            6863: 76,-25
+            630: -39,-16
+            833: -52,5
+            1153: -15,31
+            1683: 60,18
+            6705: 76,-25
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerNw
@@ -8760,10 +8797,10 @@ entities:
             460: -30,-5
             520: -30,3
             522: -25,-5
-            856: -43,-1
-            857: -43,5
-            1097: -59,-29
-            6862: 80,-25
+            831: -43,-1
+            832: -43,5
+            1072: -59,-29
+            6704: 80,-25
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSe
@@ -8771,25 +8808,25 @@ entities:
             344: 43,-25
             363: -24,8
             384: -22,-1
-            654: -39,-13
-            855: -52,-3
-            6820: -22,-20
-            6821: -20,-20
+            629: -39,-13
+            830: -52,-3
+            6662: -22,-20
+            6663: -20,-20
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSw
           decals:
-            577: -28,14
-            597: -37,-18
-            853: -43,3
-            854: -43,-3
-            963: -50.00212,-30.877844
-            964: -45.158802,-30.877844
-            965: -45.158802,-25.282345
-            966: -50.020466,-25.282345
-            1096: -59,-25
-            6818: -20,-20
-            6819: -18,-20
+            564: -28,14
+            572: -37,-18
+            828: -43,3
+            829: -43,-3
+            938: -50.00212,-30.877844
+            939: -45.158802,-30.877844
+            940: -45.158802,-25.282345
+            941: -50.020466,-25.282345
+            1071: -59,-25
+            6660: -20,-20
+            6661: -18,-20
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineE
@@ -8821,35 +8858,35 @@ entities:
             513: -38,4
             544: -19,17
             545: -19,21
-            641: -39,-15
-            642: -39,-14
-            953: -46,-26
-            954: -46,-27
-            955: -46,-28
-            956: -46,-29
-            957: -46,-30
-            958: -46,-31
-            978: 36,-31
-            979: 36,-30
-            980: 36,-29
-            1002: 44,-31
-            1003: 44,-30
-            1172: -15,32
-            1173: -15,33
-            1174: -15,34
-            1328: 33,15
-            1376: 33,12
-            1377: 33,13
-            1378: 33,14
-            1732: 60,19
-            1870: 69,-24
-            1871: 69,-23
-            1872: 69,-22
-            1873: 69,-21
-            6812: -20,-21
-            6814: -22,-21
-            6858: 76,-24
-            6859: 76,-23
+            616: -39,-15
+            617: -39,-14
+            928: -46,-26
+            929: -46,-27
+            930: -46,-28
+            931: -46,-29
+            932: -46,-30
+            933: -46,-31
+            953: 36,-31
+            954: 36,-30
+            955: 36,-29
+            977: 44,-31
+            978: 44,-30
+            1147: -15,32
+            1148: -15,33
+            1149: -15,34
+            1303: 33,15
+            1351: 33,12
+            1352: 33,13
+            1353: 33,14
+            1682: 60,19
+            1810: 69,-24
+            1811: 69,-23
+            1812: 69,-22
+            1813: 69,-21
+            6654: -20,-21
+            6656: -22,-21
+            6700: 76,-24
+            6701: 76,-23
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
@@ -8887,68 +8924,68 @@ entities:
             517: -34,3
             518: -32,3
             519: -31,3
-            630: -38,-16
-            631: -37,-16
-            632: -36,-16
-            633: -35,-16
-            634: -34,-16
-            635: -33,-16
-            636: -32,-16
-            637: -31,-16
-            638: -29,-16
-            639: -30,-16
-            640: -28,-16
-            749: -40,-33
-            750: -39,-33
-            751: -30,-33
-            752: -29,-33
-            757: -26,-40
-            758: -25,-40
-            759: -24,-40
-            760: -23,-40
-            761: -21,-40
-            762: -22,-40
-            763: -20,-40
-            764: -20,-40
-            773: -19,-40
-            774: -26,-36
-            775: -23,-36
-            776: -20,-36
-            777: -19,-36
-            784: -27,-40
-            785: -28,-40
-            786: -29,-40
-            814: -51,-1
-            815: -50,-1
-            816: -49,-1
-            817: -48,-1
-            818: -47,-1
-            819: -45,-1
-            820: -45,-1
-            821: -46,-1
-            822: -44,-1
-            823: -44,5
-            824: -46,5
-            825: -46,5
-            826: -45,5
-            827: -45,5
-            828: -47,5
-            829: -48,5
-            830: -48,5
-            831: -49,5
-            832: -50,5
-            833: -50,5
-            834: -51,5
-            997: 41,-29
-            998: 42,-29
-            999: 43,-29
-            1091: -61,-29
-            1092: -60,-29
-            1175: -14,31
-            1176: -13,31
-            1177: -12,31
-            6076: -35,3
-            6135: 36,-24
+            605: -38,-16
+            606: -37,-16
+            607: -36,-16
+            608: -35,-16
+            609: -34,-16
+            610: -33,-16
+            611: -32,-16
+            612: -31,-16
+            613: -29,-16
+            614: -30,-16
+            615: -28,-16
+            724: -40,-33
+            725: -39,-33
+            726: -30,-33
+            727: -29,-33
+            732: -26,-40
+            733: -25,-40
+            734: -24,-40
+            735: -23,-40
+            736: -21,-40
+            737: -22,-40
+            738: -20,-40
+            739: -20,-40
+            748: -19,-40
+            749: -26,-36
+            750: -23,-36
+            751: -20,-36
+            752: -19,-36
+            759: -27,-40
+            760: -28,-40
+            761: -29,-40
+            789: -51,-1
+            790: -50,-1
+            791: -49,-1
+            792: -48,-1
+            793: -47,-1
+            794: -45,-1
+            795: -45,-1
+            796: -46,-1
+            797: -44,-1
+            798: -44,5
+            799: -46,5
+            800: -46,5
+            801: -45,5
+            802: -45,5
+            803: -47,5
+            804: -48,5
+            805: -48,5
+            806: -49,5
+            807: -50,5
+            808: -50,5
+            809: -51,5
+            972: 41,-29
+            973: 42,-29
+            974: 43,-29
+            1066: -61,-29
+            1067: -60,-29
+            1150: -14,31
+            1151: -13,31
+            1152: -12,31
+            5948: -35,3
+            6007: 36,-24
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineS
@@ -8966,78 +9003,78 @@ entities:
             503: -35,5
             504: -34,5
             505: -33,5
-            594: -40,-18
-            595: -39,-18
-            596: -38,-18
-            643: -38,-13
-            644: -37,-13
-            645: -36,-13
-            646: -35,-13
-            647: -34,-13
-            648: -33,-13
-            649: -32,-13
-            650: -31,-13
-            651: -29,-13
-            652: -28,-13
-            653: -30,-13
-            656: -38,-10
-            657: -37,-10
-            658: -36,-10
-            659: -30,-10
-            660: -29,-10
-            661: -28,-10
-            745: -40,-26
-            746: -39,-26
-            747: -30,-26
-            748: -29,-26
-            765: -26,-34
-            766: -25,-34
-            767: -24,-34
-            768: -22,-34
-            769: -21,-34
-            770: -20,-34
-            771: -19,-34
-            772: -23,-34
-            778: -26,-38
-            779: -23,-38
-            780: -20,-38
-            781: -19,-38
-            835: -51,3
-            836: -50,3
-            837: -50,3
-            838: -49,3
-            839: -48,3
-            840: -47,3
-            841: -46,3
-            842: -45,3
-            843: -44,3
-            844: -44,-3
-            845: -45,-3
-            846: -46,-3
-            847: -46,-3
-            848: -47,-3
-            849: -49,-3
-            850: -49,-3
-            851: -51,-3
-            852: -51,-3
-            859: -50,-3
-            860: -48,-3
-            1093: -62,-25
-            1094: -61,-25
-            1095: -60,-25
-            1722: 58,19
-            1723: 59,19
-            1724: 60,19
-            3038: 65,-52
-            3039: 66,-52
-            3040: 67,-52
-            6134: 36,-24
-            6154: -38,-17
-            6816: -21,-20
-            6817: -19,-20
-            7101: -37,13
-            7102: -38,13
-            7103: -39,13
+            569: -40,-18
+            570: -39,-18
+            571: -38,-18
+            618: -38,-13
+            619: -37,-13
+            620: -36,-13
+            621: -35,-13
+            622: -34,-13
+            623: -33,-13
+            624: -32,-13
+            625: -31,-13
+            626: -29,-13
+            627: -28,-13
+            628: -30,-13
+            631: -38,-10
+            632: -37,-10
+            633: -36,-10
+            634: -30,-10
+            635: -29,-10
+            636: -28,-10
+            720: -40,-26
+            721: -39,-26
+            722: -30,-26
+            723: -29,-26
+            740: -26,-34
+            741: -25,-34
+            742: -24,-34
+            743: -22,-34
+            744: -21,-34
+            745: -20,-34
+            746: -19,-34
+            747: -23,-34
+            753: -26,-38
+            754: -23,-38
+            755: -20,-38
+            756: -19,-38
+            810: -51,3
+            811: -50,3
+            812: -50,3
+            813: -49,3
+            814: -48,3
+            815: -47,3
+            816: -46,3
+            817: -45,3
+            818: -44,3
+            819: -44,-3
+            820: -45,-3
+            821: -46,-3
+            822: -46,-3
+            823: -47,-3
+            824: -49,-3
+            825: -49,-3
+            826: -51,-3
+            827: -51,-3
+            834: -50,-3
+            835: -48,-3
+            1068: -62,-25
+            1069: -61,-25
+            1070: -60,-25
+            1672: 58,19
+            1673: 59,19
+            1674: 60,19
+            2973: 65,-52
+            2974: 66,-52
+            2975: 67,-52
+            6006: 36,-24
+            6026: -38,-17
+            6658: -21,-20
+            6659: -19,-20
+            6822: -37,13
+            6823: -38,13
+            6824: -39,13
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
@@ -9071,1961 +9108,2070 @@ entities:
             511: -30,4
             543: -24,17
             546: -24,21
-            576: -28,13
-            591: -37,-21
-            592: -37,-20
-            593: -37,-19
-            947: -50,-27
-            948: -50,-28
-            949: -50,-29
-            950: -50,-30
-            951: -50,-31
-            952: -50,-26
-            1000: 40,-31
-            1001: 40,-30
-            1088: -59,-28
-            1089: -59,-27
-            1090: -59,-26
-            1742: 58,19
-            2238: -27,-16
-            2239: -27,-15
-            2240: -27,-14
-            2241: -27,-13
-            6813: -20,-21
-            6815: -18,-21
-            6860: 80,-24
-            6861: 80,-23
+            563: -28,13
+            566: -37,-21
+            567: -37,-20
+            568: -37,-19
+            922: -50,-27
+            923: -50,-28
+            924: -50,-29
+            925: -50,-30
+            926: -50,-31
+            927: -50,-26
+            975: 40,-31
+            976: 40,-30
+            1063: -59,-28
+            1064: -59,-27
+            1065: -59,-26
+            1692: 58,19
+            2178: -27,-16
+            2179: -27,-15
+            2180: -27,-14
+            2181: -27,-13
+            6655: -20,-21
+            6657: -18,-21
+            6702: 80,-24
+            6703: 80,-23
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa1
           decals:
-            6092: 80.134224,-34.739353
+            5964: 80.134224,-34.739353
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa2
           decals:
-            6093: 81.98104,-35.791183
+            5965: 81.98104,-35.791183
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa3
           decals:
-            6094: 80.43999,-36.158104
+            5966: 80.43999,-36.158104
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowb1
           decals:
-            6095: 83.2041,-35.583263
+            5967: 83.2041,-35.583263
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowb3
           decals:
-            6096: 83.020645,-36.060257
+            5968: 83.020645,-36.060257
         - node:
             color: '#FFFFFFFF'
             id: e
           decals:
-            923: -40.4296,-9.97279
+            898: -40.4296,-9.97279
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow01
           decals:
-            6109: 83.460945,-36.10918
-            6110: 80.01192,-34.201206
+            5981: 83.460945,-36.10918
+            5982: 80.01192,-34.201206
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow03
           decals:
-            6106: 81.7242,-35.840107
+            5978: 81.7242,-35.840107
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow05
           decals:
-            6111: 81.07172,-34.84943
+            5983: 81.07172,-34.84943
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow06
           decals:
-            6115: 80.39903,-34.335743
+            5987: 80.39903,-34.335743
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow07
           decals:
-            6104: 80.04861,-36.219257
+            5976: 80.04861,-36.219257
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow08
           decals:
-            6105: 80.8436,-35.974644
+            5977: 80.8436,-35.974644
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow09
           decals:
-            6107: 82.201195,-35.974644
-            6114: 81.98901,-35.155193
+            5979: 82.201195,-35.974644
+            5986: 81.98901,-35.155193
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow10
           decals:
-            6102: 80.02415,-34.922813
+            5974: 80.02415,-34.922813
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow11
           decals:
-            6103: 80.42776,-35.546574
-            6108: 83.24079,-35.7178
+            5975: 80.42776,-35.546574
+            5980: 83.24079,-35.7178
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow12
           decals:
-            6112: 82.99192,-34.910583
+            5984: 82.99192,-34.910583
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow13
           decals:
-            6113: 82.56385,-34.88612
+            5985: 82.56385,-34.88612
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa1
           decals:
-            6099: 82.82495,-35.571033
+            5971: 82.82495,-35.571033
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa2
           decals:
-            6118: 83.059845,-34.91084
+            5990: 83.059845,-34.91084
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa3
           decals:
-            6097: 79.9263,-35.46096
+            5969: 79.9263,-35.46096
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowb2
           decals:
-            6098: 81.369514,-35.70557
-            6116: 80.8828,-34.87415
+            5970: 81.369514,-35.70557
+            5988: 80.8828,-34.87415
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowb3
           decals:
-            6117: 79.87989,-33.993546
+            5989: 79.87989,-33.993546
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowc2
           decals:
-            6101: 79.79176,-36.060257
+            5973: 79.79176,-36.060257
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowc3
           decals:
-            6100: 81.10044,-36.13364
+            5972: 81.10044,-36.13364
         - node:
             color: '#FFFFFFFF'
             id: h
           decals:
-            924: -40.486675,-10.812624
+            899: -40.486675,-10.812624
         - node:
             color: '#FFFF0066'
             id: shop
           decals:
-            3027: 50.31763,23.128677
-            3028: 51.239506,23.738052
-            3029: 52.00513,23.034927
+            2967: 50.31763,23.128677
+            2968: 51.239506,23.738052
+            2969: 52.00513,23.034927
         - node:
             color: '#FFFFFFFF'
             id: w
           decals:
-            922: -40.502983,-9.132956
+            897: -40.502983,-9.132956
     - type: GridAtmosphere
       version: 2
       data:
         tiles:
           0,0:
             0: 4383
-          -1,0:
-            0: 4383
           0,-1:
-            0: 4383
+            0: 4371
+            1: 12
+          -1,0:
+            0: 31
+            1: 4352
           0,1:
-            0: 63903
-          0,2:
-            0: 65343
-          1,0:
-            0: 39327
-          1,1:
-            0: 63625
-          1,2:
-            0: 65419
-          2,0:
-            0: 56831
-          2,1:
-            0: 64733
-          2,2:
-            0: 65484
-          -3,0:
-            0: 30719
-          -3,1:
-            0: 63351
-          -3,2:
-            0: 65399
-          -2,0:
-            0: 62271
-          -2,1:
-            0: 62003
-          -2,2:
-            0: 65322
+            0: 2451
+            1: 61452
           -1,1:
-            0: 61999
+            0: 552
+            1: 61447
+          0,2:
+            0: 3903
           -1,2:
-            0: 65423
-          0,-3:
-            0: 16383
-          0,-2:
-            0: 39423
-          1,-3:
-            0: 36863
-          1,-2:
-            0: 35067
-          1,-1:
-            0: 39417
-          2,-3:
-            0: 53247
-          2,-2:
-            0: 56572
-          2,-1:
-            0: 64989
-          -3,-3:
-            0: 32767
-          -3,-2:
-            0: 30711
-          -3,-1:
-            0: 63351
-          -2,-3:
-            0: 12287
-          -2,-2:
-            0: 13050
-          -2,-1:
-            0: 13299
-          -1,-3:
-            0: 36863
-          -1,-2:
-            0: 8959
-          -1,-1:
-            0: 4383
-          0,3:
-            0: 65535
-          1,3:
-            0: 65535
-          2,3:
-            0: 65535
-          3,0:
-            0: 65535
-          3,1:
-            0: 65535
-          3,2:
-            0: 65535
-          3,3:
-            0: 65535
-          -4,0:
-            0: 65535
-          -4,1:
-            0: 65535
-          -4,2:
-            0: 65535
-          -4,3:
-            0: 65535
-          -3,3:
-            0: 65535
-          -2,3:
-            0: 65535
-          -1,3:
-            0: 65535
-          0,-4:
-            0: 65535
-          1,-4:
-            0: 65535
-          2,-4:
-            0: 65535
-          3,-4:
-            0: 65535
-          3,-3:
-            0: 65535
-          3,-2:
-            0: 65535
-          3,-1:
-            0: 65535
-          -4,-4:
-            0: 65535
-          -4,-3:
-            0: 65535
-          -4,-2:
-            0: 65535
-          -4,-1:
-            0: 65535
-          -3,-4:
-            0: 65535
-          -2,-4:
-            0: 65535
-          -1,-4:
-            0: 65535
-          -4,-6:
-            0: 65535
-          -4,-5:
-            0: 65535
-          -4,-8:
-            0: 65535
-          -4,-7:
-            0: 65535
-          -3,-8:
-            0: 65535
-          -3,-7:
-            0: 65535
-          -3,-6:
-            0: 65535
-          -3,-5:
-            0: 65535
-          -2,-8:
-            0: 65535
-          -2,-7:
-            0: 65535
-          -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
-          -1,-8:
-            0: 65535
-          -1,-7:
-            0: 65535
-          -1,-6:
-            0: 65535
-          -1,-5:
-            0: 65535
-          0,-8:
-            0: 65535
-          0,-7:
-            0: 65535
-          0,-6:
-            0: 65535
-          0,-5:
-            0: 65535
-          1,-8:
-            0: 65535
-          1,-7:
-            0: 65535
-          1,-6:
-            0: 65535
-          1,-5:
-            0: 65535
-          2,-7:
-            0: 65535
-          2,-6:
-            0: 65535
-          2,-5:
-            0: 65535
-          2,-8:
-            0: 65535
-          3,-8:
-            0: 65535
-          3,-7:
-            0: 65535
-          3,-6:
-            0: 65535
-          3,-5:
-            0: 65535
-          4,-8:
-            0: 65535
-          4,-7:
-            0: 65535
-          4,-6:
-            0: 65535
-          4,-5:
-            0: 65535
-          5,-5:
-            0: 65535
-          6,-5:
-            0: 65535
-          4,-4:
-            0: 65535
-          4,-3:
-            0: 65535
-          4,-2:
-            0: 45055
-            1: 4096
-            2: 16384
-          5,-4:
-            0: 65535
-          5,-3:
-            0: 65535
-          5,-2:
-            0: 45055
-            3: 20480
-          6,-4:
-            0: 65535
-          6,-3:
-            0: 65535
-          6,-2:
-            0: 45055
-            4: 4096
-            3: 16384
-          -5,-6:
-            0: 65535
-          -5,-5:
-            0: 65535
-          -5,-4:
-            0: 65535
-          -5,-3:
-            0: 65535
-          5,-8:
-            0: 65535
-          5,-7:
-            0: 65535
-          5,-6:
-            0: 65535
-          6,-7:
-            0: 65535
-          6,-6:
-            0: 65535
-          7,-7:
-            0: 65535
-          7,-6:
-            0: 65535
-          7,-5:
-            0: 65535
-          7,-8:
-            0: 65535
-          4,-1:
-            1: 17
-            0: 65450
-            2: 68
-          5,-1:
-            3: 85
-            0: 65450
-          6,-1:
-            4: 17
-            0: 65450
-            3: 68
-          7,-4:
-            0: 65535
-          7,-3:
-            0: 65535
-          7,-2:
-            0: 65535
-          -5,-2:
-            0: 65535
-          -5,-1:
-            0: 65535
-          4,0:
-            0: 65535
-          4,1:
-            0: 65535
-          4,2:
-            0: 65535
-          4,3:
-            0: 65535
-          5,0:
-            0: 65535
-          6,0:
-            0: 65535
-          8,-8:
-            0: 65535
-          8,-7:
-            0: 65535
-          8,-6:
-            0: 65535
-          8,-5:
-            0: 65535
-          9,-8:
-            0: 65535
-          9,-7:
-            0: 65535
-          9,-6:
-            0: 65535
-          9,-5:
-            0: 65535
-          10,-8:
-            0: 65535
-          10,-7:
-            0: 65535
-          10,-6:
-            0: 65535
-          10,-5:
-            0: 65535
-          11,-8:
-            0: 65535
-          11,-7:
-            0: 65535
-          11,-6:
-            0: 65535
-          11,-5:
-            0: 65535
-          8,-4:
-            0: 65535
-          8,-3:
-            0: 65535
-          8,-2:
-            0: 65535
-          9,-4:
-            0: 65535
-          9,-3:
-            0: 65535
-          -6,2:
-            0: 65535
-          -5,2:
-            0: 65535
-          -5,0:
-            0: 65535
-          -5,1:
-            0: 65535
-          -5,3:
-            0: 65535
-          4,-9:
-            0: 65535
-          5,-9:
-            0: 65535
-          7,-9:
-            0: 65535
-          0,-9:
-            0: 65535
-          1,-9:
-            0: 65535
-          2,-9:
-            0: 65535
-          3,-9:
-            0: 65535
-          4,4:
-            0: 65535
-          0,4:
-            0: 65535
-          1,4:
-            0: 65535
-          2,4:
-            0: 65535
-          3,4:
-            0: 65535
-          -4,4:
-            0: 65535
-          -3,4:
-            0: 65535
-          -2,4:
-            0: 65535
-          -1,4:
-            0: 65535
-          -5,4:
-            0: 65535
-          -4,-9:
-            0: 65535
-          -3,-9:
-            0: 65535
-          -2,-9:
-            0: 65535
-          -1,-9:
-            0: 65535
-          8,-9:
-            0: 65535
-          9,-9:
-            0: 65535
-          10,-9:
-            0: 65535
-          11,-9:
-            0: 65535
-          12,-8:
-            0: 65535
-          12,-7:
-            0: 65535
-          12,-6:
-            0: 65535
-          12,-5:
-            0: 65535
-          12,-9:
-            0: 65535
-          -6,-2:
-            0: 65535
-          -6,-1:
-            0: 65535
-          -7,0:
-            0: 65535
-          -7,1:
-            0: 65535
-          -7,2:
-            0: 65535
-          -6,0:
-            0: 65535
-          -6,1:
-            0: 65535
-          -6,3:
-            0: 65535
-          -6,4:
-            0: 65535
-          10,-4:
-            0: 65535
-          10,-3:
-            0: 65535
-          11,-4:
-            0: 65535
-          11,-3:
-            0: 65535
-          -7,3:
-            0: 65535
-          4,5:
-            0: 65535
-          0,5:
-            0: 65535
-          1,5:
-            0: 65535
-          2,5:
-            0: 65535
-          3,5:
-            0: 65535
-          -4,5:
-            0: 65535
-          -3,5:
-            0: 65535
-          -2,5:
-            0: 65535
-          -1,5:
-            0: 65535
-          -7,4:
-            0: 65535
-          -7,5:
-            0: 65535
-          -6,5:
-            0: 65535
-          -5,5:
-            0: 65535
-          -7,-8:
-            0: 65535
-          -7,-7:
-            0: 65535
-          -7,-6:
-            0: 65535
-          -7,-5:
-            0: 65535
-          -6,-8:
-            0: 65535
-          -6,-7:
-            0: 65535
-          -6,-6:
-            0: 65535
-          -6,-5:
-            0: 65535
-          -5,-8:
-            0: 65535
-          -5,-7:
-            0: 65535
-          -8,-2:
-            0: 65535
-          -8,-1:
-            0: 65535
-          -7,-2:
-            0: 65535
-          -7,-1:
-            0: 65535
-          -7,-4:
-            0: 65535
-          -7,-3:
-            0: 65535
-          -6,-4:
-            0: 65535
-          -6,-3:
-            0: 65535
-          -8,0:
-            0: 65535
-          -8,1:
-            0: 65535
-          -8,2:
-            0: 65535
-          -8,3:
-            0: 65535
-          -8,4:
-            0: 65535
-          -8,5:
-            0: 65535
-          -7,-9:
-            0: 65535
-          -6,-9:
-            0: 65535
-          -5,-9:
-            0: 65535
-          -12,-2:
-            0: 65535
-          -12,-1:
-            0: 65535
-          -11,-2:
-            0: 65535
-          -11,-1:
-            0: 65535
-          -10,-2:
-            0: 65535
-          -10,-1:
-            0: 65535
-          -9,-2:
-            0: 65535
-          -9,-1:
-            0: 65535
-          -12,0:
-            0: 65535
-          -12,1:
-            0: 65535
-          -11,0:
-            0: 65535
-          -11,1:
-            0: 65535
-          -11,2:
-            0: 65535
-          -11,3:
-            0: 65535
-          -10,0:
-            0: 65535
-          -10,1:
-            0: 65535
-          -10,2:
-            0: 65535
-          -10,3:
-            0: 65535
-          -9,0:
-            0: 65535
-          -9,1:
-            0: 65535
-          -9,2:
-            0: 65535
-          -9,3:
-            0: 65535
-          -11,4:
-            0: 65535
-          -10,4:
-            0: 65535
-          -10,5:
-            0: 65518
-          -9,4:
-            0: 65535
-          -9,5:
-            0: 65535
-          -8,-6:
-            0: 65535
-          -8,-5:
-            0: 65535
-          -8,-4:
-            0: 65535
-          -8,-3:
-            0: 65535
-          -11,-4:
-            0: 65535
-          -11,-3:
-            0: 65535
-          -10,-4:
-            0: 65535
-          -10,-3:
-            0: 65535
-          -9,-4:
-            0: 65535
-          -9,-3:
-            0: 65535
-          -11,-6:
-            0: 65535
-          -11,-5:
-            0: 65535
-          -10,-6:
-            0: 65535
-          -10,-5:
-            0: 65535
-          -9,-6:
-            0: 65535
-          -9,-5:
-            0: 65535
-          -8,-8:
-            0: 65535
-          -8,-7:
-            0: 65535
-          -8,-11:
-            0: 65535
-          -8,-10:
-            0: 65535
-          -8,-9:
-            0: 65535
-          -7,-11:
-            0: 65535
-          -7,-10:
-            0: 65535
-          -6,-11:
-            0: 65535
-          -6,-10:
-            0: 65535
-          -5,-11:
-            0: 65535
-          -5,-10:
-            0: 65535
-          -11,-8:
-            0: 65535
-          -11,-7:
-            0: 65535
-          -10,-8:
-            0: 65535
-          -10,-7:
-            0: 65535
-          -9,-8:
-            0: 65535
-          -9,-7:
-            0: 65535
-          -11,-9:
-            0: 65535
-          -10,-9:
-            0: 65535
-          -10,-11:
-            0: 65535
-          -10,-10:
-            0: 65535
-          -9,-11:
-            0: 65535
-          -9,-10:
-            0: 65535
-          -9,-9:
-            0: 65535
-          -15,0:
-            0: 51336
-          -15,1:
-            0: 52428
-          -14,0:
-            0: 65535
-          -14,1:
-            0: 65535
-          -13,0:
-            0: 65535
-          -13,1:
-            0: 65535
-          -15,-2:
-            0: 52224
-          -15,-1:
-            0: 52428
-          -14,-2:
-            0: 65535
-          -14,-1:
-            0: 65535
-          -13,-2:
-            0: 65535
-          -13,-1:
-            0: 65535
-          -12,-4:
-            0: 65535
-          -12,-3:
-            0: 65535
-          -12,2:
-            0: 65535
-          -12,3:
-            0: 65535
-          -12,-8:
-            0: 65535
-          -12,-7:
-            0: 65535
-          -12,-6:
-            0: 65535
-          -12,-5:
-            0: 65535
-          -12,-9:
-            0: 65535
-          -14,2:
-            0: 65535
-          -13,2:
-            0: 65535
-          -13,3:
-            0: 65535
-          -14,-4:
-            0: 65535
-          -14,-3:
-            0: 65535
-          -13,-4:
-            0: 65535
-          -13,-3:
-            0: 65535
-          -14,-6:
-            0: 65535
-          -14,-5:
-            0: 65535
-          -14,-8:
-            0: 65535
-          -14,-7:
-            0: 65535
-          -13,-8:
-            0: 65535
-          -13,-7:
-            0: 65535
-          -13,-6:
-            0: 65535
-          -13,-5:
-            0: 65535
-          -14,-9:
-            0: 65535
-          -13,-9:
-            0: 65535
-          6,-8:
-            0: 65535
-          6,-9:
-            0: 65535
-          7,-10:
-            0: 65535
-          8,-10:
-            0: 65535
-          9,-10:
-            0: 65535
-          10,-10:
-            0: 65535
-          11,-10:
-            0: 65535
-          12,-10:
-            0: 65535
-          7,-1:
-            0: 65535
-          5,1:
-            0: 65535
-          5,2:
-            0: 65535
-          5,3:
-            0: 65535
-          6,1:
-            0: 65535
-          7,0:
-            0: 65535
-          7,1:
-            0: 65535
-          8,-1:
-            0: 65535
-          9,-2:
-            0: 65535
-          9,-1:
-            0: 65535
-          10,-2:
-            0: 65535
-          10,-1:
-            0: 65535
-          11,-2:
-            0: 65535
-          11,-1:
-            0: 65535
-          5,4:
-            0: 65535
-          5,5:
-            0: 65535
-          -16,-8:
-            0: 65535
-          -16,-7:
-            0: 65535
-          -16,-6:
-            0: 65535
-          -15,-8:
-            0: 65535
-          -15,-7:
-            0: 65535
-          -15,-6:
-            0: 65535
-          -15,-9:
-            0: 65535
-          8,0:
-            0: 65535
-          8,1:
-            0: 65535
-          9,0:
-            0: 65535
-          9,1:
-            0: 65535
-          10,0:
-            0: 65535
-          10,1:
-            0: 65535
-          11,0:
-            0: 65535
-          11,1:
-            0: 65535
-          -17,-8:
-            0: 36744
-          -17,-7:
-            0: 65535
-          -17,-6:
-            0: 63743
-          0,6:
-            0: 65535
-          0,7:
-            0: 65535
-          1,6:
-            0: 65535
-          1,7:
-            0: 65535
-          2,6:
-            0: 65535
-          2,7:
-            0: 65535
-          3,6:
-            0: 65535
-          3,7:
-            0: 65535
-          -4,6:
-            0: 65535
-          -4,7:
-            0: 65535
-          -3,6:
-            0: 65535
-          -3,7:
-            0: 65535
-          -2,6:
-            0: 65535
-          -2,7:
-            0: 65535
-          -1,6:
-            0: 65535
-          -1,7:
-            0: 65535
-          -8,6:
-            0: 65535
-          -7,6:
-            0: 65535
-          -6,6:
-            0: 65535
-          -6,7:
-            0: 65535
-          -5,6:
-            0: 65535
-          -5,7:
-            0: 65535
-          0,8:
-            0: 65535
-          0,9:
-            0: 65535
-          0,10:
-            0: 65535
-          1,8:
-            0: 65535
-          1,9:
-            0: 65535
-          2,8:
-            0: 65535
-          2,9:
-            0: 65535
-          3,8:
-            0: 65535
-          3,9:
-            0: 65535
-          -4,8:
-            0: 65535
-          -4,9:
-            0: 65535
-          -3,8:
-            0: 65535
-          -3,9:
-            0: 65535
-          -2,8:
-            0: 65535
-          -2,9:
-            0: 65535
-          -1,8:
-            0: 65535
-          -1,9:
-            0: 65535
-          -1,10:
-            0: 65535
-          -6,8:
-            0: 65535
-          -6,9:
-            0: 65535
-          -5,8:
-            0: 65535
-          -5,9:
-            0: 65535
-          6,2:
-            0: 65535
-          6,3:
-            0: 65535
-          7,2:
-            0: 65535
-          7,3:
-            0: 65535
-          5,6:
-            0: 34959
-          6,4:
-            0: 65535
-          6,5:
-            0: 65535
-          6,6:
-            0: 65535
-          7,4:
-            0: 65535
-          7,5:
-            0: 65535
-          7,6:
-            0: 65535
-          8,2:
-            0: 65535
-          8,3:
-            0: 65535
-          0,11:
-            0: 65535
-          1,10:
-            0: 65535
-          1,11:
-            0: 21847
-          -2,10:
-            0: 65535
-          -2,11:
-            0: 65535
-          -1,11:
-            0: 65535
-          -2,12:
-            0: 47871
-          -2,13:
-            0: 25322
-          -1,12:
-            0: 65535
-          -1,13:
-            0: 8191
-          0,12:
-            0: 65535
-          0,13:
-            0: 36863
-          1,12:
-            0: 21845
-          1,13:
-            0: 25717
-          8,4:
-            0: 65535
-          8,5:
-            0: 65535
-          8,6:
-            0: 15
-          9,4:
-            0: 65535
-          9,5:
-            0: 13311
-          4,6:
-            0: 14207
-          -4,-11:
-            0: 65527
-          -4,-10:
-            0: 65535
-          13,-8:
-            0: 65535
-          13,-7:
-            0: 65535
-          14,-8:
-            0: 65535
-          14,-7:
-            0: 65535
-          15,-8:
-            0: 65535
-          15,-7:
-            0: 65535
-          13,-10:
-            0: 65535
-          13,-9:
-            0: 65535
-          14,-10:
-            0: 65535
-          14,-9:
-            0: 65535
-          15,-10:
-            0: 65535
-          15,-9:
-            0: 65531
-            3: 4
-          -12,-12:
-            0: 65535
-          -12,-11:
-            0: 32767
-            3: 32768
-          -12,-10:
-            0: 65527
-            3: 8
-          -11,-12:
-            0: 65535
-          -11,-11:
-            0: 28671
-            3: 36864
-          -11,-10:
-            0: 65535
-          -10,-12:
-            0: 65535
-          -15,-12:
-            0: 52428
-          -14,-12:
-            0: 65535
-          -14,-11:
-            0: 35071
-          -14,-10:
-            0: 65423
-          -13,-12:
-            0: 65535
-          -13,-11:
-            0: 65535
-          -13,-10:
-            0: 65535
-          9,2:
-            0: 65535
-          9,3:
-            0: 65535
-          10,2:
-            0: 65535
-          10,3:
-            0: 65535
-          11,2:
-            0: 65535
-          11,3:
-            0: 65535
-          10,4:
-            0: 65535
-          10,5:
-            0: 255
-          11,4:
-            0: 65535
-          12,1:
-            0: 65535
-          12,2:
-            0: 65535
-          12,3:
-            0: 65535
-          13,1:
-            0: 65535
-          13,2:
-            0: 65535
-          13,3:
-            0: 65535
-          12,4:
-            0: 65535
-          13,4:
-            0: 65535
-          -15,-13:
-            0: 52428
-          -14,-13:
-            0: 65535
-          -13,-13:
-            0: 65280
-          -12,-13:
-            0: 65280
-          -11,-13:
-            0: 65518
-          -10,-13:
-            0: 65407
-          13,-5:
-            0: 65535
-          12,0:
-            0: 65535
-          13,0:
-            0: 65535
-          14,0:
-            0: 65535
-          14,1:
-            0: 65535
-          14,2:
-            0: 65535
-          14,3:
-            0: 65535
-          15,2:
-            0: 65535
-          15,3:
-            0: 65535
-          14,4:
-            0: 65535
-          14,5:
-            0: 65535
-          15,4:
-            0: 65535
-          15,5:
-            0: 65535
-          -16,-16:
-            0: 43690
-          -16,-15:
-            0: 43690
-          -16,-14:
-            0: 58030
-          -15,-16:
-            0: 65535
-          -15,-15:
-            0: 65535
-          -15,-14:
-            0: 64767
-          -14,-16:
-            0: 65535
-          -14,-15:
-            0: 65535
-          -14,-14:
-            0: 65535
-          -11,-16:
-            0: 61166
-          -11,-15:
-            0: 61166
-          -11,-14:
-            0: 61166
-          -10,-16:
-            0: 65535
-          -10,-15:
-            0: 65535
-          -10,-14:
-            0: 65535
-          -9,-16:
-            0: 48059
-          -9,-15:
-            0: 48059
-          -9,-14:
-            0: 64447
-          -16,-17:
-            0: 44714
-          -15,-17:
-            0: 65520
-          -14,-17:
-            0: 65532
-          -11,-17:
-            0: 61158
-          -10,-17:
-            0: 65520
-          -9,-17:
-            0: 49082
-          12,-4:
-            0: 65535
-          12,-3:
-            0: 65535
-          12,-2:
-            0: 65535
-          12,-1:
-            0: 65535
-          13,-4:
-            0: 65535
-          13,-3:
-            0: 65535
-          13,-2:
-            0: 65535
-          13,-1:
-            0: 65535
-          14,-3:
-            0: 65535
-          14,-2:
-            0: 65535
-          14,-1:
-            0: 57343
-            5: 8192
-          15,0:
-            0: 65535
-          15,1:
-            0: 65535
-          15,-1:
-            0: 65535
-          16,0:
-            0: 65535
-          16,1:
-            0: 65535
-          16,-1:
-            0: 65535
-          13,-6:
-            0: 65535
-          14,-6:
-            0: 65535
-          14,-5:
-            0: 65535
-          15,-6:
-            0: 65535
-          15,-5:
-            0: 65535
-          13,5:
-            0: 65535
-          13,6:
-            0: 36863
-          14,6:
-            0: 65535
-          15,6:
-            0: 65535
-          14,-4:
-            0: 65535
-          15,-4:
-            0: 65535
-          15,-3:
-            0: 65535
-          15,-2:
-            0: 65535
-          16,2:
-            0: 30591
-          16,3:
-            0: 21845
-          16,-4:
-            0: 65535
-          16,-3:
-            0: 65535
-          16,-2:
-            0: 65535
-          17,-4:
-            0: 65535
-          17,-3:
-            0: 65535
-          17,-2:
-            0: 65535
-          18,-4:
-            0: 65535
-          18,-3:
-            0: 65535
-          18,-2:
-            0: 65535
-          19,-4:
-            0: 65535
-          19,-3:
-            0: 65535
-          19,-2:
-            0: 65535
-          16,4:
-            0: 62805
-          16,5:
-            0: 65535
-          16,-8:
-            0: 65535
-          16,-7:
-            0: 65535
-          16,-6:
-            0: 65535
-          16,-5:
-            0: 65535
-          17,-8:
-            0: 65535
-          17,-7:
-            0: 65535
-          17,-6:
-            0: 65535
-          17,-5:
-            0: 65535
-          18,-8:
-            0: 65535
-          18,-7:
-            0: 65535
-          18,-6:
-            0: 65535
-          18,-5:
-            0: 65535
-          19,-6:
-            0: 65535
-          19,-5:
-            0: 65535
-          20,-4:
-            0: 65535
-          20,-3:
-            0: 65535
-          21,-4:
-            0: 65535
-          21,-3:
-            0: 65535
-          20,-6:
-            0: 65535
-          20,-5:
-            0: 65535
-          21,-6:
-            0: 65535
-          21,-5:
-            0: 65535
-          16,-9:
-            0: 65471
-          17,-9:
-            0: 65423
-          18,-9:
-            0: 65331
-          4,-12:
-            0: 65535
-          4,-11:
-            0: 65535
-          4,-10:
-            0: 65535
-          5,-12:
-            0: 65535
-          5,-11:
-            0: 65535
-          5,-10:
-            0: 65535
-          6,-12:
-            0: 65535
-          6,-11:
-            0: 65535
-          6,-10:
-            0: 65535
-          7,-12:
-            0: 65535
-          7,-11:
-            0: 65535
-          0,-11:
-            0: 65523
-          0,-10:
-            0: 65535
-          1,-10:
-            0: 65535
-          1,-11:
-            0: 65535
-          2,-11:
-            0: 65535
-          2,-10:
-            0: 65535
-          2,-12:
-            0: 65535
-          3,-12:
-            0: 65535
-          3,-11:
-            0: 65535
-          3,-10:
-            0: 65535
-          -3,-11:
-            0: 65528
-          -3,-10:
-            0: 65535
-          -2,-10:
-            0: 65535
-          -1,-10:
-            0: 65535
-          -1,-11:
-            0: 65520
-          4,-16:
-            0: 65295
-          4,-15:
-            0: 65535
-          4,-14:
-            0: 65535
-          4,-13:
-            0: 65535
-          5,-16:
-            0: 65423
-          5,-15:
-            0: 65535
-          5,-14:
-            0: 65535
-          5,-13:
-            0: 65535
-          6,-16:
-            0: 28931
-          6,-15:
-            0: 65527
-          6,-14:
-            0: 65471
-            3: 64
-          6,-13:
-            0: 65335
-            3: 200
-          7,-13:
-            0: 65519
-            3: 16
-          2,-13:
-            0: 64752
-          3,-13:
-            0: 65535
-          3,-16:
-            0: 65359
-          3,-15:
-            0: 65535
-          3,-14:
-            0: 65535
-          1,-12:
-            0: 65535
-          -8,7:
-            0: 65535
-          -7,7:
-            0: 65535
-          -2,-11:
-            0: 65520
-          -9,6:
-            0: 65535
-          -9,7:
-            0: 65535
-          -16,-5:
-            0: 3823
-          -15,-5:
-            0: 4095
-          -8,8:
-            0: 65535
-          -7,8:
-            0: 65535
-          -9,-13:
-            0: 57355
-          1,-13:
-            0: 61937
-          -11,6:
-            0: 35070
-            3: 1
-          -11,7:
-            0: 34952
-          -10,6:
-            0: 65519
-          -10,7:
-            0: 65535
-          -16,-9:
-            0: 65484
-          -8,9:
-            0: 65535
-          -7,9:
-            0: 65535
-          -17,-9:
-            0: 34816
-          -9,8:
-            0: 61167
-          -9,9:
-            0: 61166
-          0,-12:
-            0: 32627
-          -2,-12:
-            0: 61155
-          -1,-12:
-            0: 65520
-          -7,-12:
-            0: 65521
-          -6,-12:
-            0: 65535
-          -5,-12:
-            0: 65535
-          -12,4:
-            0: 34952
-          -11,5:
-            0: 52987
-            3: 12544
-          -4,10:
-            0: 65535
-          -3,10:
-            0: 65535
-          -8,10:
-            0: 43567
-          -8,11:
-            0: 43754
-          -7,10:
-            0: 65295
-          -7,11:
-            0: 65295
-          -6,10:
-            0: 65391
-          -6,11:
-            0: 65519
-          -5,10:
-            0: 65519
-          -5,11:
-            0: 13091
-          12,5:
-            0: 65535
-          12,6:
-            0: 4095
-          13,7:
-            0: 3208
-          14,7:
-            0: 3855
-          15,7:
             0: 3983
-          -14,-18:
-            0: 64704
-          -13,-18:
-            0: 240
-          -12,-18:
-            0: 240
-          -11,-18:
-            0: 58992
-          17,0:
-            0: 65535
-          17,1:
-            0: 65535
-          18,0:
-            0: 13107
-          18,1:
-            0: 13107
-          17,-1:
-            0: 65535
-          18,-1:
-            0: 13107
-          17,4:
-            0: 4096
-          17,5:
-            0: 4369
-          19,-8:
-            0: 65535
-          19,-7:
-            0: 65535
-          20,-2:
-            0: 65535
-          20,-8:
-            0: 65535
-          20,-7:
-            0: 65535
-          21,-8:
-            0: 21877
-          21,-7:
+          0,3:
+            1: 3855
+          -1,3:
+            1: 32527
+          0,4:
+            1: 61695
+          1,0:
+            0: 23
+            1: 39304
+          1,1:
+            1: 63625
+          1,2:
+            0: 907
+            1: 3072
+          1,3:
+            1: 7951
+          1,-1:
+            0: 4192
+            1: 35225
+          1,4:
+            1: 61695
+          2,0:
+            0: 21879
+          2,1:
+            0: 12309
+            1: 17472
+          2,2:
+            1: 1860
+          2,3:
+            1: 3855
+          2,-1:
             0: 30037
-          19,-9:
-            0: 65416
-          0,-15:
-            0: 48930
-          0,-14:
-            0: 65523
-          0,-13:
-            0: 65523
-          -9,10:
-            0: 15
-          -2,-14:
-            0: 61152
-          -2,-13:
-            0: 61155
-          -1,-14:
-            0: 65520
-          -1,-13:
-            0: 65520
-          -8,12:
-            0: 43754
-          -8,13:
-            0: 50730
-          -7,12:
-            0: 65295
-          -7,13:
-            0: 61455
-          -6,12:
-            0: 65519
-          -6,13:
-            0: 63087
-          -5,12:
-            0: 13091
-          -5,13:
-            0: 4899
-          20,-9:
-            0: 65535
-          21,-9:
-            0: 4369
-          4,7:
-            0: 13107
+          2,4:
+            1: 61695
+          3,0:
+            1: 56789
+          3,1:
+            1: 56797
+          3,2:
+            1: 56797
+          3,3:
+            1: 3909
+          3,-1:
+            1: 21845
+          3,4:
+            1: 63679
+          4,0:
+            1: 43936
+          4,3:
+            1: 48058
+          -4,0:
+            1: 30583
+          -4,-1:
+            1: 29303
+          -5,0:
+            1: 65535
+          -4,1:
+            1: 30578
+          -5,1:
+            1: 56785
+          -4,2:
+            1: 29810
+          -5,2:
+            1: 61937
+          -4,3:
+            1: 3413
+          -5,3:
+            1: 15291
+          -4,4:
+            1: 62127
+          -3,0:
+            1: 273
+            0: 17612
+          -3,1:
+            1: 21841
+            0: 32772
+          -3,2:
+            1: 7509
+          -3,3:
+            1: 20239
+          -3,4:
+            1: 61695
+          -3,-1:
+            0: 50244
+            1: 273
+          -2,0:
+            0: 53533
+            1: 8738
+          -2,1:
+            0: 4113
+            1: 57890
+          -2,2:
+            1: 1792
+            0: 2090
+          -2,3:
+            1: 3855
+          -2,-1:
+            0: 4561
+            1: 8738
+          -2,4:
+            1: 61687
+          -1,-1:
+            0: 4104
+            1: 279
+          0,-4:
+            1: 30583
+          0,-5:
+            1: 30471
+          -1,-4:
+            1: 57341
+          0,-3:
+            1: 7
+            0: 16128
+          -1,-3:
+            1: 13
+            0: 36608
+          0,-2:
+            0: 39183
+            1: 240
+          -1,-2:
+            0: 8719
+            1: 240
+          1,-4:
+            1: 30583
+          1,-3:
+            1: 3079
+            0: 33536
+          1,-2:
+            0: 11
+            1: 35056
+          2,-4:
+            1: 3869
+          2,-3:
+            1: 18191
+          2,-2:
+            0: 4144
+            1: 17476
+          2,-5:
+            1: 56785
+          3,-4:
+            1: 18191
+          3,-3:
+            1: 21853
+          3,-2:
+            1: 21845
+          3,-5:
+            1: 65522
+          4,-4:
+            1: 65519
+          4,-3:
+            1: 65535
+          4,-2:
+            0: 240
+            2: 4096
+            3: 16384
+          4,-1:
+            2: 17
+            1: 61440
+            3: 68
+          -4,-4:
+            1: 7645
+          -4,-5:
+            1: 56793
+          -5,-4:
+            1: 30711
+          -4,-3:
+            1: 26215
+          -5,-3:
+            1: 65394
+          -4,-2:
+            1: 29302
+          -5,-2:
+            1: 61680
+          -5,-1:
+            1: 63487
+          -3,-4:
+            1: 3551
+          -3,-3:
+            1: 23839
+          -3,-2:
+            1: 21845
+            0: 128
+          -3,-5:
+            1: 64988
+          -2,-4:
+            1: 45055
+          -2,-3:
+            1: 1834
+            0: 10240
+          -2,-2:
+            0: 4122
+            1: 8928
+          -2,-5:
+            1: 65535
+          -1,-5:
+            1: 56605
+          -4,-8:
+            1: 24575
+          -5,-8:
+            1: 36863
+          -4,-7:
+            1: 30583
+          -5,-7:
+            1: 4095
+          -4,-6:
+            1: 62071
+          -3,-8:
+            1: 24575
+          -3,-7:
+            1: 5589
+          -3,-6:
+            1: 7645
+          -2,-8:
+            1: 28671
+          -2,-7:
+            1: 12287
+          -2,-6:
+            1: 12287
+          -2,-9:
+            1: 7647
+          -1,-8:
+            1: 4095
+          -1,-6:
+            1: 53247
+          -1,-7:
+            1: 20206
+          -1,-9:
+            1: 33247
+          0,-8:
+            1: 4095
+          0,-7:
+            1: 3581
+          0,-6:
+            1: 32631
+          0,-9:
+            1: 29695
+          1,-8:
+            1: 61439
+          1,-6:
+            1: 65535
+          1,-5:
+            1: 4095
+          1,-7:
+            1: 59630
+          1,-9:
+            1: 43566
+          2,-8:
+            1: 47935
+          2,-7:
+            1: 47291
+          2,-6:
+            1: 32755
+          2,-9:
+            1: 65295
+          3,-8:
+            1: 65295
+          3,-7:
+            1: 65535
+          3,-6:
+            1: 65524
+          3,-9:
+            1: 65295
+          4,-8:
+            1: 48015
+          4,-7:
+            1: 48059
+          4,-5:
+            1: 65520
+          4,-9:
+            1: 65322
+          4,-6:
+            1: 61152
+          5,-8:
+            1: 48059
+          5,-7:
+            1: 65523
+          5,-6:
+            1: 49083
+          5,-5:
+            1: 65521
+          5,-9:
+            1: 47903
+          5,-4:
+            1: 65535
+          6,-8:
+            1: 65535
+          6,-7:
+            1: 65520
+          6,-5:
+            1: 46008
+          6,-9:
+            1: 65287
+          6,-6:
+            1: 61166
+          6,-4:
+            1: 65343
+          7,-8:
+            1: 49083
+          7,-7:
+            1: 47928
+          7,-6:
+            1: 64315
+          7,-5:
+            1: 12543
+            0: 32768
+          7,-9:
+            1: 48011
+          7,-4:
+            1: 13063
+            0: 34952
+          8,-8:
+            1: 49075
+          8,-7:
+            1: 64435
+          8,-6:
+            1: 62387
+          8,-5:
+            1: 255
+            0: 61440
+          5,-3:
+            1: 65535
+          5,-2:
+            0: 240
+            4: 20480
+          5,-1:
+            4: 85
+            1: 61440
+          6,-3:
+            1: 65535
+          6,-2:
+            0: 240
+            5: 4096
+            4: 16384
+          6,-1:
+            5: 17
+            1: 28672
+            4: 68
+          7,-3:
+            1: 51
+            0: 59528
+          7,-2:
+            0: 254
+            1: 28672
+          7,-1:
+            1: 56785
+          7,0:
+            1: 65309
+          8,-4:
+            0: 31
+            1: 60928
+          8,-3:
+            0: 4352
+            1: 49390
+          8,-2:
+            0: 17
+            1: 29900
+          8,-1:
+            1: 30576
+          -8,-8:
+            1: 65535
+          -8,-9:
+            1: 65291
+          -9,-8:
+            1: 65535
+          -8,-7:
+            1: 65535
+          -9,-7:
+            1: 65535
+          -8,-6:
+            1: 55792
+          -9,-6:
+            1: 57584
+          -8,-5:
+            1: 36317
+          -9,-5:
+            1: 52974
+          -8,-4:
+            1: 65535
+          -7,-8:
+            1: 64989
+          -7,-7:
+            1: 56799
+          -7,-6:
+            1: 56572
+          -7,-5:
+            1: 52701
+          -7,-9:
+            1: 40397
+          -7,-4:
+            1: 65535
+          -6,-8:
+            1: 16383
+          -6,-7:
+            1: 7099
+          -6,-6:
+            1: 53725
+          -6,-5:
+            1: 8189
+          -6,-9:
+            1: 8191
+          -6,-4:
+            1: 56797
+          -5,-6:
+            1: 28774
+          -5,-5:
+            1: 10103
+          -5,-9:
+            1: 35771
+          -9,-4:
+            1: 65535
+          -8,-3:
+            1: 56793
+          -9,-3:
+            1: 56796
+          -8,-2:
+            1: 61680
+          -9,-2:
+            1: 61680
+          -8,-1:
+            1: 65535
+          -9,-1:
+            1: 65535
+          -8,0:
+            1: 65535
+          -7,-3:
+            1: 56796
+          -7,-2:
+            1: 63736
+          -7,-1:
+            1: 65535
+          -7,0:
+            1: 65535
+          -6,-3:
+            1: 48049
+          -6,-2:
+            1: 62451
+          -6,-1:
+            1: 65535
+          -6,0:
+            1: 65535
+          4,1:
+            1: 43690
+          4,2:
+            1: 43690
+          4,4:
+            1: 63659
+          5,0:
+            1: 65520
+          5,1:
+            1: 47935
+          5,2:
+            1: 65339
+          5,3:
+            1: 65535
+          5,4:
+            1: 48051
+          6,0:
+            1: 65392
+          6,1:
+            1: 65295
+          6,2:
+            1: 61263
+          6,3:
+            1: 61438
+          6,4:
+            1: 65524
+          7,1:
+            1: 64783
+          7,2:
+            1: 24013
+          7,3:
+            1: 56797
+          7,4:
+            1: 65532
+          8,0:
+            1: 65303
+          8,1:
+            1: 30479
+          8,2:
+            1: 2039
+          8,3:
+            1: 61182
+          8,-9:
+            1: 49151
+          9,-8:
+            1: 49072
+          9,-7:
+            1: 64312
+          9,-6:
+            1: 63544
+          9,-5:
+            1: 57599
+          9,-9:
+            1: 65535
+          9,-4:
+            1: 57582
+          10,-8:
+            1: 65520
+          10,-7:
+            1: 65295
+          10,-6:
+            1: 65423
+          10,-5:
+            1: 61183
+          10,-9:
+            1: 65535
+          10,-4:
+            1: 65263
+          11,-8:
+            1: 48056
+          11,-7:
+            1: 48011
+          11,-6:
+            1: 64395
+          11,-5:
+            1: 57599
+          11,-9:
+            1: 49151
+          11,-4:
+            1: 29798
+          12,-8:
+            1: 48059
+          12,-7:
+            1: 15251
+          12,-6:
+            1: 62227
+          12,-5:
+            1: 61695
+          9,-3:
+            1: 65254
+          9,-2:
+            1: 61695
+          9,-1:
+            1: 65535
+          9,0:
+            1: 65287
+          10,-1:
+            1: 61167
+          10,-3:
+            1: 61166
+          10,-2:
+            1: 61166
+          10,0:
+            1: 65534
+          11,-3:
+            1: 1764
+          11,-2:
+            1: 24806
+          11,-1:
+            1: 58894
+          12,-4:
+            1: 65520
+          12,-3:
+            1: 45055
+          12,-2:
+            1: 65535
+          12,-1:
+            1: 65535
+          -9,0:
+            1: 65535
+          -8,1:
+            1: 65535
+          -9,1:
+            1: 65535
+          -8,2:
+            1: 61680
+          -9,2:
+            1: 57584
+          -8,3:
+            1: 65535
+          -9,3:
+            1: 61422
+          -8,4:
+            1: 61695
+          -7,1:
+            1: 65535
+          -7,2:
+            1: 65278
+          -7,3:
+            1: 61438
+          -7,4:
+            1: 65262
+          -6,1:
+            1: 65535
+          -6,2:
+            1: 64767
+          -6,3:
+            1: 61438
+          -5,4:
+            1: 62392
+          4,-12:
+            1: 64765
+          4,-13:
+            1: 56588
+          3,-12:
+            1: 29695
+          4,-11:
+            1: 64735
+          3,-11:
+            1: 54384
+          4,-10:
+            1: 47778
+          3,-10:
+            1: 51665
+          5,-12:
+            1: 12288
+            0: 34
+          5,-11:
+            1: 12323
+          5,-10:
+            1: 65520
+          5,-13:
+            0: 8704
+          6,-12:
+            1: 65520
+          6,-11:
+            1: 4095
+          6,-10:
+            1: 63344
+          6,-13:
+            0: 57344
+            4: 200
+          7,-12:
+            1: 13104
+          7,-11:
+            1: 13107
+          7,-10:
+            1: 64307
+          7,-13:
+            0: 4096
+            4: 16
+            1: 8
           8,-11:
             0: 48896
+          8,-10:
+            1: 65520
+          0,-12:
+            0: 32627
+          0,-13:
+            0: 65523
+          -1,-12:
+            0: 65520
+          0,-11:
+            0: 35059
+            1: 13056
+          -1,-11:
+            0: 17600
+            1: 4352
+          0,-10:
+            1: 65331
+            0: 8
+          -1,-10:
+            1: 56337
+            0: 4
+          1,-12:
+            0: 4369
+            1: 32904
+          1,-13:
+            0: 4369
+            1: 32768
+          1,-11:
+            1: 26336
+          1,-10:
+            1: 26214
+          2,-12:
+            1: 45243
+          2,-11:
+            1: 61872
+          2,-10:
+            1: 4095
+          2,-13:
+            1: 47104
+          3,-13:
+            1: 65280
+            0: 1
+          4,5:
+            1: 12543
+            0: 32768
+          3,5:
+            1: 62719
+          4,6:
+            1: 48
+            0: 8200
+          3,6:
+            1: 3823
+          4,7:
+            0: 8738
+          3,7:
+            1: 61422
+          4,8:
+            0: 2
+            1: 4352
+          5,5:
+            1: 35003
+            0: 12288
+          5,6:
+            0: 34947
+          6,5:
+            1: 65535
+          6,6:
+            1: 18020
+          7,5:
+            1: 65535
+          7,6:
+            1: 4913
+            0: 34944
+          8,4:
+            1: 61408
+          8,5:
+            1: 3839
+          -1,4:
+            1: 61680
+          0,5:
+            1: 61695
+          -1,5:
+            1: 63231
+          0,6:
+            1: 60655
+          -1,6:
+            1: 63231
+          0,7:
+            1: 56591
+          -1,7:
+            1: 61183
+          0,8:
+            1: 49356
+          1,5:
+            1: 47359
+          1,6:
+            1: 15291
+          1,7:
+            1: 65307
+          1,8:
+            1: 61695
+          2,5:
+            1: 57599
+          2,6:
+            1: 36622
+          2,7:
+            1: 43691
+          2,8:
+            1: 47786
+          3,8:
+            1: 65038
+          -4,5:
+            1: 28927
+          -5,5:
+            1: 28927
+          -4,6:
+            1: 65351
+          -4,7:
+            1: 59647
+          -5,7:
+            1: 53375
+          -4,8:
+            1: 3823
+          -3,5:
+            1: 28927
+          -3,6:
+            1: 65351
+          -3,7:
+            1: 53503
+          -3,8:
+            1: 3549
+          -2,5:
+            1: 28927
+          -2,6:
+            1: 63303
+          -2,7:
+            1: 62463
+          -2,8:
+            1: 4095
+          -1,8:
+            1: 20206
+          -9,4:
+            1: 61678
+          -8,5:
+            1: 65522
+          -8,6:
+            1: 56785
+          -9,6:
+            1: 30711
+          -8,7:
+            1: 35057
+            0: 12288
+          -8,8:
+            0: 3
+            1: 56584
+          -9,7:
+            0: 61440
+            1: 119
+          -7,5:
+            1: 61678
+          -7,6:
+            1: 61152
+          -7,7:
+            1: 3822
+          -7,8:
+            1: 65359
+          -6,4:
+            1: 65520
+          -6,5:
+            1: 61695
+          -6,6:
+            1: 43938
+          -6,7:
+            1: 58026
+          -6,8:
+            1: 26191
+          -5,6:
+            1: 30578
+          -5,8:
+            1: 61661
+          -4,-11:
+            0: 199
+            1: 40992
+          -5,-11:
+            0: 8
+            1: 36659
+          -5,-10:
+            1: 48059
+          -4,-10:
+            1: 61160
+          -4,-9:
+            1: 3808
+          -3,-11:
+            0: 120
+            1: 28672
+          -3,-10:
+            1: 48951
+          -3,-9:
+            1: 2040
+          -3,-12:
+            0: 34952
+          -3,-13:
+            0: 34952
+          -2,-12:
+            0: 61155
+          -2,-11:
+            1: 65280
+          -2,-10:
+            1: 53759
+          -2,-13:
+            0: 61155
           9,-11:
             0: 3840
+          9,-10:
+            1: 65520
           10,-11:
             0: 3840
+          10,-10:
+            1: 65520
           11,-11:
             0: 44800
+          11,-10:
+            1: 65520
           12,-11:
-            0: 65518
-          13,-11:
-            0: 65535
-          14,-11:
-            0: 62257
-          -8,-12:
-            0: 65520
-          -9,-12:
-            0: 65525
-          -16,-10:
-            0: 52302
-          -15,-10:
-            0: 65295
-          -18,-7:
-            0: 34952
-          -18,-6:
-            0: 51336
-          2,10:
-            0: 65535
-          11,5:
-            0: 8191
-          16,-10:
-            0: 4369
-          17,-10:
-            0: 32768
-          18,-10:
-            0: 12288
-          7,-15:
-            0: 16144
-          7,-14:
-            0: 63283
-          4,8:
-            0: 13107
-          4,9:
-            0: 13107
+            0: 4352
+            1: 34816
+          12,-10:
+            1: 45976
+          12,-9:
+            1: 48063
+          13,-8:
+            1: 39169
+          13,-7:
+            1: 2456
+          13,-6:
+            1: 65535
+          13,-5:
+            1: 61695
+          13,-9:
+            1: 56797
+          14,-8:
+            1: 65280
+          14,-7:
+            1: 10103
+          14,-6:
+            1: 65535
+          14,-5:
+            1: 61183
+          13,-4:
+            1: 48056
+          14,-9:
+            1: 30583
+          14,-4:
+            1: 61164
+          15,-8:
+            1: 62702
+          15,-7:
+            1: 61428
+          15,-6:
+            1: 47342
+          15,-5:
+            1: 49087
+          15,-4:
+            1: 64441
+          15,-9:
+            1: 57344
+            4: 4
+          16,-8:
+            1: 12834
+          16,-7:
+            1: 30576
+          16,-6:
+            1: 62071
+          16,-5:
+            1: 65523
+          12,-12:
+            0: 19968
           13,-12:
-            0: 36751
+            0: 36736
+            1: 11
+          13,-11:
+            1: 30464
+          13,-10:
+            1: 4215
           14,-12:
+            1: 1
+            0: 256
+          14,-11:
+            1: 33312
+          15,-10:
+            1: 142
+          16,-10:
+            0: 273
+            1: 4096
+          -8,-12:
+            1: 65280
+          -9,-12:
+            1: 47872
+            0: 4
+          -8,-11:
+            1: 3887
+          -9,-11:
+            1: 7947
+          -8,-10:
+            1: 48063
+          -9,-10:
+            1: 35293
+          -9,-9:
+            1: 65323
+          -7,-11:
+            1: 39726
+          -7,-10:
+            1: 65535
+          -7,-12:
+            0: 3809
+          -7,-13:
+            0: 12288
+          -6,-11:
+            1: 1295
+          -6,-10:
+            1: 65535
+          -6,-12:
+            1: 57890
+            0: 136
+          -6,-13:
+            1: 8192
+            0: 32768
+          -5,-12:
+            1: 12834
+            0: 34952
+          -5,-13:
+            1: 8192
+            0: 32768
+          -12,-4:
+            1: 7677
+          -12,-5:
+            1: 56591
+          -13,-4:
+            1: 61166
+          -12,-3:
+            1: 61692
+          -13,-3:
+            1: 57584
+          -12,-2:
+            1: 61695
+          -13,-2:
+            1: 57582
+          -12,-1:
+            1: 65535
+          -13,-1:
+            1: 65535
+          -12,0:
+            1: 65535
+          -11,-4:
+            1: 60637
+          -11,-3:
+            1: 43699
+          -11,-1:
+            1: 14199
+          -11,-5:
+            1: 21829
+          -11,-2:
+            1: 25826
+          -11,0:
+            1: 16383
+          -10,-4:
+            1: 61167
+          -10,-3:
+            1: 56792
+          -10,-2:
+            1: 61680
+          -10,-1:
+            1: 65535
+          -10,0:
+            1: 65535
+          -10,-5:
+            1: 20479
+          -13,0:
+            1: 65535
+          -12,1:
+            1: 65535
+          -13,1:
+            1: 61439
+          -12,2:
+            1: 65521
+          -13,2:
+            1: 61152
+          -12,3:
+            1: 255
+            0: 28672
+          -13,3:
+            1: 238
+            0: 61440
+          -11,1:
+            1: 26487
+          -11,2:
+            1: 63956
+          -11,3:
+            1: 47291
+          -11,4:
+            1: 187
+            0: 61440
+          -10,1:
+            1: 65535
+          -10,2:
+            1: 58608
+          -10,3:
+            1: 3822
+          -10,4:
+            1: 35071
+            0: 12288
+          -12,5:
+            4: 32768
+            0: 8
+          -12,4:
+            0: 32768
+          -11,5:
+            0: 35019
+            4: 12544
+          -11,6:
+            4: 1
+            0: 136
+            1: 2048
+          -10,5:
+            0: 4352
+            1: 52416
+          -10,6:
             0: 257
-          -15,2:
-            0: 12
-          -15,3:
-            0: 128
-          -14,3:
-            0: 241
-          -18,-8:
-            0: 35840
-          -17,-5:
-            0: 12
-          -3,11:
-            0: 17476
-          -3,12:
-            0: 50252
-          -2,14:
-            0: 12
-          -1,14:
-            0: 15
-          0,14:
-            0: 15
-          1,14:
-            0: 3
-          9,6:
-            0: 3
-          11,6:
-            0: 15
-          -16,-18:
-            0: 57344
-          -15,-18:
+            1: 51884
+          -10,7:
+            1: 255
             0: 61440
-          -10,-18:
-            0: 61440
-          -9,-18:
-            0: 61440
-          17,2:
-            0: 15
-          18,2:
-            0: 3
-          16,6:
-            0: 4369
-          16,7:
-            0: 257
-          21,-2:
-            0: 4383
-          16,-12:
-            0: 7679
-          16,-11:
-            0: 4369
-          17,-12:
-            0: 1
+          -11,7:
+            0: 32768
           -11,8:
             0: 8
           -10,8:
             0: 34959
-          -10,9:
+          -9,5:
+            1: 30576
+          -9,8:
+            0: 15
+            1: 52224
+          -12,-8:
+            1: 65487
+          -12,-9:
+            1: 29619
+          -13,-8:
+            1: 65407
+          -12,-7:
+            1: 64767
+          -13,-7:
+            1: 63487
+          -12,-6:
+            1: 65535
+          -13,-6:
+            1: 65535
+          -13,-5:
+            1: 61135
+          -11,-8:
+            1: 64443
+          -11,-7:
+            1: 48063
+          -11,-6:
+            1: 21969
+          -11,-9:
+            1: 35647
+          -10,-8:
+            1: 65535
+          -10,-7:
+            1: 65535
+          -10,-6:
+            1: 62192
+          -10,-9:
+            1: 65295
+          -12,-12:
+            1: 16383
+          -12,-13:
+            1: 61440
+          -13,-12:
+            1: 36863
+          -12,-11:
+            1: 13107
+            0: 8
+            4: 32768
+          -13,-11:
+            1: 34952
+            0: 13059
+          -12,-10:
+            1: 62259
+            4: 8
+          -13,-10:
+            1: 63624
+            0: 51
+          -13,-9:
+            1: 51641
+          -11,-12:
+            1: 4095
+          -11,-11:
+            0: 15
+            4: 36864
+          -11,-10:
+            1: 61440
+          -11,-13:
+            1: 56524
+          -10,-12:
+            1: 52497
+          -10,-13:
+            1: 39249
+          -10,-10:
+            1: 9736
+          -10,-11:
+            1: 34828
+          -9,-13:
+            0: 57354
+          -15,1:
+            1: 3084
+          -15,2:
+            0: 12
+          -15,0:
+            0: 2184
+          -14,1:
+            1: 61423
+          -15,3:
+            0: 128
+          -14,3:
+            0: 241
+          -14,0:
+            1: 61166
+          -14,2:
+            1: 3812
+          -14,-1:
+            1: 61423
+          -15,-2:
+            0: 3072
+          -15,-1:
+            1: 3084
+          -14,-4:
+            1: 61166
+          -14,-3:
+            1: 61166
+          -14,-2:
+            1: 61166
+          -14,-5:
+            1: 61166
+          -16,-8:
+            1: 53759
+          -16,-7:
+            1: 56797
+          -17,-7:
+            1: 65392
+          -16,-6:
+            1: 51697
+          -16,-5:
+            0: 3585
+            1: 12
+          -17,-5:
+            0: 12
+          -15,-8:
+            1: 47167
+          -15,-7:
+            1: 48063
+          -15,-6:
+            1: 11832
+          -15,-5:
+            0: 3976
+            1: 34
+          -15,-9:
+            1: 20479
+          -14,-8:
+            1: 30471
+          -14,-7:
+            1: 65399
+          -14,-6:
+            1: 61191
+          -14,-9:
+            1: 19867
+          -16,-9:
+            0: 1860
+          -17,-9:
+            0: 2048
+          -16,-10:
+            0: 17486
+          -15,-10:
+            0: 15
+            1: 61440
+          -15,-12:
+            0: 17476
+          -15,-13:
+            0: 17476
+          -14,-12:
+            1: 4095
+          -14,-10:
+            0: 143
+            1: 45056
+          -14,-13:
+            1: 30583
+          -14,-11:
+            0: 34830
+          -13,-13:
+            1: 61440
+          9,1:
+            1: 21791
+          9,2:
+            1: 36725
+          9,3:
+            1: 48059
+          10,1:
+            1: 64767
+          10,2:
+            1: 58607
+          10,3:
+            1: 63726
+          10,4:
+            1: 3626
+          11,0:
+            1: 30576
+          11,1:
+            1: 61815
+          11,2:
+            1: 62975
+          11,3:
+            1: 65535
+          11,4:
+            1: 3855
+          12,0:
+            1: 65534
+          12,1:
+            1: 65279
+          12,2:
+            1: 61183
+          12,3:
+            1: 61182
+          -18,-8:
+            0: 35840
+          -18,-6:
+            0: 51200
+          -17,-8:
+            0: 1792
+          -17,-6:
+            1: 7
+            0: 28672
+          0,9:
+            1: 3824
+          -1,9:
+            1: 20222
+          0,10:
+            1: 61006
+          -1,10:
+            1: 61166
+          0,11:
+            1: 65524
+          -1,11:
+            1: 65530
+          0,12:
+            1: 65295
+          1,9:
+            1: 57568
+          1,10:
+            1: 3822
+          1,11:
+            0: 17478
+          1,12:
+            0: 17476
+          2,9:
+            1: 12792
+            0: 32768
+          2,10:
+            1: 819
             0: 34952
-          -10,10:
-            0: 136
+          3,9:
+            1: 57582
+          3,10:
+            1: 3822
+          4,9:
+            1: 4113
+          4,10:
+            1: 273
+          -4,9:
+            1: 65455
+          -5,9:
+            1: 34831
+            0: 13056
+          -4,10:
+            1: 255
+            0: 61440
+          -5,10:
+            1: 136
+            0: 62243
+          -3,9:
+            1: 64783
+          -3,10:
+            1: 157
+            0: 64512
+          -3,11:
+            0: 17476
+          -3,12:
+            0: 76
+          -2,9:
+            1: 3823
+          -2,10:
+            1: 61006
+          -2,11:
+            1: 61156
+          -2,12:
+            1: 14
+            0: 512
+          -1,12:
+            1: 65391
+          -8,9:
+            1: 3583
+          -9,9:
+            1: 3276
+          -8,10:
+            0: 43567
+          -9,10:
+            0: 15
+          -8,11:
+            0: 43754
+          -8,12:
+            0: 43754
+          -7,9:
+            1: 4087
+          -7,10:
+            0: 65295
+          -7,11:
+            0: 65295
+          -7,12:
+            0: 65295
+          -6,9:
+            1: 18032
+          -6,10:
+            0: 65391
+          -6,11:
+            0: 65519
+          -6,12:
+            0: 65519
+          -5,11:
+            0: 13091
+          -5,12:
+            0: 13091
+          -2,13:
+            0: 610
+          -2,14:
+            0: 8
+          -1,13:
+            1: 239
+            0: 4096
+          -1,14:
+            0: 15
+          0,13:
+            1: 127
+            0: 32768
+          0,14:
+            0: 15
+          1,14:
+            0: 1
+          1,13:
+            0: 1124
+          8,6:
+            0: 14
+          9,4:
+            1: 40912
+          9,5:
+            1: 273
+            0: 204
+          9,6:
+            0: 3
+          10,5:
+            0: 255
+          11,5:
+            0: 4369
+            1: 204
+          11,6:
+            0: 15
+          12,4:
+            1: 4064
+          12,5:
+            1: 52445
+            0: 4096
+          12,6:
+            0: 3857
+            1: 12
+          13,0:
+            1: 65504
+          13,1:
+            1: 65038
+          13,2:
+            1: 65038
+          13,3:
+            1: 61198
+          13,-1:
+            1: 64799
+          14,0:
+            1: 49080
+          14,1:
+            1: 56587
+          14,2:
+            1: 57101
+          14,3:
+            1: 61197
+          14,-1:
+            1: 9743
+          14,4:
+            1: 61166
+          15,0:
+            1: 61949
+          15,1:
+            1: 3853
+          15,2:
+            1: 10987
+          15,3:
+            1: 48014
+          15,-1:
+            1: 8075
+          15,4:
+            1: 48059
+          16,1:
+            1: 3050
+          16,2:
+            1: 819
+            0: 8
+          13,4:
+            1: 40944
+          13,5:
+            1: 62395
+          13,6:
+            1: 7
+            0: 1792
+          13,7:
+            0: 3200
+          14,5:
+            1: 61712
+            0: 192
+          14,6:
+            1: 30578
+          14,7:
+            0: 3840
+          15,5:
+            0: 16
+            1: 29896
+          15,6:
+            1: 30578
+          15,7:
+            0: 3968
+          16,5:
+            1: 254
+            0: 61440
+          16,6:
+            0: 4369
+          16,7:
+            0: 257
+          -16,-16:
+            0: 8738
+          -16,-17:
+            0: 9770
+          -16,-15:
+            0: 8738
+          -16,-14:
+            0: 57894
+          -16,-13:
+            0: 2
+          -15,-16:
+            1: 65535
+          -15,-15:
+            1: 65535
+          -15,-14:
+            1: 7
+            0: 29696
+          -15,-17:
+            1: 65280
+          -14,-16:
+            1: 30583
+          -14,-15:
+            1: 29169
+          -14,-14:
+            1: 30583
+          -14,-17:
+            1: 7936
+            0: 4
+          -11,-16:
+            1: 52428
+          -11,-15:
+            1: 49376
+          -11,-14:
+            1: 52428
+          -10,-16:
+            1: 65535
+          -10,-15:
+            1: 65535
+          -10,-14:
+            1: 64797
+          -10,-17:
+            1: 65280
+          -9,-16:
+            1: 4369
+            0: 34952
+          -9,-15:
+            1: 4369
+            0: 34952
+          -9,-14:
+            1: 1
+            0: 60044
+          -9,-17:
+            1: 4352
+            0: 35978
           -8,-13:
             0: 61440
-          -7,-13:
-            0: 12288
+          -16,-18:
+            0: 57344
+          -15,-18:
+            0: 61440
+          -14,-18:
+            0: 29760
+          -13,-18:
+            1: 240
+          -12,-18:
+            1: 240
+          -11,-18:
+            1: 16
+            0: 50240
+          -11,-17:
+            0: 4
+            1: 3584
+          -10,-18:
+            0: 61440
+          -9,-18:
+            0: 61440
+          13,-3:
+            1: 3003
+          13,-2:
+            1: 61949
+          14,-3:
+            1: 36622
+          14,-2:
+            1: 65262
+          15,-3:
+            1: 36619
+          15,-2:
+            1: 47931
+          16,-4:
+            1: 64435
+          16,-3:
+            1: 56715
+          16,-2:
+            1: 16157
+          16,-1:
+            1: 11259
+          16,0:
+            1: 10986
+          16,3:
+            0: 17476
+          16,4:
+            0: 1092
+          17,0:
+            1: 2039
+          17,1:
+            1: 2039
+          17,2:
+            0: 15
+          18,0:
+            1: 12336
+          18,1:
+            1: 12336
+          18,2:
+            0: 3
+          18,-1:
+            1: 12336
+          17,-4:
+            1: 65520
+          17,-3:
+            1: 65535
+          17,-2:
+            1: 3871
+          17,-1:
+            1: 2039
+          17,-5:
+            1: 65520
+          18,-3:
+            1: 30478
+          18,-2:
+            1: 7943
+          18,-5:
+            1: 65524
+          18,-4:
+            1: 61166
+          19,-4:
+            1: 49075
+          19,-3:
+            1: 8067
+          19,-2:
+            1: 3581
+          19,-5:
+            1: 49072
+          20,-4:
+            1: 13104
+            0: 34944
+          20,-3:
+            1: 4080
+          20,-2:
+            1: 1911
+          17,5:
+            1: 16
+            0: 4096
+          16,-9:
+            1: 57344
+            0: 142
+          17,-8:
+            1: 65280
+          17,-7:
+            1: 12287
+          17,-6:
+            1: 65535
+          17,-9:
+            1: 61440
+            0: 7
+          18,-9:
+            1: 28945
+          18,-6:
+            1: 58980
+          18,-8:
+            1: 17484
+          18,-7:
+            1: 17476
+          19,-8:
+            1: 65295
+          19,-7:
+            1: 65535
+          19,-6:
+            1: 61695
+          20,-8:
+            1: 56783
+          20,-7:
+            1: 40413
+          20,-6:
+            1: 63675
+          20,-5:
+            1: 13104
+            0: 34944
+          21,-3:
+            1: 826
+            0: 34816
+          21,-2:
+            0: 4383
+          21,-4:
+            1: 43690
+          21,-5:
+            1: 43690
+          22,-4:
+            1: 65535
+          22,-3:
+            1: 15
+          22,-5:
+            1: 65535
+          23,-4:
+            1: 4369
+            0: 34952
+          23,-3:
+            1: 1
+            0: 2188
+          23,-5:
+            1: 4369
+            0: 51328
+          20,-9:
+            1: 20479
+          21,-6:
+            1: 61600
+          21,-8:
+            0: 17508
+          21,-7:
+            0: 25668
+          22,-6:
+            1: 62000
+            0: 128
+          23,-6:
+            0: 48
+            1: 4096
+          16,-12:
+            1: 33
+            0: 4368
+          16,-11:
+            0: 4369
+          18,-10:
+            1: 4096
+          19,-9:
+            0: 1792
+          4,-16:
+            0: 15
+            1: 49152
+          3,-16:
+            0: 4431
+          4,-15:
+            1: 16349
+          3,-15:
+            1: 34952
+            0: 4369
+          4,-14:
+            1: 65534
+          3,-14:
+            1: 34944
+            0: 4369
+          5,-16:
+            0: 143
+          5,-15:
+            1: 30566
+          5,-14:
+            1: 30577
+          6,-16:
+            0: 3
+            1: 24576
+          6,-15:
+            1: 132
+          6,-14:
+            4: 64
+          7,-15:
+            1: 12816
+            0: 3072
+          7,-14:
+            1: 33842
           8,-15:
             0: 3840
           8,-14:
             0: 61440
-          9,-15:
+          0,-15:
+            0: 48930
+          -1,-15:
             0: 3840
-          9,-14:
-            0: 64640
-          9,-13:
-            0: 12
-          10,-15:
-            0: 61312
-          10,-14:
-            0: 65535
-          10,-13:
-            0: 3
-          11,-15:
+          0,-14:
+            0: 65523
+          -1,-14:
+            0: 65520
+          -1,-13:
             0: 65520
-          11,-14:
-            0: 65471
-            3: 64
-          11,-13:
-            0: 142
-          12,-15:
-            0: 63280
-          12,-14:
-            0: 65535
-          12,-13:
-            0: 36863
-          13,-15:
-            0: 61440
-          13,-14:
-            0: 13107
-          13,-13:
-            0: 65527
-          14,-15:
-            0: 63692
-          14,-13:
-            0: 61696
-          14,-16:
-            0: 32768
-          15,-16:
-            0: 12288
-          15,-15:
-            0: 65535
-          15,-13:
-            0: 63624
-          15,-14:
-            0: 35022
-          16,-15:
-            0: 63248
-          16,-14:
-            0: 65535
-          16,-13:
-            0: 65535
-          17,-14:
-            0: 13073
-          17,-13:
-            0: 4403
-          -16,-13:
-            0: 2
-          3,10:
-            0: 65535
-          19,-10:
-            0: 32768
-          20,-10:
-            0: 61440
-          21,-10:
-            0: 4096
-          4,10:
-            0: 13107
-          -12,5:
-            0: 19656
-            3: 32768
-          -12,6:
-            0: 140
-          -3,-12:
-            0: 34952
           1,-15:
             0: 4096
           1,-14:
             0: 4369
+          -10,9:
+            0: 34952
+          -10,10:
+            0: 136
           -3,-15:
             0: 32768
           -3,-14:
             0: 34952
-          -3,-13:
-            0: 34952
           -2,-15:
             0: 7936
-          -1,-15:
+          -2,-14:
+            0: 61152
+          -8,13:
+            0: 50730
+          -7,13:
+            0: 61455
+          -6,13:
+            0: 63087
+          -5,13:
+            0: 4899
+          9,-15:
             0: 3840
-          22,-4:
-            0: 65535
-          22,-3:
-            0: 255
-          23,-4:
-            0: 48059
-          23,-3:
-            0: 2239
-          22,-6:
-            0: 65527
-          22,-5:
-            0: 65535
-          23,-6:
-            0: 13104
-          23,-5:
-            0: 64435
-          12,-12:
-            0: 19968
-          -6,-13:
+          9,-14:
+            0: 12288
+            1: 17536
+          9,-13:
+            1: 4
+          10,-15:
+            0: 768
+            1: 9344
+          10,-14:
+            1: 1
+          10,-13:
+            1: 2
+          11,-14:
+            4: 64
+          11,-13:
+            1: 134
+          12,-15:
+            1: 50224
+          12,-13:
+            1: 33040
+          13,-15:
             0: 61440
-          -5,-13:
+          13,-14:
+            1: 3
+          13,-13:
+            1: 132
+          14,-15:
             0: 61440
+            1: 2116
+          14,-13:
+            0: 57344
+          15,-15:
+            1: 4096
+          15,-13:
+            0: 28672
+            1: 32768
+          15,-16:
+            1: 8192
+          15,-14:
+            1: 35010
+          16,-14:
+            1: 61408
+          16,-13:
+            1: 1646
+          16,-15:
+            1: 1024
         uniqueMixes:
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -11101,21 +11247,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.14975
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -11147,11 +11278,11 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: fgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADJAAAAAACHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABJAAAAAADHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAgQAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfgAAAAAAggAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAfQAAAAAAggAAAAABYQAAAAAEfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAgQAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAACJAAAAAAAJAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAJAAAAAACJAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADfgAAAAAAgQAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfgAAAAAAggAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAACfQAAAAAAggAAAAACYQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAgQAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAADJAAAAAACJAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAABJAAAAAACJAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -11246,43 +11377,47 @@ entities:
       version: 2
       data:
         tiles:
-          0,0:
-            0: 15
-          0,-1:
-            0: 65535
-          -1,-1:
-            0: 34952
-          1,0:
-            0: 52428
-          1,1:
-            0: 12
-          2,0:
-            0: 30583
-          2,1:
-            0: 7
-          0,-3:
-            0: 65280
-          0,-2:
-            0: 65535
-          1,-3:
-            0: 4096
-          1,-2:
-            0: 65497
-          1,-1:
-            0: 57343
-          2,-2:
-            0: 30579
-          2,-1:
-            0: 30583
-          -1,-3:
-            0: 34816
-          -1,-2:
-            0: 34952
           -1,0:
             0: 8
+          0,-1:
+            1: 61439
+          0,0:
+            0: 4
+          1,0:
+            1: 2184
+          1,1:
+            0: 4
+          2,0:
+            1: 5943
+          2,1:
+            1: 3
+            0: 4
+          2,-1:
+            1: 14195
+            0: 16384
+          -1,-3:
+            0: 2048
+          0,-2:
+            1: 65023
+            0: 512
+          0,-3:
+            1: 24576
+          -1,-2:
+            1: 32768
+          -1,-1:
+            1: 136
+          1,-1:
+            1: 2447
+            0: 512
+          1,-2:
+            0: 520
+            1: 36032
+          2,-2:
+            0: 3
+            1: 29440
         uniqueMixes:
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -11296,6 +11431,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -11313,6 +11463,20 @@ entities:
       parent: 2
 - proto: AirAlarm
   entities:
+  - uid: 755
+    components:
+    - type: Transform
+      pos: 44.5,17.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18416
+      - 18417
+      - 18418
+      - 877
+      - 8751
+      - 8750
+      - 8749
   - uid: 894
     components:
     - type: Transform
@@ -11327,6 +11491,20 @@ entities:
       - 493
       - 492
       - 491
+  - uid: 4744
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-5.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8736
+      - 8737
+      - 8738
+      - 12369
+      - 4957
+      - 7019
   - uid: 8353
     components:
     - type: Transform
@@ -11346,10 +11524,6 @@ entities:
       - 6363
       - 19304
       - 19305
-      - 19301
-      - 19300
-      - 19302
-      - 19303
   - uid: 8367
     components:
     - type: Transform
@@ -11385,20 +11559,6 @@ entities:
       - 8756
       - 18389
       - 18375
-  - uid: 8369
-    components:
-    - type: Transform
-      pos: 44.5,14.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 18417
-      - 18416
-      - 18418
-      - 8753
-      - 8749
-      - 8750
-      - 8751
   - uid: 8370
     components:
     - type: Transform
@@ -11437,19 +11597,6 @@ entities:
       - 18514
       - 18512
       - 18513
-  - uid: 8373
-    components:
-    - type: Transform
-      pos: 58.5,-2.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8736
-      - 8737
-      - 8738
-      - 18475
-      - 18474
-      - 18472
   - uid: 8374
     components:
     - type: Transform
@@ -12227,10 +12374,6 @@ entities:
       - 6363
       - 19304
       - 19305
-      - 19301
-      - 19300
-      - 19302
-      - 19303
   - uid: 8421
     components:
     - type: Transform
@@ -12243,8 +12386,6 @@ entities:
       - 6357
       - 6356
       - 20177
-      - 20169
-      - 20167
   - uid: 8422
     components:
     - type: Transform
@@ -12257,8 +12398,6 @@ entities:
       - 6353
       - 6354
       - 20178
-      - 20164
-      - 20168
   - uid: 8423
     components:
     - type: Transform
@@ -14601,7 +14740,7 @@ entities:
       pos: -16.5,19.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -44094.324
+      secondsUntilStateChange: -50157.324
       state: Opening
   - uid: 4196
     components:
@@ -15315,10 +15454,10 @@ entities:
       parent: 2
 - proto: AirlockMaintChemLocked
   entities:
-  - uid: 6025
+  - uid: 21373
     components:
     - type: Transform
-      pos: 42.5,14.5
+      pos: 42.5,15.5
       parent: 2
 - proto: AirlockMaintEngiLocked
   entities:
@@ -16112,6 +16251,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.5,-9.5
       parent: 2
+  - uid: 12369
+    components:
+    - type: Transform
+      pos: 59.5,-4.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7048
+      - 4744
   - uid: 17875
     components:
     - type: Transform
@@ -16282,8 +16430,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
       - 17550
+      - 755
   - uid: 18428
     components:
     - type: Transform
@@ -16296,11 +16444,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 50.5,-1.5
       parent: 2
-  - uid: 18475
-    components:
-    - type: Transform
-      pos: 61.5,-5.5
-      parent: 2
   - uid: 18496
     components:
     - type: Transform
@@ -17173,13 +17316,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 48.5,6.5
       parent: 2
-  - uid: 9978
-    components:
-    - type: MetaData
-      name: Chemistry APC
-    - type: Transform
-      pos: 43.5,14.5
-      parent: 2
   - uid: 9979
     components:
     - type: MetaData
@@ -17386,6 +17522,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,33.5
       parent: 2
+  - uid: 20615
+    components:
+    - type: Transform
+      pos: 43.5,17.5
+      parent: 2
   - uid: 20945
     components:
     - type: MetaData
@@ -19230,17 +19371,17 @@ entities:
       parent: 2
 - proto: BaseGasCondenser
   entities:
+  - uid: 1440
+    components:
+    - type: Transform
+      pos: 45.5,16.5
+      parent: 2
   - uid: 17295
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 16.5,-12.5
       parent: 2
-  - uid: 20610
-    components:
-    - type: Transform
-      pos: 47.5,16.5
-      parent: 2
 - proto: Bed
   entities:
   - uid: 132
@@ -19348,10 +19489,10 @@ entities:
     - type: Transform
       pos: 37.5,12.5
       parent: 2
-  - uid: 7056
+  - uid: 7036
     components:
     - type: Transform
-      pos: 57.5,-6.5
+      pos: 61.5,-5.5
       parent: 2
   - uid: 7126
     components:
@@ -19388,6 +19529,11 @@ entities:
     - type: Transform
       pos: 67.5,-54.5
       parent: 2
+  - uid: 17413
+    components:
+    - type: Transform
+      pos: 61.5,-4.5
+      parent: 2
 - proto: BedsheetBlack
   entities:
   - uid: 144
@@ -19407,10 +19553,15 @@ entities:
       parent: 2
 - proto: BedsheetBlue
   entities:
-  - uid: 15610
+  - uid: 18466
     components:
     - type: Transform
-      pos: 57.5,-6.5
+      pos: 61.5,-4.5
+      parent: 2
+  - uid: 18474
+    components:
+    - type: Transform
+      pos: 61.5,-5.5
       parent: 2
 - proto: BedsheetBrown
   entities:
@@ -20315,6 +20466,11 @@ entities:
     - type: Transform
       pos: 71.50742,-20.366497
       parent: 2
+  - uid: 12367
+    components:
+    - type: Transform
+      pos: 57.528355,-7.3207555
+      parent: 2
   - uid: 21556
     components:
     - type: Transform
@@ -20648,6 +20804,11 @@ entities:
       parent: 2
 - proto: ButtonFrameGrey
   entities:
+  - uid: 4982
+    components:
+    - type: Transform
+      pos: 35.5,16.5
+      parent: 2
   - uid: 16238
     components:
     - type: Transform
@@ -20660,6 +20821,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,15.5
       parent: 2
+  - uid: 20514
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,-16.5
+      parent: 2
   - uid: 21600
     components:
     - type: Transform
@@ -20740,12 +20907,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-11.5
       parent: 2
-  - uid: 21621
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,10.5
-      parent: 2
   - uid: 21622
     components:
     - type: Transform
@@ -20784,6 +20945,12 @@ entities:
     - type: Transform
       pos: 61.5,28.5
       parent: 2
+  - uid: 21845
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,10.5
+      parent: 2
 - proto: ButtonFrameJanitor
   entities:
   - uid: 16220
@@ -21302,6 +21469,16 @@ entities:
     - type: Transform
       pos: -26.5,-41.5
       parent: 2
+  - uid: 2352
+    components:
+    - type: Transform
+      pos: 41.5,16.5
+      parent: 2
+  - uid: 2357
+    components:
+    - type: Transform
+      pos: 41.5,17.5
+      parent: 2
   - uid: 2737
     components:
     - type: Transform
@@ -21452,6 +21629,11 @@ entities:
     - type: Transform
       pos: 57.5,-26.5
       parent: 2
+  - uid: 6020
+    components:
+    - type: Transform
+      pos: 41.5,18.5
+      parent: 2
   - uid: 6136
     components:
     - type: Transform
@@ -29657,26 +29839,6 @@ entities:
     - type: Transform
       pos: 61.5,-4.5
       parent: 2
-  - uid: 12367
-    components:
-    - type: Transform
-      pos: 62.5,-4.5
-      parent: 2
-  - uid: 12368
-    components:
-    - type: Transform
-      pos: 62.5,-5.5
-      parent: 2
-  - uid: 12369
-    components:
-    - type: Transform
-      pos: 62.5,-6.5
-      parent: 2
-  - uid: 12370
-    components:
-    - type: Transform
-      pos: 62.5,-7.5
-      parent: 2
   - uid: 12371
     components:
     - type: Transform
@@ -36592,6 +36754,16 @@ entities:
     - type: Transform
       pos: 63.5,-52.5
       parent: 2
+  - uid: 18454
+    components:
+    - type: Transform
+      pos: 61.5,-5.5
+      parent: 2
+  - uid: 18458
+    components:
+    - type: Transform
+      pos: 61.5,-6.5
+      parent: 2
   - uid: 19035
     components:
     - type: Transform
@@ -36687,6 +36859,16 @@ entities:
     - type: Transform
       pos: -23.5,32.5
       parent: 2
+  - uid: 20614
+    components:
+    - type: Transform
+      pos: 42.5,18.5
+      parent: 2
+  - uid: 20617
+    components:
+    - type: Transform
+      pos: 44.5,15.5
+      parent: 2
   - uid: 20790
     components:
     - type: Transform
@@ -37192,6 +37374,11 @@ entities:
     - type: Transform
       pos: -21.5,-41.5
       parent: 2
+  - uid: 21749
+    components:
+    - type: Transform
+      pos: 45.5,15.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 264
@@ -47160,6 +47347,11 @@ entities:
     - type: Transform
       pos: -5.5,-15.5
       parent: 2
+  - uid: 20616
+    components:
+    - type: Transform
+      pos: 43.5,16.5
+      parent: 2
   - uid: 20948
     components:
     - type: Transform
@@ -47175,6 +47367,16 @@ entities:
     - type: Transform
       pos: 90.5,-21.5
       parent: 2
+  - uid: 21043
+    components:
+    - type: Transform
+      pos: 43.5,15.5
+      parent: 2
+  - uid: 21044
+    components:
+    - type: Transform
+      pos: 43.5,17.5
+      parent: 2
   - uid: 21079
     components:
     - type: Transform
@@ -50343,6 +50545,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,37.5
       parent: 2
+  - uid: 5998
+    components:
+    - type: Transform
+      pos: 42.5,18.5
+      parent: 2
   - uid: 6054
     components:
     - type: Transform
@@ -51050,6 +51257,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -38.5,16.5
       parent: 2
+  - uid: 12460
+    components:
+    - type: Transform
+      pos: 41.5,18.5
+      parent: 2
   - uid: 12461
     components:
     - type: Transform
@@ -53148,6 +53360,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 80.5,-9.5
       parent: 2
+  - uid: 14228
+    components:
+    - type: Transform
+      pos: 41.5,16.5
+      parent: 2
+  - uid: 14248
+    components:
+    - type: Transform
+      pos: 41.5,17.5
+      parent: 2
   - uid: 15054
     components:
     - type: Transform
@@ -54119,11 +54341,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 87.5,-16.5
       parent: 2
-  - uid: 21044
-    components:
-    - type: Transform
-      pos: -35.5,-42.5
-      parent: 2
   - uid: 21129
     components:
     - type: Transform
@@ -54308,18 +54525,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 53.5,18.5
       parent: 2
-  - uid: 21646
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,16.5
-      parent: 2
-  - uid: 21647
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,17.5
-      parent: 2
   - uid: 21648
     components:
     - type: Transform
@@ -55094,12 +55299,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,-33.5
       parent: 2
-  - uid: 711
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,13.5
-      parent: 2
   - uid: 712
     components:
     - type: Transform
@@ -55577,6 +55776,12 @@ entities:
     - type: Transform
       pos: -53.5,-45.5
       parent: 2
+  - uid: 2119
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,14.5
+      parent: 2
   - uid: 2555
     components:
     - type: Transform
@@ -55592,6 +55797,12 @@ entities:
     - type: Transform
       pos: -42.5,-45.5
       parent: 2
+  - uid: 3480
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,13.5
+      parent: 2
   - uid: 3627
     components:
     - type: Transform
@@ -56219,11 +56430,6 @@ entities:
     - type: Transform
       pos: 54.5,2.5
       parent: 2
-  - uid: 6763
-    components:
-    - type: Transform
-      pos: 55.5,2.5
-      parent: 2
   - uid: 6764
     components:
     - type: Transform
@@ -56283,11 +56489,11 @@ entities:
     - type: Transform
       pos: -35.5,-12.5
       parent: 2
-  - uid: 7055
+  - uid: 7037
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-5.5
       parent: 2
   - uid: 7148
     components:
@@ -56844,18 +57050,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 76.5,-16.5
       parent: 2
-  - uid: 20607
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 45.5,15.5
-      parent: 2
-  - uid: 20608
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 46.5,15.5
-      parent: 2
   - uid: 20788
     components:
     - type: Transform
@@ -57167,12 +57361,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 55.5,10.5
       parent: 2
-  - uid: 7058
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,-7.5
-      parent: 2
   - uid: 7149
     components:
     - type: Transform
@@ -57502,18 +57690,6 @@ entities:
     - type: Transform
       pos: 31.515789,-24.396605
       parent: 2
-- proto: chem_master
-  entities:
-  - uid: 6017
-    components:
-    - type: Transform
-      pos: 47.5,11.5
-      parent: 2
-  - uid: 6019
-    components:
-    - type: Transform
-      pos: 41.5,11.5
-      parent: 2
 - proto: ChemDispenser
   entities:
   - uid: 6021
@@ -57528,10 +57704,22 @@ entities:
       parent: 2
 - proto: ChemistryHotplate
   entities:
-  - uid: 12256
+  - uid: 14261
     components:
     - type: Transform
-      pos: 45.5,13.5
+      pos: 43.5,12.5
+      parent: 2
+- proto: ChemMaster
+  entities:
+  - uid: 6017
+    components:
+    - type: Transform
+      pos: 47.5,11.5
+      parent: 2
+  - uid: 6019
+    components:
+    - type: Transform
+      pos: 41.5,11.5
       parent: 2
 - proto: ChessBoard
   entities:
@@ -57863,6 +58051,11 @@ entities:
       parent: 2
 - proto: ClosetMaintenanceFilledRandom
   entities:
+  - uid: 5965
+    components:
+    - type: Transform
+      pos: 83.5,-10.5
+      parent: 2
   - uid: 14740
     components:
     - type: Transform
@@ -57928,11 +58121,6 @@ entities:
     - type: Transform
       pos: 73.5,-22.5
       parent: 2
-  - uid: 14753
-    components:
-    - type: Transform
-      pos: 82.5,-10.5
-      parent: 2
   - uid: 14754
     components:
     - type: Transform
@@ -58125,16 +58313,16 @@ entities:
     - type: Transform
       pos: -17.5,23.5
       parent: 2
-  - uid: 14879
-    components:
-    - type: Transform
-      pos: 83.5,-10.5
-      parent: 2
   - uid: 14880
     components:
     - type: Transform
       pos: -13.5,-7.5
       parent: 2
+  - uid: 15294
+    components:
+    - type: Transform
+      pos: 84.5,-10.5
+      parent: 2
   - uid: 15614
     components:
     - type: Transform
@@ -58349,11 +58537,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-40.5
       parent: 2
-  - uid: 20284
+  - uid: 21646
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,12.5
+      pos: 42.5,14.5
       parent: 2
 - proto: ClosetWallFire
   entities:
@@ -58529,6 +58716,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,-40.5
       parent: 2
+  - uid: 15600
+    components:
+    - type: Transform
+      pos: 41.5,14.5
+      parent: 2
   - uid: 16213
     components:
     - type: Transform
@@ -58541,12 +58733,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -54.5,-57.5
       parent: 2
-  - uid: 20285
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,13.5
-      parent: 2
 - proto: ClothingBackpackClown
   entities:
   - uid: 8189
@@ -58924,13 +59110,6 @@ entities:
     - type: Transform
       pos: 21.504559,-47.81257
       parent: 2
-- proto: ClothingHeadsetMining
-  entities:
-  - uid: 20877
-    components:
-    - type: Transform
-      pos: 41.574528,17.44522
-      parent: 2
 - proto: ClothingMaskBee
   entities:
   - uid: 16410
@@ -59051,13 +59230,6 @@ entities:
     - type: Transform
       pos: -53.317593,-60.37925
       parent: 2
-- proto: ClothingNeckScarfStripedBlue
-  entities:
-  - uid: 7065
-    components:
-    - type: Transform
-      pos: 57.492764,-7.502381
-      parent: 2
 - proto: ClothingNeckScarfStripedSyndieRed
   entities:
   - uid: 21052
@@ -59167,10 +59339,10 @@ entities:
     - type: InsideEntityStorage
 - proto: ClothingOuterWinterCoat
   entities:
-  - uid: 8193
+  - uid: 7050
     components:
     - type: Transform
-      pos: 62.677505,-4.2970705
+      pos: 57.579605,-6.501329
       parent: 2
 - proto: ClothingOuterWinterMime
   entities:
@@ -59371,11 +59543,6 @@ entities:
     - type: Transform
       pos: 55.5,-9.5
       parent: 2
-  - uid: 14883
-    components:
-    - type: Transform
-      pos: 43.5,18.5
-      parent: 2
   - uid: 14885
     components:
     - type: Transform
@@ -59422,6 +59589,11 @@ entities:
     - type: Transform
       pos: 58.5,8.5
       parent: 2
+  - uid: 20877
+    components:
+    - type: Transform
+      pos: 41.5,18.5
+      parent: 2
   - uid: 21395
     components:
     - type: Transform
@@ -59950,12 +60122,6 @@ entities:
       parent: 2
 - proto: ComputerFrame
   entities:
-  - uid: 7061
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-5.5
-      parent: 2
   - uid: 8066
     components:
     - type: Transform
@@ -60041,24 +60207,24 @@ entities:
     - type: Transform
       pos: 42.5,-32.5
       parent: 2
+  - uid: 6024
+    components:
+    - type: Transform
+      pos: 64.5,-22.5
+      parent: 2
   - uid: 7142
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 57.5,-12.5
       parent: 2
-  - uid: 7427
+- proto: ComputerRoboticsControl
+  entities:
+  - uid: 6023
     components:
     - type: Transform
       pos: 68.5,-25.5
       parent: 2
-- proto: ComputerRoboticsControl
-  entities:
-  - uid: 14228
-    components:
-    - type: Transform
-      pos: 64.5,-22.5
-      parent: 2
 - proto: ComputerSalvageExpedition
   entities:
   - uid: 5707
@@ -60390,13 +60556,19 @@ entities:
   - uid: 7388
     components:
     - type: Transform
+      anchored: True
       pos: 77.5,-15.5
       parent: 2
+    - type: Physics
+      bodyType: Static
   - uid: 7389
     components:
     - type: Transform
+      anchored: True
       pos: 77.5,-11.5
       parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: CrateEmptySpawner
   entities:
   - uid: 4613
@@ -60720,21 +60892,21 @@ entities:
       parent: 2
 - proto: CryogenicSleepUnit
   entities:
-  - uid: 4957
-    components:
-    - type: Transform
-      pos: 62.5,-7.5
-      parent: 2
-  - uid: 4982
-    components:
-    - type: Transform
-      pos: 62.5,-6.5
-      parent: 2
   - uid: 6029
     components:
     - type: Transform
       pos: 3.5,48.5
       parent: 2
+  - uid: 12368
+    components:
+    - type: Transform
+      pos: 61.5,-7.5
+      parent: 2
+  - uid: 16908
+    components:
+    - type: Transform
+      pos: 60.5,-7.5
+      parent: 2
 - proto: CryogenicSleepUnitSpawner
   entities:
   - uid: 5
@@ -60766,24 +60938,19 @@ entities:
   - uid: 6617
     components:
     - type: Transform
-      pos: 61.5,-3.5
+      pos: 58.5,-3.5
       parent: 2
-  - uid: 7039
+  - uid: 6749
     components:
     - type: Transform
-      pos: 59.5,-3.5
+      pos: 60.5,-3.5
       parent: 2
 - proto: CryoxadoneBeakerSmall
   entities:
-  - uid: 7062
+  - uid: 7045
     components:
     - type: Transform
-      pos: 62.372772,-3.182847
-      parent: 2
-  - uid: 7063
-    components:
-    - type: Transform
-      pos: 62.55623,-3.3418446
+      pos: 61.698986,-3.4069648
       parent: 2
 - proto: CurtainsBlackOpen
   entities:
@@ -61558,10 +61725,11 @@ entities:
       parent: 2
 - proto: DisposalBend
   entities:
-  - uid: 755
+  - uid: 6025
     components:
     - type: Transform
-      pos: -20.5,14.5
+      rot: 1.5707963267948966 rad
+      pos: -24.5,19.5
       parent: 2
   - uid: 12923
     components:
@@ -62024,15 +62192,10 @@ entities:
     - type: Transform
       pos: 68.5,-20.5
       parent: 2
-  - uid: 15406
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,14.5
-      parent: 2
-  - uid: 16121
+  - uid: 16258
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -24.5,16.5
       parent: 2
   - uid: 20691
@@ -62105,6 +62268,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,25.5
       parent: 2
+  - uid: 21787
+    components:
+    - type: Transform
+      pos: 19.5,19.5
+      parent: 2
+  - uid: 21804
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,2.5
+      parent: 2
+  - uid: 21829
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,2.5
+      parent: 2
+  - uid: 21842
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,15.5
+      parent: 2
 - proto: DisposalJunction
   entities:
   - uid: 12957
@@ -62343,6 +62529,54 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-42.5
       parent: 2
+  - uid: 6038
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,19.5
+      parent: 2
+  - uid: 6201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,19.5
+      parent: 2
+  - uid: 6591
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,19.5
+      parent: 2
+  - uid: 6747
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,19.5
+      parent: 2
+  - uid: 6751
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,19.5
+      parent: 2
+  - uid: 6753
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,19.5
+      parent: 2
+  - uid: 6938
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,18.5
+      parent: 2
+  - uid: 7380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,17.5
+      parent: 2
   - uid: 9042
     components:
     - type: Transform
@@ -65245,39 +65479,11 @@ entities:
     - type: Transform
       pos: -28.5,12.5
       parent: 2
-  - uid: 14248
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,14.5
-      parent: 2
-  - uid: 14256
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,14.5
-      parent: 2
   - uid: 14257
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -23.5,14.5
-      parent: 2
-  - uid: 14259
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,15.5
-      parent: 2
-  - uid: 14260
-    components:
-    - type: Transform
-      pos: -20.5,12.5
-      parent: 2
-  - uid: 14261
-    components:
-    - type: Transform
-      pos: -20.5,11.5
+      pos: -14.5,19.5
       parent: 2
   - uid: 15396
     components:
@@ -65307,10 +65513,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -25.5,16.5
       parent: 2
-  - uid: 16258
+  - uid: 16103
     components:
     - type: Transform
-      pos: -20.5,13.5
+      rot: 1.5707963267948966 rad
+      pos: -17.5,19.5
+      parent: 2
+  - uid: 17489
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,19.5
       parent: 2
   - uid: 20227
     components:
@@ -65324,6 +65537,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-39.5
       parent: 2
+  - uid: 20284
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,19.5
+      parent: 2
   - uid: 20697
     components:
     - type: Transform
@@ -65795,6 +66014,500 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,23.5
       parent: 2
+  - uid: 21754
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,19.5
+      parent: 2
+  - uid: 21755
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,19.5
+      parent: 2
+  - uid: 21756
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,19.5
+      parent: 2
+  - uid: 21757
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,19.5
+      parent: 2
+  - uid: 21758
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,19.5
+      parent: 2
+  - uid: 21759
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,19.5
+      parent: 2
+  - uid: 21760
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,19.5
+      parent: 2
+  - uid: 21761
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,19.5
+      parent: 2
+  - uid: 21762
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,19.5
+      parent: 2
+  - uid: 21763
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,19.5
+      parent: 2
+  - uid: 21764
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,19.5
+      parent: 2
+  - uid: 21765
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,19.5
+      parent: 2
+  - uid: 21766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,19.5
+      parent: 2
+  - uid: 21767
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,19.5
+      parent: 2
+  - uid: 21768
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,19.5
+      parent: 2
+  - uid: 21769
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,19.5
+      parent: 2
+  - uid: 21770
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,19.5
+      parent: 2
+  - uid: 21771
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,19.5
+      parent: 2
+  - uid: 21772
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,19.5
+      parent: 2
+  - uid: 21773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,19.5
+      parent: 2
+  - uid: 21774
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,19.5
+      parent: 2
+  - uid: 21775
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,19.5
+      parent: 2
+  - uid: 21776
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,19.5
+      parent: 2
+  - uid: 21777
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,19.5
+      parent: 2
+  - uid: 21778
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,19.5
+      parent: 2
+  - uid: 21779
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,19.5
+      parent: 2
+  - uid: 21780
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,19.5
+      parent: 2
+  - uid: 21781
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,19.5
+      parent: 2
+  - uid: 21782
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,19.5
+      parent: 2
+  - uid: 21783
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,19.5
+      parent: 2
+  - uid: 21784
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,19.5
+      parent: 2
+  - uid: 21785
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,19.5
+      parent: 2
+  - uid: 21786
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,19.5
+      parent: 2
+  - uid: 21788
+    components:
+    - type: Transform
+      pos: 19.5,18.5
+      parent: 2
+  - uid: 21789
+    components:
+    - type: Transform
+      pos: 19.5,17.5
+      parent: 2
+  - uid: 21790
+    components:
+    - type: Transform
+      pos: 19.5,16.5
+      parent: 2
+  - uid: 21791
+    components:
+    - type: Transform
+      pos: 19.5,15.5
+      parent: 2
+  - uid: 21792
+    components:
+    - type: Transform
+      pos: 19.5,14.5
+      parent: 2
+  - uid: 21793
+    components:
+    - type: Transform
+      pos: 19.5,13.5
+      parent: 2
+  - uid: 21794
+    components:
+    - type: Transform
+      pos: 19.5,12.5
+      parent: 2
+  - uid: 21795
+    components:
+    - type: Transform
+      pos: 19.5,11.5
+      parent: 2
+  - uid: 21796
+    components:
+    - type: Transform
+      pos: 19.5,10.5
+      parent: 2
+  - uid: 21797
+    components:
+    - type: Transform
+      pos: 19.5,9.5
+      parent: 2
+  - uid: 21798
+    components:
+    - type: Transform
+      pos: 19.5,8.5
+      parent: 2
+  - uid: 21799
+    components:
+    - type: Transform
+      pos: 19.5,7.5
+      parent: 2
+  - uid: 21800
+    components:
+    - type: Transform
+      pos: 19.5,6.5
+      parent: 2
+  - uid: 21801
+    components:
+    - type: Transform
+      pos: 19.5,5.5
+      parent: 2
+  - uid: 21802
+    components:
+    - type: Transform
+      pos: 19.5,4.5
+      parent: 2
+  - uid: 21803
+    components:
+    - type: Transform
+      pos: 19.5,3.5
+      parent: 2
+  - uid: 21805
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,2.5
+      parent: 2
+  - uid: 21806
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,2.5
+      parent: 2
+  - uid: 21807
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,2.5
+      parent: 2
+  - uid: 21808
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,2.5
+      parent: 2
+  - uid: 21809
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,2.5
+      parent: 2
+  - uid: 21810
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,2.5
+      parent: 2
+  - uid: 21811
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,2.5
+      parent: 2
+  - uid: 21812
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,2.5
+      parent: 2
+  - uid: 21813
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,2.5
+      parent: 2
+  - uid: 21814
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,2.5
+      parent: 2
+  - uid: 21815
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,2.5
+      parent: 2
+  - uid: 21816
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,2.5
+      parent: 2
+  - uid: 21817
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,2.5
+      parent: 2
+  - uid: 21818
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,2.5
+      parent: 2
+  - uid: 21819
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,2.5
+      parent: 2
+  - uid: 21820
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,2.5
+      parent: 2
+  - uid: 21821
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,2.5
+      parent: 2
+  - uid: 21822
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,2.5
+      parent: 2
+  - uid: 21823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,2.5
+      parent: 2
+  - uid: 21824
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,2.5
+      parent: 2
+  - uid: 21825
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,2.5
+      parent: 2
+  - uid: 21826
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,2.5
+      parent: 2
+  - uid: 21827
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,2.5
+      parent: 2
+  - uid: 21828
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,2.5
+      parent: 2
+  - uid: 21830
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,3.5
+      parent: 2
+  - uid: 21831
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,4.5
+      parent: 2
+  - uid: 21832
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,5.5
+      parent: 2
+  - uid: 21833
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,6.5
+      parent: 2
+  - uid: 21834
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,7.5
+      parent: 2
+  - uid: 21835
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,8.5
+      parent: 2
+  - uid: 21836
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,9.5
+      parent: 2
+  - uid: 21837
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,10.5
+      parent: 2
+  - uid: 21838
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,11.5
+      parent: 2
+  - uid: 21839
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,12.5
+      parent: 2
+  - uid: 21840
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,13.5
+      parent: 2
+  - uid: 21841
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,14.5
+      parent: 2
 - proto: DisposalTrunk
   entities:
   - uid: 2313
@@ -66025,12 +66738,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -28.5,16.5
       parent: 2
-  - uid: 16118
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,10.5
-      parent: 2
   - uid: 20722
     components:
     - type: Transform
@@ -66055,6 +66762,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,25.5
       parent: 2
+  - uid: 21843
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,15.5
+      parent: 2
 - proto: DisposalUnit
   entities:
   - uid: 950
@@ -66546,10 +67259,10 @@ entities:
       parent: 2
 - proto: DrinkHotCoco
   entities:
-  - uid: 8168
+  - uid: 8858
     components:
     - type: Transform
-      pos: 62.326893,-4.4846063
+      pos: 57.7852,-6.7703786
       parent: 2
 - proto: DrinkHotCoffee
   entities:
@@ -66718,6 +67431,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,29.5
       parent: 2
+  - uid: 5411
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-6.5
+      parent: 2
   - uid: 5991
     components:
     - type: Transform
@@ -67042,12 +67761,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 52.5,-7.5
       parent: 2
-  - uid: 17413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-5.5
-      parent: 2
   - uid: 17414
     components:
     - type: Transform
@@ -67838,6 +68551,18 @@ entities:
       parent: 2
 - proto: FireAlarm
   entities:
+  - uid: 7048
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-6.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8736
+      - 8737
+      - 8738
+      - 12369
   - uid: 9102
     components:
     - type: Transform
@@ -67933,10 +68658,10 @@ entities:
     - type: DeviceList
       devices:
       - 18418
-      - 8753
-      - 8749
-      - 8750
+      - 877
       - 8751
+      - 8750
+      - 8749
   - uid: 17551
     components:
     - type: Transform
@@ -68029,18 +68754,6 @@ entities:
       - 8734
       - 8735
       - 18496
-  - uid: 17558
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-5.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8736
-      - 8737
-      - 8738
-      - 18475
   - uid: 17559
     components:
     - type: Transform
@@ -69598,6 +70311,15 @@ entities:
       parent: 2
 - proto: Firelock
   entities:
+  - uid: 877
+    components:
+    - type: Transform
+      pos: 42.5,15.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17550
+      - 755
   - uid: 2691
     components:
     - type: Transform
@@ -70105,16 +70827,28 @@ entities:
     - type: Transform
       pos: 54.5,-4.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7048
+      - 4744
   - uid: 8737
     components:
     - type: Transform
       pos: 54.5,-3.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7048
+      - 4744
   - uid: 8738
     components:
     - type: Transform
       pos: 59.5,-8.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7048
+      - 4744
   - uid: 8739
     components:
     - type: Transform
@@ -70132,18 +70866,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
-      - 17550
-  - uid: 8753
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 42.5,14.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8369
       - 17550
+      - 755
   - uid: 8754
     components:
     - type: Transform
@@ -70587,6 +71311,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.5,23.5
       parent: 2
+  - uid: 7379
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,14.5
+      parent: 2
   - uid: 8555
     components:
     - type: Transform
@@ -72086,8 +72816,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
       - 17550
+      - 755
   - uid: 8750
     components:
     - type: Transform
@@ -72095,8 +72825,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
       - 17550
+      - 755
   - uid: 8755
     components:
     - type: Transform
@@ -72621,10 +73351,11 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 20605
+  - uid: 17482
     components:
     - type: Transform
-      pos: 43.5,13.5
+      rot: 1.5707963267948966 rad
+      pos: 43.5,14.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -72886,10 +73617,10 @@ entities:
       parent: 2
 - proto: FoodBurgerCheese
   entities:
-  - uid: 16103
+  - uid: 6763
     components:
     - type: Transform
-      pos: -21.500511,10.626959
+      pos: -21.23491,10.5502615
       parent: 2
 - proto: FoodBurgerMime
   entities:
@@ -73075,6 +73806,13 @@ entities:
     - type: Transform
       pos: 65.5,-2.5
       parent: 2
+- proto: GasFilter
+  entities:
+  - uid: 7035
+    components:
+    - type: Transform
+      pos: 60.5,-5.5
+      parent: 2
 - proto: GasMinerCarbonDioxide
   entities:
   - uid: 1093
@@ -73107,21 +73845,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-3.5
       parent: 2
-- proto: GasMixer
-  entities:
-  - uid: 7049
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-6.5
-      parent: 2
 - proto: GasMixerFlipped
   entities:
-  - uid: 877
-    components:
-    - type: Transform
-      pos: 47.5,15.5
-      parent: 2
   - uid: 1098
     components:
     - type: Transform
@@ -73302,16 +74027,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 21.5,-10.5
       parent: 2
-  - uid: 6749
+  - uid: 7017
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 61.5,-4.5
+      pos: 61.5,-6.5
       parent: 2
-  - uid: 7050
+  - uid: 7064
     components:
     - type: Transform
-      pos: 61.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7065
+    components:
+    - type: Transform
+      pos: 61.5,-4.5
       parent: 2
   - uid: 8957
     components:
@@ -73329,6 +74062,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 12370
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-6.5
+      parent: 2
   - uid: 16392
     components:
     - type: Transform
@@ -73704,14 +74443,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18473
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-6.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18484
     components:
     - type: Transform
@@ -74917,17 +75648,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 20516
-    components:
-    - type: Transform
-      pos: 61.5,-3.5
-      parent: 2
-  - uid: 20614
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,15.5
-      parent: 2
   - uid: 21106
     components:
     - type: Transform
@@ -74938,7 +75658,7 @@ entities:
       color: '#FF1212FF'
 - proto: GasPipeFourway
   entities:
-  - uid: 7044
+  - uid: 7063
     components:
     - type: Transform
       pos: 60.5,-4.5
@@ -75539,6 +76259,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 76.5,-12.5
       parent: 2
+  - uid: 7051
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7052
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-11.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7055
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-9.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7367
     components:
     - type: Transform
@@ -75587,6 +76331,26 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 79.5,-12.5
       parent: 2
+  - uid: 8373
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 8500
+    components:
+    - type: Transform
+      pos: 48.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8857
+    components:
+    - type: Transform
+      pos: 61.5,-5.5
+      parent: 2
   - uid: 9252
     components:
     - type: Transform
@@ -79647,46 +80411,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18458
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 49.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18459
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 50.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18460
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 51.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18461
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18462
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18463
     components:
     - type: Transform
@@ -79703,22 +80427,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18465
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18466
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 55.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18467
     components:
     - type: Transform
@@ -79735,14 +80443,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18470
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18476
     components:
     - type: Transform
@@ -86893,14 +87593,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 19928
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 19929
     components:
     - type: Transform
@@ -88410,19 +89102,10 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 20515
+  - uid: 20285
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 20615
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,15.5
+      pos: 45.5,15.5
       parent: 2
   - uid: 20618
     components:
@@ -88526,12 +89209,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 4744
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-4.5
-      parent: 2
   - uid: 5982
     components:
     - type: Transform
@@ -88540,6 +89217,34 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 7058
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-4.5
+      parent: 2
+  - uid: 7061
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-4.5
+      parent: 2
+  - uid: 7062
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8168
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8844
     components:
     - type: Transform
@@ -89371,21 +90076,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18454
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18469
-    components:
-    - type: Transform
-      pos: 57.5,-4.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 18485
     components:
     - type: Transform
@@ -90357,19 +91047,18 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 20514
-    components:
-    - type: Transform
-      pos: 59.5,-3.5
-      parent: 2
   - uid: 21105
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: 54.5,-34.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
 - proto: GasPort
   entities:
   - uid: 1198
@@ -90432,18 +91121,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 75.5,-16.5
       parent: 2
-  - uid: 7051
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-7.5
-      parent: 2
-  - uid: 7052
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-7.5
-      parent: 2
   - uid: 9103
     components:
     - type: Transform
@@ -90452,18 +91129,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9276
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 45.5,14.5
-      parent: 2
-  - uid: 9277
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 47.5,14.5
-      parent: 2
   - uid: 20213
     components:
     - type: Transform
@@ -90483,6 +91148,12 @@ entities:
     - type: Transform
       pos: 16.5,-10.5
       parent: 2
+  - uid: 21753
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,14.5
+      parent: 2
 - proto: GasPressurePump
   entities:
   - uid: 1204
@@ -90578,49 +91249,19 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7045
+  - uid: 7056
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 58.5,-4.5
+      pos: 57.5,-4.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7048
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-5.5
-      parent: 2
-  - uid: 7377
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 77.5,-12.5
-      parent: 2
-  - uid: 7378
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 77.5,-16.5
-      parent: 2
-  - uid: 7379
+  - uid: 7057
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 77.5,-18.5
-      parent: 2
-  - uid: 7380
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-14.5
-      parent: 2
-  - uid: 16908
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-3.5
+      pos: 59.5,-5.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -90638,10 +91279,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 29.5,-13.5
       parent: 2
-  - uid: 7040
+  - uid: 18459
     components:
     - type: Transform
-      pos: 60.5,-3.5
+      pos: 59.5,-3.5
       parent: 2
 - proto: GasThermoMachineFreezerEnabled
   entities:
@@ -90676,6 +91317,16 @@ entities:
       parent: 2
 - proto: GasVentPump
   entities:
+  - uid: 7019
+    components:
+    - type: Transform
+      pos: 59.5,-7.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 4744
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 9034
     components:
     - type: Transform
@@ -90955,7 +91606,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
+      - 755
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18426
@@ -90973,14 +91624,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18472
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-5.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 18498
     components:
     - type: Transform
@@ -91363,22 +92006,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 19301
+  - uid: 19303
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -55.5,-46.5
+      rot: 3.141592653589793 rad
+      pos: -57.5,-57.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 19302
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 19314
     components:
     - type: Transform
@@ -91713,19 +92348,27 @@ entities:
   - uid: 20164
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -56.5,-57.5
+      rot: 1.5707963267948966 rad
+      pos: -55.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 20167
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -38.5,-57.5
+      rot: -1.5707963267948966 rad
+      pos: -39.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
+  - uid: 20169
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 20195
     components:
     - type: Transform
@@ -91759,12 +92402,25 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -37.5,12.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 3102
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 34.5,-12.5
       parent: 2
+  - uid: 4957
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-6.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 4744
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9078
     components:
     - type: Transform
@@ -92055,7 +92711,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
+      - 755
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18427
@@ -92074,13 +92730,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18474
-    components:
-    - type: Transform
-      pos: 58.5,-5.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18497
     components:
     - type: Transform
@@ -92431,18 +93080,26 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -55.5,-47.5
+      pos: -55.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 19303
+      color: '#FF1212FF'
+  - uid: 19301
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -39.5,-47.5
+      pos: -39.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
+  - uid: 19302
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -38.5,-57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 19307
     components:
     - type: Transform
@@ -92794,18 +93451,10 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -57.5,-57.5
+      pos: -56.5,-57.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 20169
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -37.5,-57.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 21102
     components:
     - type: Transform
@@ -92817,6 +93466,32 @@ entities:
       - 21113
     - type: AtmosPipeColor
       color: '#FF1212FF'
+- proto: GasVolumePump
+  entities:
+  - uid: 9163
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-18.5
+      parent: 2
+  - uid: 9276
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-12.5
+      parent: 2
+  - uid: 9277
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-16.5
+      parent: 2
+  - uid: 9978
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-14.5
+      parent: 2
 - proto: GeneratorBasic
   entities:
   - uid: 5917
@@ -92829,6 +93504,18 @@ entities:
     - type: Transform
       pos: 65.5,-49.5
       parent: 2
+- proto: GenericTank
+  entities:
+  - uid: 5960
+    components:
+    - type: Transform
+      pos: 82.5,-10.5
+      parent: 2
+  - uid: 21621
+    components:
+    - type: Transform
+      pos: -13.5,-13.5
+      parent: 2
 - proto: Girder
   entities:
   - uid: 21208
@@ -95070,12 +95757,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 61.5,4.5
       parent: 2
-  - uid: 6938
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 43.5,19.5
-      parent: 2
   - uid: 6944
     components:
     - type: Transform
@@ -95628,10 +96309,9 @@ entities:
     - type: Transform
       pos: -13.5,-42.5
       parent: 2
-  - uid: 15599
+  - uid: 15601
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 41.5,19.5
       parent: 2
   - uid: 15860
@@ -97357,16 +98037,6 @@ entities:
     - type: Transform
       pos: -0.5,-42.5
       parent: 2
-  - uid: 15600
-    components:
-    - type: Transform
-      pos: 41.5,17.5
-      parent: 2
-  - uid: 15602
-    components:
-    - type: Transform
-      pos: 41.5,20.5
-      parent: 2
   - uid: 15960
     components:
     - type: Transform
@@ -97688,11 +98358,6 @@ entities:
     - type: Transform
       pos: -9.5,-42.5
       parent: 2
-  - uid: 15601
-    components:
-    - type: Transform
-      pos: 41.5,18.5
-      parent: 2
   - uid: 15608
     components:
     - type: Transform
@@ -98285,11 +98950,6 @@ entities:
       parent: 2
 - proto: HandLabeler
   entities:
-  - uid: 1440
-    components:
-    - type: Transform
-      pos: 46.023155,16.415075
-      parent: 2
   - uid: 5754
     components:
     - type: Transform
@@ -98300,6 +98960,11 @@ entities:
     - type: Transform
       pos: 71.5145,-14.448126
       parent: 2
+  - uid: 15406
+    components:
+    - type: Transform
+      pos: -50.496944,-12.854496
+      parent: 2
   - uid: 16923
     components:
     - type: Transform
@@ -99134,11 +99799,6 @@ entities:
     - type: Transform
       pos: -20.5,15.5
       parent: 2
-  - uid: 4676
-    components:
-    - type: Transform
-      pos: 44.5,13.5
-      parent: 2
   - uid: 5251
     components:
     - type: Transform
@@ -99164,6 +99824,11 @@ entities:
     - type: Transform
       pos: -54.5,-36.5
       parent: 2
+  - uid: 21751
+    components:
+    - type: Transform
+      pos: 45.5,12.5
+      parent: 2
 - proto: KitchenSpike
   entities:
   - uid: 1472
@@ -99448,10 +100113,10 @@ entities:
           ent: null
 - proto: LockerChemistryFilled
   entities:
-  - uid: 6020
+  - uid: 21750
     components:
     - type: Transform
-      pos: 44.5,11.5
+      pos: 47.5,14.5
       parent: 2
 - proto: LockerChiefEngineerFilled
   entities:
@@ -100267,17 +100932,17 @@ entities:
       - 5555
 - proto: MachineCentrifuge
   entities:
-  - uid: 20617
+  - uid: 14259
     components:
     - type: Transform
-      pos: 46.5,16.5
+      pos: 44.5,16.5
       parent: 2
 - proto: MachineElectrolysisUnit
   entities:
-  - uid: 20616
+  - uid: 20605
     components:
     - type: Transform
-      pos: 45.5,16.5
+      pos: 43.5,16.5
       parent: 2
 - proto: MachineFrame
   entities:
@@ -100401,11 +101066,21 @@ entities:
     - type: Transform
       pos: -28.5,16.5
       parent: 2
-  - uid: 17482
+    - type: MailingUnit
+      tag: Botany
+    - type: Configuration
+      config:
+        tag: Botany
+  - uid: 5744
     components:
     - type: Transform
-      pos: -20.5,10.5
+      pos: 45.5,15.5
       parent: 2
+    - type: MailingUnit
+      tag: Chemistry
+    - type: Configuration
+      config:
+        tag: Chemistry
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 1494
@@ -100655,16 +101330,16 @@ entities:
     - type: Transform
       pos: 54.47062,1.5245901
       parent: 2
-  - uid: 6751
-    components:
-    - type: Transform
-      pos: 54.45839,1.6958185
-      parent: 2
   - uid: 16507
     components:
     - type: Transform
       pos: -66.463234,-26.53495
       parent: 2
+  - uid: 21850
+    components:
+    - type: Transform
+      pos: 54.53653,1.3832933
+      parent: 2
 - proto: MedkitBurnFilled
   entities:
   - uid: 6752
@@ -100672,10 +101347,10 @@ entities:
     - type: Transform
       pos: 54.984303,1.5490514
       parent: 2
-  - uid: 6753
+  - uid: 21851
     components:
     - type: Transform
-      pos: 54.984303,1.7569715
+      pos: 55.020905,1.3676683
       parent: 2
 - proto: MedkitCombatFilled
   entities:
@@ -100701,16 +101376,16 @@ entities:
     - type: Transform
       pos: 53.479942,1.5368208
       parent: 2
-  - uid: 6747
-    components:
-    - type: Transform
-      pos: 53.492172,1.7202798
-      parent: 2
   - uid: 16524
     components:
     - type: Transform
       pos: 13.522673,32.605183
       parent: 2
+  - uid: 21848
+    components:
+    - type: Transform
+      pos: 53.47403,1.3676683
+      parent: 2
 - proto: MedkitRadiationFilled
   entities:
   - uid: 4463
@@ -100811,16 +101486,16 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 6591
-    components:
-    - type: Transform
-      pos: 53.990242,1.7065567
-      parent: 2
   - uid: 6592
     components:
     - type: Transform
       pos: 54.002472,1.5230979
       parent: 2
+  - uid: 21849
+    components:
+    - type: Transform
+      pos: 54.00528,1.3520433
+      parent: 2
 - proto: MedkitToxinFilled
   entities:
   - uid: 6754
@@ -100828,10 +101503,10 @@ entities:
     - type: Transform
       pos: 55.49799,1.5245901
       parent: 2
-  - uid: 6755
+  - uid: 21852
     components:
     - type: Transform
-      pos: 55.51022,1.6958185
+      pos: 55.50528,1.3676683
       parent: 2
 - proto: Memorial
   entities:
@@ -103631,6 +104306,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 15610
   - uid: 1666
     components:
     - type: Transform
@@ -103834,6 +104512,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 14879
   - uid: 1688
     components:
     - type: Transform
@@ -103843,6 +104524,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 16121
   - uid: 1689
     components:
     - type: Transform
@@ -104015,6 +104699,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 7054
   - uid: 2907
     components:
     - type: Transform
@@ -104222,6 +104909,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 7032
   - uid: 4276
     components:
     - type: Transform
@@ -105025,16 +105715,11 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 7037
+  - uid: 7049
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-4.5
+      pos: 59.5,-3.5
       parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 7067
     components:
     - type: Transform
@@ -105122,6 +105807,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 7039
   - uid: 7421
     components:
     - type: Transform
@@ -106390,6 +107078,11 @@ entities:
     - type: Transform
       pos: 65.5,-54.5
       parent: 2
+  - uid: 18462
+    components:
+    - type: Transform
+      pos: 58.5,-7.5
+      parent: 2
   - uid: 19814
     components:
     - type: Transform
@@ -108212,11 +108905,6 @@ entities:
     - type: Transform
       pos: 46.5,19.5
       parent: 2
-  - uid: 15294
-    components:
-    - type: Transform
-      pos: 41.5,16.5
-      parent: 2
   - uid: 15295
     components:
     - type: Transform
@@ -108774,6 +109462,16 @@ entities:
     - type: Transform
       pos: 1.5,-28.5
       parent: 2
+  - uid: 5997
+    components:
+    - type: Transform
+      pos: 40.5,13.5
+      parent: 2
+  - uid: 7040
+    components:
+    - type: Transform
+      pos: 57.5,-8.5
+      parent: 2
   - uid: 8794
     components:
     - type: Transform
@@ -109134,18 +109832,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 61.5,2.5
       parent: 2
-  - uid: 8857
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-8.5
-      parent: 2
-  - uid: 8858
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-8.5
-      parent: 2
   - uid: 8859
     components:
     - type: Transform
@@ -109164,12 +109850,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 56.5,13.5
       parent: 2
-  - uid: 8862
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 41.5,14.5
-      parent: 2
   - uid: 8863
     components:
     - type: Transform
@@ -109535,6 +110215,11 @@ entities:
     - type: Transform
       pos: 41.5,-31.5
       parent: 2
+  - uid: 18461
+    components:
+    - type: Transform
+      pos: 58.5,-8.5
+      parent: 2
 - proto: RandomProduce
   entities:
   - uid: 21375
@@ -109845,11 +110530,6 @@ entities:
     - type: Transform
       pos: 32.5,-28.5
       parent: 2
-  - uid: 8500
-    components:
-    - type: Transform
-      pos: 59.5,-5.5
-      parent: 2
   - uid: 16478
     components:
     - type: Transform
@@ -111968,6 +112648,11 @@ entities:
     - type: Transform
       pos: 77.5,-5.5
       parent: 2
+  - uid: 12256
+    components:
+    - type: Transform
+      pos: 41.5,19.5
+      parent: 2
   - uid: 13965
     components:
     - type: Transform
@@ -112298,12 +112983,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,40.5
       parent: 2
-  - uid: 16576
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 43.5,19.5
-      parent: 2
   - uid: 16683
     components:
     - type: Transform
@@ -112545,6 +113224,11 @@ entities:
     - type: Transform
       pos: 71.5,-19.5
       parent: 2
+  - uid: 14883
+    components:
+    - type: Transform
+      pos: -45.5,-5.5
+      parent: 2
   - uid: 16012
     components:
     - type: Transform
@@ -113210,6 +113894,23 @@ entities:
     - type: DeviceLinkSink
       links:
       - 5653
+  - uid: 7033
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,14.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 18465
+  - uid: 7377
+    components:
+    - type: Transform
+      pos: -20.5,10.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 15913
   - uid: 8280
     components:
     - type: Transform
@@ -113432,7 +114133,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 17489
+      - 21844
   - uid: 17479
     components:
     - type: Transform
@@ -113441,7 +114142,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 17489
+      - 21844
   - uid: 17480
     components:
     - type: Transform
@@ -113450,7 +114151,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 17489
+      - 21844
   - uid: 17492
     components:
     - type: Transform
@@ -113606,6 +114307,15 @@ entities:
     - type: DeviceLinkSink
       links:
       - 17520
+  - uid: 19928
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,15.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 18465
   - uid: 20807
     components:
     - type: Transform
@@ -113918,6 +114628,18 @@ entities:
       linkedPorts:
         7:
         - Pressed: DoorBolt
+  - uid: 15610
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-25.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        1665:
+        - Pressed: Toggle
   - uid: 20353
     components:
     - type: Transform
@@ -114030,6 +114752,42 @@ entities:
         - Pressed: Toggle
         6905:
         - Pressed: DoorBolt
+  - uid: 7032
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 37.5,11.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        4257:
+        - Pressed: Toggle
+  - uid: 7039
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-22.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        7289:
+        - Pressed: Toggle
+  - uid: 7054
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,-31.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        2871:
+        - Pressed: Toggle
   - uid: 7937
     components:
     - type: MetaData
@@ -114144,6 +114902,18 @@ entities:
       linkedPorts:
         20777:
         - Pressed: Toggle
+  - uid: 14879
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-11.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        1686:
+        - Pressed: Toggle
   - uid: 15913
     components:
     - type: Transform
@@ -114162,6 +114932,20 @@ entities:
         - Pressed: Toggle
         21746:
         - Pressed: Toggle
+        7377:
+        - Pressed: Toggle
+  - uid: 16121
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-11.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        1688:
+        - Pressed: Toggle
   - uid: 16148
     components:
     - type: Transform
@@ -114246,20 +115030,6 @@ entities:
         - Pressed: Toggle
         20827:
         - Pressed: Toggle
-  - uid: 17489
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,10.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        17479:
-        - Pressed: Toggle
-        17478:
-        - Pressed: Toggle
-        17480:
-        - Pressed: Toggle
   - uid: 17491
     components:
     - type: Transform
@@ -114406,6 +115176,17 @@ entities:
         - Pressed: DoorBolt
         2908:
         - Pressed: Toggle
+  - uid: 18465
+    components:
+    - type: Transform
+      pos: 35.5,16.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        7033:
+        - Pressed: Toggle
+        19928:
+        - Pressed: Toggle
   - uid: 20319
     components:
     - type: Transform
@@ -114490,6 +115271,20 @@ entities:
         - Pressed: DoorBolt
         - Pressed: Close
         - Pressed: AutoClose
+  - uid: 21844
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,10.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        17478:
+        - Pressed: Toggle
+        17480:
+        - Pressed: Toggle
+        17479:
+        - Pressed: Toggle
 - proto: SignAnomaly
   entities:
   - uid: 8366
@@ -114592,6 +115387,13 @@ entities:
     - type: Transform
       pos: 41.5,10.5
       parent: 2
+- proto: SignChemistry2
+  entities:
+  - uid: 8369
+    components:
+    - type: Transform
+      pos: 42.5,16.5
+      parent: 2
 - proto: SignConference
   entities:
   - uid: 2699
@@ -115612,6 +116414,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,45.5
       parent: 2
+  - uid: 6755
+    components:
+    - type: Transform
+      pos: -20.5,12.5
+      parent: 2
   - uid: 8239
     components:
     - type: Transform
@@ -115622,15 +116429,11 @@ entities:
     - type: Transform
       pos: 15.5,26.5
       parent: 2
-  - uid: 9163
+  - uid: 9024
     components:
     - type: Transform
-      pos: 43.5,13.5
-      parent: 2
-  - uid: 12460
-    components:
-    - type: Transform
-      pos: -20.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: 43.5,14.5
       parent: 2
   - uid: 14218
     components:
@@ -115749,7 +116552,7 @@ entities:
     - type: Transform
       pos: 88.5,-22.5
       parent: 2
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 2102
     components:
@@ -116285,7 +117088,7 @@ entities:
       parent: 2
 - proto: SolidSecretDoor
   entities:
-  - uid: 21043
+  - uid: 2339
     components:
     - type: Transform
       pos: -35.5,-42.5
@@ -116589,7 +117392,7 @@ entities:
       parent: 2
 - proto: SpawnPointChef
   entities:
-  - uid: 2119
+  - uid: 16118
     components:
     - type: Transform
       pos: -20.5,12.5
@@ -118973,17 +119776,6 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: Lobby
-  - uid: 9024
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 44.5,13.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraMedical
-      nameSet: True
-      id: Chemistry
   - uid: 9025
     components:
     - type: Transform
@@ -119091,6 +119883,17 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: Virology
+  - uid: 14256
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,16.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Chemistry
 - proto: SurveillanceCameraRouterCommand
   entities:
   - uid: 7976
@@ -119841,10 +120644,10 @@ entities:
       parent: 2
 - proto: Syringe
   entities:
-  - uid: 7064
+  - uid: 8193
     components:
     - type: Transform
-      pos: 62.629612,-3.733224
+      pos: 61.51553,-3.394734
       parent: 2
   - uid: 16540
     components:
@@ -120469,6 +121272,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,35.5
       parent: 2
+  - uid: 14753
+    components:
+    - type: Transform
+      pos: -20.5,10.5
+      parent: 2
   - uid: 15092
     components:
     - type: Transform
@@ -121306,11 +122114,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,26.5
       parent: 2
-  - uid: 5118
-    components:
-    - type: Transform
-      pos: 45.5,16.5
-      parent: 2
   - uid: 5428
     components:
     - type: Transform
@@ -121395,11 +122198,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,10.5
       parent: 2
-  - uid: 6038
-    components:
-    - type: Transform
-      pos: 44.5,13.5
-      parent: 2
   - uid: 6582
     components:
     - type: Transform
@@ -121478,21 +122276,15 @@ entities:
     - type: Transform
       pos: 61.5,15.5
       parent: 2
+  - uid: 7044
+    components:
+    - type: Transform
+      pos: 57.5,-6.5
+      parent: 2
   - uid: 7053
     components:
     - type: Transform
-      pos: 62.5,-3.5
-      parent: 2
-  - uid: 7054
-    components:
-    - type: Transform
-      pos: 62.5,-4.5
-      parent: 2
-  - uid: 7057
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-7.5
+      pos: 61.5,-3.5
       parent: 2
   - uid: 7097
     components:
@@ -121567,6 +122359,11 @@ entities:
     - type: Transform
       pos: 71.5,-7.5
       parent: 2
+  - uid: 7427
+    components:
+    - type: Transform
+      pos: 44.5,16.5
+      parent: 2
   - uid: 7616
     components:
     - type: Transform
@@ -121646,11 +122443,11 @@ entities:
     - type: Transform
       pos: 75.5,-11.5
       parent: 2
-  - uid: 12255
+  - uid: 8753
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,13.5
+      rot: 3.141592653589793 rad
+      pos: 45.5,12.5
       parent: 2
   - uid: 15813
     components:
@@ -121672,6 +122469,12 @@ entities:
     - type: Transform
       pos: -31.5,14.5
       parent: 2
+  - uid: 16576
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,12.5
+      parent: 2
   - uid: 17537
     components:
     - type: Transform
@@ -121684,6 +122487,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,13.5
       parent: 2
+  - uid: 18460
+    components:
+    - type: Transform
+      pos: 57.5,-7.5
+      parent: 2
   - uid: 20250
     components:
     - type: Transform
@@ -121693,7 +122501,7 @@ entities:
   - uid: 20606
     components:
     - type: Transform
-      pos: 46.5,16.5
+      pos: 43.5,16.5
       parent: 2
   - uid: 20995
     components:
@@ -122913,18 +123721,18 @@ entities:
       parent: 2
 - proto: VendingMachineChemDrobe
   entities:
-  - uid: 6024
-    components:
-    - type: Transform
-      pos: 41.5,13.5
-      parent: 2
-- proto: VendingMachineChemicals
-  entities:
-  - uid: 6023
+  - uid: 5996
     components:
     - type: Transform
       pos: 41.5,12.5
       parent: 2
+- proto: VendingMachineChemicals
+  entities:
+  - uid: 711
+    components:
+    - type: Transform
+      pos: 41.5,13.5
+      parent: 2
 - proto: VendingMachineCigs
   entities:
   - uid: 2337
@@ -122952,6 +123760,11 @@ entities:
     - type: Transform
       pos: 13.5,-33.5
       parent: 2
+  - uid: 20607
+    components:
+    - type: Transform
+      pos: -21.5,-4.5
+      parent: 2
 - proto: VendingMachineClothing
   entities:
   - uid: 1593
@@ -122959,11 +123772,6 @@ entities:
     - type: Transform
       pos: 38.5,0.5
       parent: 2
-  - uid: 2339
-    components:
-    - type: Transform
-      pos: -21.5,-4.5
-      parent: 2
   - uid: 2340
     components:
     - type: Transform
@@ -122974,6 +123782,11 @@ entities:
     - type: Transform
       pos: 52.5,-21.5
       parent: 2
+  - uid: 20610
+    components:
+    - type: Transform
+      pos: -21.5,-3.5
+      parent: 2
 - proto: VendingMachineCoffee
   entities:
   - uid: 2341
@@ -123162,11 +123975,6 @@ entities:
       parent: 2
 - proto: VendingMachineTankDispenserEngineering
   entities:
-  - uid: 2352
-    components:
-    - type: Transform
-      pos: -9.5,-25.5
-      parent: 2
   - uid: 2353
     components:
     - type: Transform
@@ -123189,6 +123997,11 @@ entities:
     - type: Transform
       pos: -31.5,35.5
       parent: 2
+  - uid: 20608
+    components:
+    - type: Transform
+      pos: -9.5,-25.5
+      parent: 2
 - proto: VendingMachineTheater
   entities:
   - uid: 2354
@@ -123227,11 +124040,6 @@ entities:
     - type: Transform
       pos: 29.5,-26.5
       parent: 2
-  - uid: 2357
-    components:
-    - type: Transform
-      pos: -21.5,-3.5
-      parent: 2
   - uid: 2358
     components:
     - type: Transform
@@ -125990,11 +126798,6 @@ entities:
     - type: Transform
       pos: 44.5,19.5
       parent: 2
-  - uid: 5744
-    components:
-    - type: Transform
-      pos: 42.5,17.5
-      parent: 2
   - uid: 5762
     components:
     - type: Transform
@@ -126283,27 +127086,11 @@ entities:
     - type: Transform
       pos: 40.5,13.5
       parent: 2
-  - uid: 5960
-    components:
-    - type: Transform
-      pos: 41.5,16.5
-      parent: 2
   - uid: 5963
     components:
     - type: Transform
       pos: 41.5,14.5
       parent: 2
-  - uid: 5965
-    components:
-    - type: Transform
-      pos: 43.5,14.5
-      parent: 2
-  - uid: 5998
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,15.5
-      parent: 2
   - uid: 6000
     components:
     - type: Transform
@@ -127165,30 +127952,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 61.5,-8.5
       parent: 2
-  - uid: 7032
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-7.5
-      parent: 2
-  - uid: 7033
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-6.5
-      parent: 2
-  - uid: 7035
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-4.5
-      parent: 2
-  - uid: 7036
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-3.5
-      parent: 2
   - uid: 7066
     components:
     - type: Transform
@@ -128435,6 +129198,11 @@ entities:
     - type: Transform
       pos: 76.5,-32.5
       parent: 2
+  - uid: 12255
+    components:
+    - type: Transform
+      pos: 43.5,19.5
+      parent: 2
   - uid: 12462
     components:
     - type: Transform
@@ -128608,6 +129376,11 @@ entities:
     - type: Transform
       pos: 7.5,-45.5
       parent: 2
+  - uid: 15599
+    components:
+    - type: Transform
+      pos: 43.5,17.5
+      parent: 2
   - uid: 15847
     components:
     - type: Transform
@@ -129031,6 +129804,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 54.5,-29.5
       parent: 2
+  - uid: 18469
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-6.5
+      parent: 2
+  - uid: 18470
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-7.5
+      parent: 2
+  - uid: 18475
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-4.5
+      parent: 2
   - uid: 20303
     components:
     - type: Transform
@@ -129190,6 +129981,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-49.5
       parent: 2
+  - uid: 21748
+    components:
+    - type: Transform
+      pos: 42.5,16.5
+      parent: 2
 - proto: WallReinforcedRust
   entities:
   - uid: 2330
@@ -131838,12 +132634,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 10.5,33.5
       parent: 2
-  - uid: 5411
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-2.5
-      parent: 2
   - uid: 5423
     components:
     - type: Transform
@@ -132000,12 +132790,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,19.5
       parent: 2
-  - uid: 5745
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 42.5,18.5
-      parent: 2
   - uid: 5789
     components:
     - type: Transform
@@ -132306,18 +133090,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 48.5,10.5
       parent: 2
-  - uid: 5996
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,14.5
-      parent: 2
-  - uid: 5997
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,16.5
-      parent: 2
   - uid: 5999
     components:
     - type: Transform
@@ -132552,12 +133324,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -42.5,-50.5
       parent: 2
-  - uid: 6201
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 42.5,16.5
-      parent: 2
   - uid: 6202
     components:
     - type: Transform
@@ -133289,18 +134055,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 62.5,-8.5
       parent: 2
-  - uid: 7017
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-8.5
-      parent: 2
-  - uid: 7019
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-5.5
-      parent: 2
   - uid: 7030
     components:
     - type: Transform
@@ -133690,6 +134444,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 74.5,-4.5
       parent: 2
+  - uid: 7378
+    components:
+    - type: Transform
+      pos: 42.5,14.5
+      parent: 2
   - uid: 7390
     components:
     - type: Transform
@@ -135652,6 +136411,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-48.5
       parent: 2
+  - uid: 17558
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-3.5
+      parent: 2
+  - uid: 18472
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-5.5
+      parent: 2
+  - uid: 18473
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-6.5
+      parent: 2
   - uid: 19807
     components:
     - type: Transform
@@ -135826,6 +136603,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 60.5,7.5
       parent: 2
+  - uid: 21647
+    components:
+    - type: Transform
+      pos: 42.5,17.5
+      parent: 2
 - proto: WallShuttle
   entities:
   - uid: 21142
@@ -141507,11 +142289,6 @@ entities:
       parent: 2
 - proto: WeldingFuelTankFull
   entities:
-  - uid: 3480
-    components:
-    - type: Transform
-      pos: -13.5,-13.5
-      parent: 2
   - uid: 3481
     components:
     - type: Transform
@@ -141967,6 +142744,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,10.5
       parent: 2
+  - uid: 8862
+    components:
+    - type: Transform
+      pos: 46.5,15.5
+      parent: 2
   - uid: 18993
     components:
     - type: Transform
@@ -142109,6 +142891,12 @@ entities:
       parent: 2
 - proto: WindoorSecureMedicalLocked
   entities:
+  - uid: 4676
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,1.5
+      parent: 2
   - uid: 5773
     components:
     - type: Transform
@@ -142620,6 +143408,12 @@ entities:
     - type: Transform
       pos: 2.5,32.5
       parent: 2
+  - uid: 5118
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,15.5
+      parent: 2
   - uid: 5453
     components:
     - type: Transform
@@ -142830,11 +143624,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-17.5
       parent: 2
+  - uid: 14260
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,16.5
+      parent: 2
   - uid: 15404
     components:
     - type: Transform
       pos: -20.5,10.5
       parent: 2
+  - uid: 15602
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,1.5
+      parent: 2
   - uid: 15843
     components:
     - type: Transform
@@ -142915,6 +143721,23 @@ entities:
     - type: Transform
       pos: 2.5,-9.5
       parent: 2
+  - uid: 21752
+    components:
+    - type: Transform
+      pos: 47.5,15.5
+      parent: 2
+  - uid: 21846
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,1.5
+      parent: 2
+  - uid: 21847
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,1.5
+      parent: 2
 - proto: WoodDoor
   entities:
   - uid: 3557
@@ -143057,6 +143880,11 @@ entities:
     - type: Transform
       pos: -3.4365067,-12.554331
       parent: 2
+  - uid: 5745
+    components:
+    - type: Transform
+      pos: 45.357437,14.368599
+      parent: 2
   - uid: 5753
     components:
     - type: Transform
@@ -143077,9 +143905,4 @@ entities:
     - type: Transform
       pos: 1.7595062,-8.203196
       parent: 21128
-  - uid: 21373
-    components:
-    - type: Transform
-      pos: 46.224125,16.563536
-      parent: 2
 ...
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 3f2bd76d4f..4231599624 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -783,7 +783,7 @@ entities:
             2: 57344
           8,5:
             0: 272
-            4: 17472
+            3: 17472
           8,6:
             2: 65345
           8,7:
@@ -824,10 +824,10 @@ entities:
             0: 53759
           11,2:
             0: 4319
-            3: 49152
+            4: 49152
           11,3:
             0: 61457
-            3: 204
+            4: 204
           11,-1:
             0: 30583
           11,4:
@@ -839,9 +839,9 @@ entities:
             0: 28791
           12,2:
             0: 119
-            3: 28672
+            4: 28672
           12,3:
-            3: 119
+            4: 119
             0: 61440
           12,-1:
             0: 29311
@@ -1260,16 +1260,16 @@ entities:
             2: 65534
           9,5:
             5: 4368
-            3: 17472
+            4: 17472
           9,6:
             2: 7936
           10,5:
-            3: 4368
+            4: 4368
             6: 17472
           10,6:
             2: 3840
           11,5:
-            3: 21840
+            4: 21840
           11,6:
             2: 3856
           12,5:
@@ -1429,7 +1429,7 @@ entities:
           temperature: 293.15
           moles:
           - 0
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -1444,7 +1444,7 @@ entities:
           temperature: 293.15
           moles:
           - 0
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -31676,13 +31676,6 @@ entities:
     - type: Transform
       pos: 29.614664,-1.306627
       parent: 31
-- proto: Dresser
-  entities:
-  - uid: 9049
-    components:
-    - type: Transform
-      pos: 7.5,16.5
-      parent: 31
 - proto: DresserCaptainFilled
   entities:
   - uid: 11383
@@ -31706,10 +31699,10 @@ entities:
       parent: 31
 - proto: DresserHeadOfPersonnelFilled
   entities:
-  - uid: 11384
+  - uid: 7085
     components:
     - type: Transform
-      pos: 9.5,16.5
+      pos: 7.5,16.5
       parent: 31
 - proto: DresserHeadOfSecurityFilled
   entities:
@@ -32398,8 +32391,6 @@ entities:
     - type: Transform
       pos: 9.5,12.5
       parent: 31
-    - type: ItemCabinet
-      opened: True
   - uid: 4916
     components:
     - type: Transform
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 7881cddd4a..72412fde7c 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -28,7 +28,7 @@
 
 - type: entity
   id: AlertSpriteView
-  categories: [ hideSpawnMenu ]
+  categories: [ HideSpawnMenu  ]
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Alerts/revenant.yml b/Resources/Prototypes/Alerts/revenant.yml
index 7f3f98949e..38933df4fe 100644
--- a/Resources/Prototypes/Alerts/revenant.yml
+++ b/Resources/Prototypes/Alerts/revenant.yml
@@ -16,7 +16,7 @@
 
 - type: entity
   id: AlertEssenceSpriteView
-  categories: [ hideSpawnMenu ]
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: /Textures/Interface/Alerts/essence_counter.rsi
diff --git a/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml b/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
deleted file mode 100644
index 7fb0367295..0000000000
--- a/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: messagePack
-  id: BlockGameAds
-  messages:
-    - advertisement-block-game-1
-    - advertisement-block-game-2
-    - advertisement-block-game-3
-    - advertisement-block-game-4
-    - advertisement-block-game-5
-    - advertisement-block-game-6
-    - advertisement-block-game-7
-    - advertisement-block-game-8
-    - advertisement-block-game-9
-    - advertisement-block-game-10
-    - advertisement-block-game-11
-    - advertisement-block-game-12
-    - advertisement-block-game-13
diff --git a/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml b/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
deleted file mode 100644
index 7c94ab94f6..0000000000
--- a/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: messagePack
-  id: SpaceVillainAds
-  messages:
-    - advertisement-space-villain-1
-    - advertisement-space-villain-2
-    - advertisement-space-villain-3
-    - advertisement-space-villain-4
-    - advertisement-space-villain-5
-    - advertisement-space-villain-6
-    - advertisement-space-villain-7
-    - advertisement-space-villain-8
-    - advertisement-space-villain-9
-    - advertisement-space-villain-10
-    - advertisement-space-villain-11
-    - advertisement-space-villain-12
-    - advertisement-space-villain-13
-    - advertisement-space-villain-14
-    - advertisement-space-villain-15
diff --git a/Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml b/Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml
deleted file mode 100644
index 460e8d13bf..0000000000
--- a/Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: messagePack
-  id: BlockGameGoodbyes
-  messages:
-  - thankyou-block-game-1
-  - thankyou-block-game-2
-  - thankyou-block-game-3
-  - thankyou-block-game-4
-  - thankyou-block-game-5
-  - thankyou-block-game-6
-  - thankyou-block-game-7
-  - thankyou-block-game-8
-  - thankyou-block-game-9
-  - thankyou-block-game-10
-  - thankyou-block-game-11
-  - thankyou-block-game-12
diff --git a/Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml b/Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml
deleted file mode 100644
index 09016afec3..0000000000
--- a/Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: messagePack
-  id: SpaceVillainGoodbyes
-  messages:
-  - thankyou-space-villain-1
-  - thankyou-space-villain-2
-  - thankyou-space-villain-3
-  - thankyou-space-villain-4
-  - thankyou-space-villain-5
-  - thankyou-space-villain-6
-  - thankyou-space-villain-7
-  - thankyou-space-villain-8
-  - thankyou-space-villain-9
-  - thankyou-space-villain-10
-  - thankyou-space-villain-11
-  - thankyou-space-villain-12
diff --git a/Resources/Prototypes/Catalog/Arcade/advertisements.yml b/Resources/Prototypes/Catalog/Arcade/advertisements.yml
new file mode 100644
index 0000000000..47ecfb60b8
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Arcade/advertisements.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: BlockGameAds
+  values:
+    prefix: advertisement-block-game-
+    count: 13
+
+- type: localizedDataset
+  id: SpaceVillainAds
+  values:
+    prefix: advertisement-space-villain-
+    count: 15
diff --git a/Resources/Prototypes/Catalog/Arcade/goodbyes.yml b/Resources/Prototypes/Catalog/Arcade/goodbyes.yml
new file mode 100644
index 0000000000..48b45eb40e
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Arcade/goodbyes.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: BlockGameGoodbyes
+  values:
+    prefix: thankyou-block-game-
+    count: 12
+
+- type: localizedDataset
+  id: SpaceVillainGoodbyes
+  values:
+    prefix: thankyou-space-villain-
+    count: 12
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
index 3f9e909c80..ba97af3925 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: CrateSyndicateSurplusBundle
-  parent: CrateSyndicate
+  parent: [ CrateSyndicate, StorePresetUplink ]
   name: Syndicate surplus crate
   description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good.
   components:
@@ -24,7 +24,7 @@
 
 - type: entity
   id: CrateSyndicateSuperSurplusBundle
-  parent: CrateSyndicate
+  parent: [ CrateSyndicate, StorePresetUplink ]
   name: Syndicate super surplus crate
   description: Contains 125 telecrystals worth of completely random Syndicate items.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 66f52b74eb..1449c9757b 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -79,6 +79,7 @@
       - id: CleanerGrenade
         amount: 2
       - id: FlashlightLantern
+      - id: LightReplacer
 
 - type: entity
   id: ClothingBeltMedicalFilled
@@ -119,6 +120,7 @@
     contents:
     - id: HydroponicsToolMiniHoe
     - id: HydroponicsToolSpade
+    - id: HydroponicsToolClippers
     - id: RobustHarvestChemistryBottle
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index e38d57e6d8..11863ea51d 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -7,6 +7,7 @@
     contents:
       - id: BoxFolderQmClipboard
       - id: CargoRequestComputerCircuitboard
+      - id: CargoSaleComputerCircuitboard
       - id: CargoShuttleComputerCircuitboard
       - id: CargoShuttleConsoleCircuitboard
       - id: SalvageShuttleConsoleCircuitboard
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml
deleted file mode 100644
index 7e089a2825..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: messagePack
-  id: AmmoVendAds
-  messages:
-  - advertisement-ammo-1
-  - advertisement-ammo-2
-  - advertisement-ammo-3
-  - advertisement-ammo-4
-  - advertisement-ammo-5
-  - advertisement-ammo-6
-  - advertisement-ammo-7
-  - advertisement-ammo-8
-  - advertisement-ammo-9
-  - advertisement-ammo-10
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml
deleted file mode 100644
index 7946c06310..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: AtmosDrobeAds
-  messages:
-    - advertisement-atmosdrobe-1
-    - advertisement-atmosdrobe-2
-    - advertisement-atmosdrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml
deleted file mode 100644
index 0a21acf2cb..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: messagePack
-  id: BarDrobeAds
-  messages:
-    - advertisement-bardrobe-1
-    - advertisement-bardrobe-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml
deleted file mode 100644
index e6bcbbcb9c..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-- type: messagePack
-  id: BoozeOMatAds
-  messages:
-  - advertisement-boozeomat-1
-  - advertisement-boozeomat-2
-  - advertisement-boozeomat-3
-  - advertisement-boozeomat-4
-  - advertisement-boozeomat-5
-  - advertisement-boozeomat-6
-  - advertisement-boozeomat-7
-  - advertisement-boozeomat-8
-  - advertisement-boozeomat-9
-  - advertisement-boozeomat-10
-  - advertisement-boozeomat-11
-  - advertisement-boozeomat-12
-  - advertisement-boozeomat-13
-  - advertisement-boozeomat-14
-  - advertisement-boozeomat-15
-  - advertisement-boozeomat-16
-  - advertisement-boozeomat-17
-  - advertisement-boozeomat-18
-  - advertisement-boozeomat-19
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml
deleted file mode 100644
index f2cd38f737..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: CargoDrobeAds
-  messages:
-    - advertisement-cargodrobe-1
-    - advertisement-cargodrobe-2
-    - advertisement-cargodrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml
deleted file mode 100644
index 911d467e7d..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: ChangAds
-  messages:
-    - advertisement-chang-1
-    - advertisement-chang-2
-    - advertisement-chang-3
-    - advertisement-chang-4
-    - advertisement-chang-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml
deleted file mode 100644
index c71d8225e0..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: ChefDrobeAds
-  messages:
-    - advertisement-chefdrobe-1
-    - advertisement-chefdrobe-2
-    - advertisement-chefdrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml
deleted file mode 100644
index d52fcf9894..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: messagePack
-  id: ChefvendAds
-  messages:
-    - advertisement-chefvend-1
-    - advertisement-chefvend-2
-    - advertisement-chefvend-3
-    - advertisement-chefvend-4
-    - advertisement-chefvend-5
-    - advertisement-chefvend-6
-    - advertisement-chefvend-7
-    - advertisement-chefvend-8
-    - advertisement-chefvend-9
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml
deleted file mode 100644
index 69a37de184..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: ChemDrobeAds
-  messages:
-    - advertisement-chemdrobe-1
-    - advertisement-chemdrobe-2
-    - advertisement-chemdrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml
deleted file mode 100644
index db3d492c45..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: messagePack
-  id: CigaretteMachineAds
-  messages:
-  - advertisement-cigs-1
-  - advertisement-cigs-2
-  - advertisement-cigs-3
-  - advertisement-cigs-4
-  - advertisement-cigs-5
-  - advertisement-cigs-6
-  - advertisement-cigs-7
-  - advertisement-cigs-8
-  - advertisement-cigs-9
-  - advertisement-cigs-10
-  - advertisement-cigs-11
-  - advertisement-cigs-12
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml
deleted file mode 100644
index dc109f8eb9..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: messagePack
-  id: ClothesMateAds
-  messages:
-  - advertisement-clothes-1
-  - advertisement-clothes-2
-  - advertisement-clothes-3
-  - advertisement-clothes-4
-  - advertisement-clothes-5
-  - advertisement-clothes-6
-  - advertisement-clothes-7
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml
deleted file mode 100644
index 4781768cf0..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: messagePack
-  id: HotDrinksMachineAds
-  messages:
-    - advertisement-coffee-1
-    - advertisement-coffee-2
-    - advertisement-coffee-3
-    - advertisement-coffee-4
-    - advertisement-coffee-5
-    - advertisement-coffee-6
-    - advertisement-coffee-7
-    - advertisement-coffee-8
-    - advertisement-coffee-9
-    - advertisement-coffee-10
-    - advertisement-coffee-11
-    - advertisement-coffee-12
-    - advertisement-coffee-13
-    - advertisement-coffee-14
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml
deleted file mode 100644
index d12d7eb92f..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: messagePack
-  id: RobustSoftdrinksAds
-  messages:
-  - advertisement-cola-1
-  - advertisement-cola-2
-  - advertisement-cola-3
-  - advertisement-cola-4
-  - advertisement-cola-5
-  - advertisement-cola-6
-  - advertisement-cola-7
-  - advertisement-cola-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml
deleted file mode 100644
index d1d07df0c4..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: CondimentVendAds
-  messages:
-  - advertisement-condiment-1
-  - advertisement-condiment-2
-  - advertisement-condiment-3
-  - advertisement-condiment-4
-  - advertisement-condiment-5
-  - advertisement-condiment-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
deleted file mode 100644
index 47523c6e93..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: CuraDrobeAds
-  messages:
-    - advertisement-curadrobe-1
-    - advertisement-curadrobe-2
-    - advertisement-curadrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml
deleted file mode 100644
index 50024ce3d9..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: DetDrobeAds
-  messages:
-    - advertisement-detdrobe-1
-    - advertisement-detdrobe-2
-    - advertisement-detdrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml
deleted file mode 100644
index ac31dc075b..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: messagePack
-  id: DinnerwareAds
-  messages:
-    - advertisement-dinnerware-1
-    - advertisement-dinnerware-2
-    - advertisement-dinnerware-3
-    - advertisement-dinnerware-4
-    - advertisement-dinnerware-5
-    - advertisement-dinnerware-6
-    - advertisement-dinnerware-7
-    - advertisement-dinnerware-8
-    - advertisement-dinnerware-9
-    - advertisement-dinnerware-10
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml
deleted file mode 100644
index dce8646a60..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: messagePack
-  id: DiscountDansAds
-  messages:
-  - advertisement-discount-1
-  - advertisement-discount-2
-  - advertisement-discount-3
-  - advertisement-discount-4
-  - advertisement-discount-5
-  - advertisement-discount-6
-  - advertisement-discount-7
-  - advertisement-discount-8
-  - advertisement-discount-9
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml
deleted file mode 100644
index 73766aa749..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: DonutAds
-  messages:
-    - advertisement-donut-1
-    - advertisement-donut-2
-    - advertisement-donut-3
-    - advertisement-donut-4
-    - advertisement-donut-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml
deleted file mode 100644
index ec92fbe4de..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: EngiDrobeAds
-  messages:
-    - advertisement-engidrobe-1
-    - advertisement-engidrobe-2
-    - advertisement-engidrobe-3
-    - advertisement-engidrobe-4
-    - advertisement-engidrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml
deleted file mode 100644
index 7619ea1856..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: FatExtractorFacts
-  messages:
-  - fat-extractor-fact-1
-  - fat-extractor-fact-2
-  - fat-extractor-fact-3
-  - fat-extractor-fact-4
-  - fat-extractor-fact-5
-  - fat-extractor-fact-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml
deleted file mode 100644
index 1348635e1f..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: messagePack
-  id: GoodCleanFunAds
-  messages:
-  - advertisement-goodcleanfun-1
-  - advertisement-goodcleanfun-2
-  - advertisement-goodcleanfun-3
-  - advertisement-goodcleanfun-4
-  - advertisement-goodcleanfun-5
-  - advertisement-goodcleanfun-6
-  - advertisement-goodcleanfun-7
-  - advertisement-goodcleanfun-8
-  - advertisement-goodcleanfun-9
-  - advertisement-goodcleanfun-10
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml
deleted file mode 100644
index 722388055b..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: messagePack
-  id: GeneDrobeAds
-  messages:
-    - advertisement-genedrobe-1
-    - advertisement-genedrobe-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml
deleted file mode 100644
index e145ebcdac..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: messagePack
-  id: HappyHonkAds
-  messages:
-  - advertisement-happyhonk-1
-  - advertisement-happyhonk-2
-  - advertisement-happyhonk-3
-  - advertisement-happyhonk-4
-  - advertisement-happyhonk-5
-  - advertisement-happyhonk-6
-  - advertisement-happyhonk-7
-  - advertisement-happyhonk-8
-  - advertisement-happyhonk-9
-  - advertisement-happyhonk-10
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml
deleted file mode 100644
index 5999c496f5..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: HyDrobeAds
-  messages:
-    - advertisement-hydrobe-1
-    - advertisement-hydrobe-2
-    - advertisement-hydrobe-3
-    - advertisement-hydrobe-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml
deleted file mode 100644
index 8310136bf8..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: JaniDrobeAds
-  messages:
-    - advertisement-janidrobe-1
-    - advertisement-janidrobe-2
-    - advertisement-janidrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
deleted file mode 100644
index a948413abd..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: messagePack
-  id: LawDrobeAds
-  messages:
-    - advertisement-lawdrobe-1
-    - advertisement-lawdrobe-2
-    - advertisement-lawdrobe-3
-    - advertisement-lawdrobe-4
-    - advertisement-lawdrobe-5
-    - advertisement-lawdrobe-6
-    - advertisement-lawdrobe-7
-    - advertisement-lawdrobe-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml
deleted file mode 100644
index 896a3853e7..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- type: messagePack
-  id: MagiVendAds
-  messages:
-  - advertisement-magivend-1
-  - advertisement-magivend-2
-  - advertisement-magivend-3
-  - advertisement-magivend-4
-  - advertisement-magivend-5
-  - advertisement-magivend-6
-  - advertisement-magivend-7
-  - advertisement-magivend-8
-  - advertisement-magivend-9
-  - advertisement-magivend-10
-  - advertisement-magivend-11
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml
deleted file mode 100644
index b7b055231b..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: MediDrobeAds
-  messages:
-    - advertisement-medidrobe-1
-    - advertisement-medidrobe-2
-    - advertisement-medidrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml
deleted file mode 100644
index b6e6ae098e..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: MegaSeedAds
-  messages:
-    - advertisement-megaseed-1
-    - advertisement-megaseed-2
-    - advertisement-megaseed-3
-    - advertisement-megaseed-4
-    - advertisement-megaseed-5
-    - advertisement-megaseed-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml
deleted file mode 100644
index a79a4c8a6c..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: messagePack
-  id: NanoMedAds
-  messages:
-    - advertisement-nanomed-1
-    - advertisement-nanomed-2
-    - advertisement-nanomed-3
-    - advertisement-nanomed-4
-    - advertisement-nanomed-5
-    - advertisement-nanomed-6
-    - advertisement-nanomed-7
-    - advertisement-nanomed-8
-    - advertisement-nanomed-9
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml
deleted file mode 100644
index a3ade34960..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: messagePack
-  id: NutriMaxAds
-  messages:
-    - advertisement-nutrimax-1
-    - advertisement-nutrimax-2
-    - advertisement-nutrimax-3
-    - advertisement-nutrimax-4
-    - advertisement-nutrimax-5
-    - advertisement-nutrimax-6
-    - advertisement-nutrimax-7
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml
deleted file mode 100644
index 82ece7d763..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: RoboDrobeAds
-  messages:
-    - advertisement-robodrobe-1
-    - advertisement-robodrobe-2
-    - advertisement-robodrobe-3
-    - advertisement-robodrobe-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml
deleted file mode 100644
index f8b125073b..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: SciDrobeAds
-  messages:
-    - advertisement-scidrobe-1
-    - advertisement-scidrobe-2
-    - advertisement-scidrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml
deleted file mode 100644
index 99c2c402de..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: SecDrobeAds
-  messages:
-    - advertisement-secdrobe-1
-    - advertisement-secdrobe-2
-    - advertisement-secdrobe-3
-    - advertisement-secdrobe-4
-    - advertisement-secdrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml
deleted file mode 100644
index 0b32ed166d..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: SecTechAds
-  messages:
-    - advertisement-sectech-1
-    - advertisement-sectech-2
-    - advertisement-sectech-3
-    - advertisement-sectech-4
-    - advertisement-sectech-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml
deleted file mode 100644
index d92a95f70f..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: messagePack
-  id: SmartFridgeAds
-  messages:
-  - advertisement-smartfridge-1
-  - advertisement-smartfridge-2
-  - advertisement-smartfridge-3
-  - advertisement-smartfridge-4
-  - advertisement-smartfridge-5
-  - advertisement-smartfridge-6
-  - advertisement-smartfridge-7
-  - advertisement-smartfridge-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml
deleted file mode 100644
index 3d9b93f9c2..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: messagePack
-  id: GetmoreChocolateCorpAds
-  messages:
-  - advertisement-snack-1
-  - advertisement-snack-2
-  - advertisement-snack-3
-  - advertisement-snack-4
-  - advertisement-snack-5
-  - advertisement-snack-6
-  - advertisement-snack-7
-  - advertisement-snack-8
-  - advertisement-snack-9
-  - advertisement-snack-10
-  - advertisement-snack-11
-  - advertisement-snack-12
-  - advertisement-snack-13
-  - advertisement-snack-14
-  - advertisement-snack-15
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml
deleted file mode 100644
index 630de1e615..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: BodaAds
-  messages:
-  - advertisement-sovietsoda-1
-  - advertisement-sovietsoda-2
-  - advertisement-sovietsoda-3
-  - advertisement-sovietsoda-4
-  - advertisement-sovietsoda-5
-  - advertisement-sovietsoda-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml
deleted file mode 100644
index dc89d04aa0..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-- type: messagePack
-  id: SyndieDrobeAds
-  messages:
-    - advertisement-syndiedrobe-1
-    - advertisement-syndiedrobe-2
-    - advertisement-syndiedrobe-3
-    - advertisement-syndiedrobe-4
-    - advertisement-syndiedrobe-5
-    - advertisement-syndiedrobe-6
-    - advertisement-syndiedrobe-7
-    - advertisement-syndiedrobe-8
-    - advertisement-syndiedrobe-9
-    - advertisement-syndiedrobe-10
-    - advertisement-syndiedrobe-11
-    - advertisement-syndiedrobe-12
-    - advertisement-syndiedrobe-13
-    - advertisement-syndiedrobe-14
-    - advertisement-syndiedrobe-15
-    - advertisement-syndiedrobe-16
-    - advertisement-syndiedrobe-17
-    - advertisement-syndiedrobe-18
-    - advertisement-syndiedrobe-19
-    - advertisement-syndiedrobe-20
-    - advertisement-syndiedrobe-21
-    - advertisement-syndiedrobe-22
-    - advertisement-syndiedrobe-23
-    - advertisement-syndiedrobe-24
-    - advertisement-syndiedrobe-25
-    - advertisement-syndiedrobe-26
-    - advertisement-syndiedrobe-27
-    - advertisement-syndiedrobe-28
-    - advertisement-syndiedrobe-29
-    - advertisement-syndiedrobe-30
-    - advertisement-syndiedrobe-31
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml
deleted file mode 100644
index 8b06cdb517..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: AutoDrobeAds
-  messages:
-  - advertisement-theater-1
-  - advertisement-theater-2
-  - advertisement-theater-3
-  - advertisement-theater-4
-  - advertisement-theater-5
-  - advertisement-theater-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml
deleted file mode 100644
index 31c0e0c241..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: messagePack
-  id: VendomatAds
-  messages:
-  - advertisement-vendomat-1
-  - advertisement-vendomat-2
-  - advertisement-vendomat-3
-  - advertisement-vendomat-4
-  - advertisement-vendomat-5
-  - advertisement-vendomat-6
-  - advertisement-vendomat-7
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml
deleted file mode 100644
index c48f9e7d2e..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: ViroDrobeAds
-  messages:
-    - advertisement-virodrobe-1
-    - advertisement-virodrobe-2
-    - advertisement-virodrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml
deleted file mode 100644
index e5c96887b9..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: BoozeOMatGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-boozeomat-1
-  - thankyou-boozeomat-2
-  - thankyou-boozeomat-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml
deleted file mode 100644
index a348d8fa9c..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: ChangGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-chang-1
-  - thankyou-chang-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml
deleted file mode 100644
index 93249586e1..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: ChefvendGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-chefvend-1
-  - thankyou-chefvend-2
-  - thankyou-chefvend-3
-  - thankyou-chefvend-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml
deleted file mode 100644
index 108a34a472..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: CigaretteMachineGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-cigs-1
-  - thankyou-cigs-2
-  - thankyou-cigs-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml
deleted file mode 100644
index 6f2aef01b8..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: HotDrinksMachineGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-coffee-1
-  - thankyou-coffee-2
-  - thankyou-coffee-3
-  - thankyou-coffee-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml
deleted file mode 100644
index 76f00fddaf..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: RobustSoftdrinksGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-cola-1
-  - thankyou-cola-2
-  - thankyou-cola-3
-  - thankyou-cola-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml
deleted file mode 100644
index d3f7d89a93..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: messagePack
-  id: DiscountDansGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-discount-1
-  - thankyou-discount-2
-  - thankyou-discount-3
-  - thankyou-discount-4
-  - thankyou-discount-5
-  - thankyou-discount-6
-  - thankyou-discount-7
-  - thankyou-discount-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml
deleted file mode 100644
index 3c28741e3b..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: DonutGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-donut-1
-  - thankyou-donut-2
-  - thankyou-donut-3
-  - thankyou-donut-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml
deleted file mode 100644
index 5d842619bb..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: GoodCleanFunGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-goodcleanfun-1
-  - thankyou-goodcleanfun-2
-  - thankyou-goodcleanfun-3
-  - thankyou-goodcleanfun-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml
deleted file mode 100644
index 98a2d7d17a..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: messagePack
-  id: GenericVendGoodbyes
-  messages:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml
deleted file mode 100644
index 7859d55463..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: HappyHonkGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-happyhonk-1
-  - thankyou-happyhonk-2
-  - thankyou-happyhonk-3
-  - thankyou-happyhonk-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml
deleted file mode 100644
index 56678c1017..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: LawDrobeGoodbyes
-  messages:
-  - thankyou-lawdrobe-1
-  - thankyou-lawdrobe-2
-  - thankyou-lawdrobe-3
-  - thankyou-lawdrobe-4
-  - thankyou-lawdrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml
deleted file mode 100644
index 3568ae3031..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: NutriMaxGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-nutrimax-1
-  - thankyou-nutrimax-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml
deleted file mode 100644
index 8909693473..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: SecTechGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-sectech-1
-  - thankyou-sectech-2
-  - thankyou-sectech-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml
deleted file mode 100644
index bd86e074c6..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: messagePack
-  id: GetmoreChocolateCorpGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-snack-1
-  - thankyou-snack-2
-  - thankyou-snack-3
-  - thankyou-snack-4
-  - thankyou-snack-5
-  - thankyou-snack-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml
deleted file mode 100644
index 01ab25a7ad..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: BodaGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-sovietsoda-1
-  - thankyou-sovietsoda-2
-  - thankyou-sovietsoda-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml
deleted file mode 100644
index 1246eb3089..0000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: SyndieDrobeGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-syndiedrobe-1
-  - thankyou-syndiedrobe-2
-  - thankyou-syndiedrobe-3
-  - thankyou-syndiedrobe-4
-  - thankyou-syndiedrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
new file mode 100644
index 0000000000..6dbb60af6a
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -0,0 +1,257 @@
+- type: localizedDataset
+  id: AmmoVendAds
+  values:
+    prefix: advertisement-ammo-
+    count: 10
+
+- type: localizedDataset
+  id: AtmosDrobeAds
+  values:
+    prefix: advertisement-atmosdrobe-
+    count: 3
+
+- type: localizedDataset
+  id: BarDrobeAds
+  values:
+    prefix: advertisement-bardrobe-
+    count: 2
+
+- type: localizedDataset
+  id: BoozeOMatAds
+  values:
+    prefix: advertisement-boozeomat-
+    count: 19
+
+- type: localizedDataset
+  id: CargoDrobeAds
+  values:
+    prefix: advertisement-cargodrobe-
+    count: 3
+
+- type: localizedDataset
+  id: ChangAds
+  values:
+    prefix: advertisement-chang-
+    count: 5
+
+- type: localizedDataset
+  id: ChefDrobeAds
+  values:
+    prefix: advertisement-chefdrobe-
+    count: 3
+
+- type: localizedDataset
+  id: ChefvendAds
+  values:
+    prefix: advertisement-chefvend-
+    count: 9
+
+- type: localizedDataset
+  id: ChemDrobeAds
+  values:
+    prefix: advertisement-chemdrobe-
+    count: 3
+
+- type: localizedDataset
+  id: CigaretteMachineAds
+  values:
+    prefix: advertisement-cigs-
+    count: 12
+
+- type: localizedDataset
+  id: ClothesMateAds
+  values:
+    prefix: advertisement-clothes-
+    count: 7
+
+- type: localizedDataset
+  id: HotDrinksMachineAds
+  values:
+    prefix: advertisement-coffee-
+    count: 14
+
+- type: localizedDataset
+  id: RobustSoftdrinksAds
+  values:
+    prefix: advertisement-cola-
+    count: 8
+
+- type: localizedDataset
+  id: CondimentVendAds
+  values:
+    prefix: advertisement-condiment-
+    count: 6
+
+- type: localizedDataset
+  id: CuraDrobeAds
+  values:
+    prefix: advertisement-curadrobe-
+    count: 3
+
+- type: localizedDataset
+  id: DetDrobeAds
+  values:
+    prefix: advertisement-detdrobe-
+    count: 3
+
+- type: localizedDataset
+  id: DinnerwareAds
+  values:
+    prefix: advertisement-dinnerware-
+    count: 10
+
+- type: localizedDataset
+  id: DiscountDansAds
+  values:
+    prefix: advertisement-discount-
+    count: 9
+
+- type: localizedDataset
+  id: DonutAds
+  values:
+    prefix: advertisement-donut-
+    count: 5
+
+- type: localizedDataset
+  id: EngiDrobeAds
+  values:
+    prefix: advertisement-engidrobe-
+    count: 5
+
+- type: localizedDataset
+  id: FatExtractorFacts
+  values:
+    prefix: fat-extractor-fact-
+    count: 6
+
+- type: localizedDataset
+  id: GoodCleanFunAds
+  values:
+    prefix: advertisement-goodcleanfun-
+    count: 10
+
+- type: localizedDataset
+  id: GeneDrobeAds
+  values:
+    prefix: advertisement-genedrobe-
+    count: 2
+
+- type: localizedDataset
+  id: HappyHonkAds
+  values:
+    prefix: advertisement-happyhonk-
+    count: 10
+
+- type: localizedDataset
+  id: HyDrobeAds
+  values:
+    prefix: advertisement-hydrobe-
+    count: 4
+
+- type: localizedDataset
+  id: JaniDrobeAds
+  values:
+    prefix: advertisement-janidrobe-
+    count: 3
+
+- type: localizedDataset
+  id: LawDrobeAds
+  values:
+    prefix: advertisement-lawdrobe-
+    count: 8
+
+- type: localizedDataset
+  id: MagiVendAds
+  values:
+    prefix: advertisement-magivend-
+    count: 11
+
+- type: localizedDataset
+  id: MediDrobeAds
+  values:
+    prefix: advertisement-medidrobe-
+    count: 3
+
+- type: localizedDataset
+  id: MegaSeedAds
+  values:
+    prefix: advertisement-megaseed-
+    count: 6
+
+- type: localizedDataset
+  id: NanoMedAds
+  values:
+    prefix: advertisement-nanomed-
+    count: 9
+
+- type: localizedDataset
+  id: NutriMaxAds
+  values:
+    prefix: advertisement-nutrimax-
+    count: 7
+
+- type: localizedDataset
+  id: RoboDrobeAds
+  values:
+    prefix: advertisement-robodrobe-
+    count: 4
+
+- type: localizedDataset
+  id: SciDrobeAds
+  values:
+    prefix: advertisement-scidrobe-
+    count: 3
+
+- type: localizedDataset
+  id: SecDrobeAds
+  values:
+    prefix: advertisement-secdrobe-
+    count: 5
+
+- type: localizedDataset
+  id: SecTechAds
+  values:
+    prefix: advertisement-sectech-
+    count: 5
+
+- type: localizedDataset
+  id: SmartFridgeAds
+  values:
+    prefix: advertisement-smartfridge-
+    count: 8
+
+- type: localizedDataset
+  id: GetmoreChocolateCorpAds
+  values:
+    prefix: advertisement-snack-
+    count: 15
+
+- type: localizedDataset
+  id: BodaAds
+  values:
+    prefix: advertisement-sovietsoda-
+    count: 6
+
+- type: localizedDataset
+  id: SyndieDrobeAds
+  values:
+    prefix: advertisement-syndiedrobe-
+    count: 31
+
+- type: localizedDataset
+  id: AutoDrobeAds
+  values:
+    prefix: advertisement-theater-
+    count: 6
+
+- type: localizedDataset
+  id: VendomatAds
+  values:
+    prefix: advertisement-vendomat-
+    count: 7
+
+- type: localizedDataset
+  id: ViroDrobeAds
+  values:
+    prefix: advertisement-virodrobe-
+    count: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
new file mode 100644
index 0000000000..5a3d91db11
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
@@ -0,0 +1,101 @@
+- type: localizedDataset
+  id: BoozeOMatGoodbyes
+  values:
+    prefix: thankyou-boozeomat-
+    count: 3
+
+- type: localizedDataset
+  id: ChangGoodbyes
+  values:
+    prefix: thankyou-chang-
+    count: 2
+
+- type: localizedDataset
+  id: ChefvendGoodbyes
+  values:
+    prefix: thankyou-chefvend-
+    count: 4
+
+- type: localizedDataset
+  id: CigaretteMachineGoodbyes
+  values:
+    prefix: thankyou-cigs-
+    count: 3
+
+- type: localizedDataset
+  id: HotDrinksMachineGoodbyes
+  values:
+    prefix: thankyou-coffee-
+    count: 4
+
+- type: localizedDataset
+  id: RobustSoftdrinksGoodbyes
+  values:
+    prefix: thankyou-cola-
+    count: 4
+
+- type: localizedDataset
+  id: DiscountDansGoodbyes
+  values:
+    prefix: thankyou-discount-
+    count: 8
+
+- type: localizedDataset
+  id: DonutGoodbyes
+  values:
+    prefix: thankyou-donut-
+    count: 4
+
+- type: localizedDataset
+  id: GoodCleanFunGoodbyes
+  values:
+    prefix: thankyou-goodcleanfun-
+    count: 4
+
+- type: localizedDataset
+  id: GenericVendGoodbyes
+  values:
+    prefix: vending-machine-thanks-
+    count: 1
+
+- type: localizedDataset
+  id: HappyHonkGoodbyes
+  values:
+    prefix: thankyou-happyhonk-
+    count: 4
+
+- type: localizedDataset
+  id: LawDrobeGoodbyes
+  values:
+    prefix: thankyou-lawdrobe-
+    count: 5
+
+- type: localizedDataset
+  id: NutriMaxGoodbyes
+  values:
+    prefix: thankyou-nutrimax-
+    count: 2
+
+- type: localizedDataset
+  id: SecTechGoodbyes
+  values:
+    prefix: thankyou-sectech-
+    count: 3
+
+- type: localizedDataset
+  id: GetmoreChocolateCorpGoodbyes
+  values:
+    prefix: thankyou-snack-
+    count: 6
+
+- type: localizedDataset
+  id: BodaGoodbyes
+  values:
+    prefix: thankyou-sovietsoda-
+    count: 3
+
+- type: localizedDataset
+  id: SyndieDrobeGoodbyes
+  values:
+    prefix: thankyou-syndiedrobe-
+    count: 5
diff --git a/Resources/Prototypes/Datasets/story_generation.yml b/Resources/Prototypes/Datasets/story_generation.yml
index 1a461c7596..9f5741c433 100644
--- a/Resources/Prototypes/Datasets/story_generation.yml
+++ b/Resources/Prototypes/Datasets/story_generation.yml
@@ -1,266 +1,66 @@
-- type: dataset
+- type: localizedDataset
   id: BookTypes
   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
+    prefix: story-gen-book-type
+    count: 12
 
-- type: dataset
+- type: localizedDataset
   id: BookGenres
   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
+    prefix: story-gen-book-genre
+    count: 14
 
-- type: dataset
+- type: localizedDataset
   id: BookHintAppearances
   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
+    prefix: story-gen-book-appearance
+    count: 27
 
-- type: dataset
+- type: localizedDataset
   id: BookCharacters
   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
+    prefix: story-gen-book-character
+    count: 40
 
-- type: dataset
+- type: localizedDataset
   id: BookCharacterTraits
   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
+    prefix: story-gen-book-character-trait
+    count: 24
 
 
-- type: dataset
+- type: localizedDataset
   id: BookEvents
   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
+    prefix: story-gen-book-event
+    count: 24
 
-- type: dataset
+- type: localizedDataset
   id: BookActions
   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
+    prefix: story-gen-book-action
+    count: 12
 
-- type: dataset
+- type: localizedDataset
   id: BookActionTraits
   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
+    prefix: story-gen-book-action-trait
+    count: 13
 
-- type: dataset
+- type: localizedDataset
   id: BookLocations
   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
+    prefix: story-gen-book-location
+    count: 34
 
-- type: dataset
+- type: localizedDataset
   id: BookStoryElements
   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
+    prefix: story-gen-book-element
+    count: 9
 
-- type: dataset
+- type: localizedDataset
   id: BookStoryElementTraits
   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
+    prefix: story-gen-book-element-trait
+    count: 13
diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml
index 88dc09c220..b710d69fab 100644
--- a/Resources/Prototypes/Datasets/tips.yml
+++ b/Resources/Prototypes/Datasets/tips.yml
@@ -1,137 +1,5 @@
-- type: dataset
+- type: localizedDataset
   id: Tips
   values:
-  - "If you're on fire, you can click the alert on the right of your screen to stop, drop, and roll."
-  - "You can view and edit all keybindings used in-game at any time through the Options menu."
-  - "You can access the in-game guidebook through the escape menu, or by pressing Numpad 0 by default."
-  - "Some entities ingame have guidebook entries associated with them, which you can view by examining the entity and clicking the question mark icon."
-  - "Artifacts have the ability to gain permanent effects for some triggered nodes, including becoming an intercom or an extremely efficient generator."
-  - "You can avoid slipping on most puddles by walking. However, some strong chemicals like space lube will slip people anyway."
-  - "Some plants, such as galaxy thistle, can be ground up into extremely useful and potent medicines."
-  - "Mopping up puddles and draining them into other containers conserves the reagents found in the puddle."
-  - "Floor drains, usually found in the chef's freezer or janitor's office, rapidly consume reagent found in puddles around them--including blood."
-  - "Cognizine, a hard to manufacture chemical, makes animals sentient when they are injected with it."
-  - "Loaded mousetraps are incredibly effective at dealing with all manner of low-mass mobs--including Rat Servants."
-  - "Fire extinguishers can be loaded with any reagent in the game."
-  - "Some reagents, like chlorine trifluoride, have unique effects when applied by touch, such as through a spray bottle or foam."
-  - "Remember to touch grass in between playing Space Station 14 every once in a while."
-  - "You can use the Activate in World keybind, E by default, to interact with objects while your hands are full, or without picking them up."
-  - "Common sense goes a long way to avoiding conflict."
-  - "Every other player in game is a human being as well."
-  - "When running the Singularity, make sure to check on it periodically. If sabotaged, it could put the entire station at risk."
-  - "If the Singularity is up, make sure to refuel the radiation collectors once in a while."
-  - "Chemicals don't react while inside the ChemMaster's buffer."
-  - "Don't anger the bartender by throwing their glasses! Politely place them on the table by tapping Q."
-  - "You can hold SPACE by default to slow the movement of the shuttle when piloting, to allow for precise movements--or even coming to a complete stop."
-  - "Dexalin, Dexalin Plus, and Epinephrine will all purge heartbreaker toxin from your bloodstream while metabolizing."
-  - "Every crewmember comes with an emergency medipen in their survival box containing epinephrine and tranexamic acid."
-  - "The AME is a high-priority target and is easily sabotaged. Make sure to set up the Singularity or Solars so that you don't run out of power if it blows."
-  - "During a teslaloose, make sure to get rid of all electronic items so you don't become a target."
-  - "You can add labels to any item, including food or pill canisters, using a hand labeller."
-  - "Riot armor is significantly more powerful against opponents that aren't using guns compared to regular armor."
-  - "As a ghost, you can use the Verb Menu to orbit around and follow any entity in game automatically."
-  - "As a Traitor, you may sometimes be assigned to hunt other traitors, and in turn be hunted by others."
-  - "As a Traitor, the syndicate encryption key can be used to communicate through a secure channel with any other traitors who have purchased it."
-  - "As a Traitor, compromising important communications channels like security or engineering can give valuable intelligence. Be aware that this goes in both ways - security can compromise syndicate communications as well!"
-  - "As a Traitor, the syndicate toolbox is extremely versatile. For only 2 telecrystals, you can get a full set of tools to help you in an emergency, insulated combat gloves and a syndicate gas mask."
-  - "As a Traitor, never underestimate the web vest. It may not provide space protection, but its cheap cost and robust protection makes it handy for protecting against trigger-happy foes."
-  - "As a Traitor, any purchased grenade penguins won't attack you, and will explode if killed."
-  - "As a Traitor, be careful when using vestine from the chemical synthesis kit. If someone checks your station, they could easily out you."
-  - "As a Traitor, remember that power sinks will create a loud sound and alert the crew after running for long enough. Try to hide them in a tricky-to-find spot, or reinforce the area around them so that they're harder to reach."
-  - "As a Traitor, plasma gas is an excellent way to create chaos. It can be ignited to make an area extra-uninhabitable, and can cause toxin damage to those that inhale it."
-  - "As a Traitor, dehydrated carps are useful for killing a large hoard of people. As long as you pat it before rehydrating it, it can be used as a great distraction."
-  - "As a Traitor, have you tried injecting plasma into batteries? In the case of a defibrillator, it explodes on use; hurting the user and the patient!"
-  - "As a Nuclear Operative, stick together! While your equipment is robust, your fellow operatives are much better at saving your life: they can drag you away from danger while stunned and provide cover fire."
-  - "As a Nuclear Operative, communication is key! Use your radio to speak to your fellow operatives and coordinate an attack plan."
-  - "As a Nuclear Operative, remember that stealth is an option. It'll be hard for the captain to fight back if he gets caught off guard by what he thinks is just a regular passenger!"
-  - "As an antagonist, be mindful of the power of destroying telecommunications. It'll be a lot harder for people to call you out if they can't do so effectively!"
-  - "You can examine your headset to see which radio channels you have available and how to speak in them."
-  - "As a Salvage Specialist, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space."
-  - "As a Salvage Specialist, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective."
-  - "As a Salvage Specialist, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology."
-  - "As a Salvage Specialist, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!"
-  - "As a Salvage Specialist, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator."
-  - "As a Salvage Specialist, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials."
-  - "As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner."
-  - "As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to."
-  - "As a Cargo Technician, if you have a surplus of cash try gambling! Sometimes you gain more money than you begin with."
-  - "As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying."
-  - "As the Bartender, you can use a circular saw on your shotgun to make it easier to store."
-  - "As the Bartender, try experimenting with unique drinks. Have you tried to make demon's blood yet?"
-  - "As a Botanist, you can mutate and crossbreed plants together to create more potent produce that also has higher yields."
-  - "As the Clown, spice your gimmicks up! Nobody likes a one-trick pony."
-  - "As the Clown, if you lose your banana peels and soap, you can still slip people with your PDA! Honk!"
-  - "As the Chef, your knife can act as a weapon in an emergency."
-  - "As the Chef, you can sneak liquids into your foods. As a traitor, putting a little bit of amatoxin or other poison can greatly annoy the crew!"
-  - "As the Mime, your oath of silence is your source of power. Breaking it robs you of your powers and of your honor."
-  - "As the Lawyer, try to negotiate with the Warden if sentences seem too high for the crime."
-  - "As a Security Officer, communicate and coordinate with your fellow officers using the security radio channel to avoid confusion."
-  - "As a Security Officer, remember that correlation does not equal causation. Someone may have just been at the wrong place at the wrong time!"
-  - "As a Detective, you can chase criminals more effectively by using fingerprint fiber data and DNA obtained from forensic scans of objects the perpetrator likely interacted with."
-  - "As an Atmospheric Technician, your ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches."
-  - "As an Atmospheric Technician, try to resist the temptation of making canister bombs for Nuclear Operatives, unless you're in a last-ditch scenario. They often lead to large amounts of unnecessary friendly fire!"
-  - "As an Engineer, you can repair cracked windows by using a lit welding tool on them while not in combat mode."
-  - "As an Engineer, you can electrify grilles by placing powered cables beneath them."
-  - "As an Engineer, always double check when you're setting up the singularity. It is easier than you think to loose it!"
-  - "As an Engineer, you can use plasma glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation."
-  - "As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser pistol or your life are things to worry about."
-  - "As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe."
-  - "As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny."
-  - "As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back!"
-  - "As a Scientist, you can try random things on an artifact while the scanner is on cooldown to speed up the point extraction process significantly."
-  - "As a Scientist, you can utilize upgraded versions of machines to increase its effectiveness. This can make certain machines significantly better; salvage will love you if you upgrade their ore processor!"
-  - "As a Scientist, you can build cyborgs using positronic brains and a chassis, they are just as useful as a new crew member."
-  - "As a Medical Doctor, try to be wary of overdosing your patients, especially if someone else has already been on the scene. Overdoses are often lethal to patients in crit!"
-  - "As a Medical Doctor, don't underestimate your cryo pods! They heal almost every type of damage, making them very useful when you are overloaded or need to heal someone in a pinch."
-  - "As a Medical Doctor, exercise caution when putting reptilians in cryopods. They will take a lot of extra cold damage, but you can mitigate this with some burn medicine or leporazine."
-  - "As a Medical Doctor, remember that the health analyzer can be used if you lose your PDA. However it has a battery, and if it drains too quickly for your taste you can ask science to print a better battery for you!"
-  - "As a Chemist, once you've made everything you've needed to, don't be afraid to make more silly reagents. Have you tried desoxyephedrine or licoxide?"
-  - "As a Medical Doctor, Chemist, or Chief Medical Officer, you can use chloral hydrate to non-lethally sedate unruly patients."
-  - "Don't be afraid to ask for help, whether from your peers in character or through LOOC, or from admins!"
-  - "You'll quickly lose your interest in the game if you play to win and kill. If you find yourself doing this, take a step back and talk to people--it's a much better experience!"
-  - "If there's something you need from another department, try asking! This game isn't singleplayer and you'd be surprised what you can get accomplished together!"
-  - "The station's nuke is invincible. Go find the disk instead of trying to destroy it."
-  - "Maintenance is full of equipment that is randomized every round. Look around and see if anything is worth using."
-  - "We were all new once, be patient and guide new players, especially those playing intern roles, in the right direction."
-  - "Firesuits, winter coats and emergency EVA suits offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all."
-  - "In an emergency, you can always rely on firesuits and emergency EVA suits; they will always spawn in their respective lockers. They might be awkward to move around in, but can easily save your life in a dangerous situation."
-  - "In an emergency, remember that you can craft improvised weapons! A baseball bat or spear could easily mean the difference between deterring an attacker or perishing from the hands of one."
-  - "Spears can be tipped with chemicals, and will inject a few units every time you hit someone with them directly."
-  - "You can make spears with reinforced glass, plasma glass, or uranium glass shards to enhance their damage."
-  - "Thrown spears deal extra damage! Beware, however, as throwing them too much will end up breaking them."
-  - "All forms of toxin damage are fairly difficult to treat, and usually involve the use of chemicals or other inconvenient methods. You can use this to your advantage in combat."
-  - "You can throw crafted bolas at people to slow them down, letting you follow up on them for an easier kill or getaway."
-  - "You can put napalm in a backpack water tank to make a flamethrower."
-  - "Some jobs have alternate uniforms in their respective drobe vendors. Don't be afraid to try out a new look!"
-  - "Speed is almost everything in combat. Using hardsuits just for their armor is usually a terrible idea unless the resistances it provides are geared towards combat, or you're not planning to go head-first into the fray."
-  - "Just because a job can't be a traitor at the beginning of a round doesn't mean that they'll never be a traitor."
-  - "Syndicate gas masks will both provide welding protection and block flashes. Think twice before trying to flash a Nuclear Operative!"
-  - "Demoman takes skill."
-  - "You can spray a fire extinguisher, throw items or fire a gun while floating through space to give yourself a minor boost. Simply fire opposite to where you want to go."
-  - "You can drag other players onto yourself to open the strip menu, allowing you to remove their equipment or force them to wear something. Note that exosuits or helmets will block your access to the clothing beneath them, and that certain items take longer to strip or put on than others."
-  - "You can climb onto a table by dragging yourself onto one."
-  - "You can move an item out of the way by dragging it, and then holding CTRL + right click and moving your mouse into the direction you want it to go."
-  - "When dealing with security, you can often get your sentence negated entirely through cooperation and deception."
-  - "Fire can spread to other players through touch! Be careful around flaming bodies or large crowds with people on fire in them."
-  - "Hull breaches take a few seconds to fully space an area. You can use this time to patch up the hole if you're confident enough, or just run away."
-  - "Burn damage, such as that from a welding tool or lightbulb, can be used to cauterize wounds and stop bleeding."
-  - "Bleeding is no joke! If you've been shot or acquired any other major injury, make sure to treat it quickly."
-  - "In an emergency, you can butcher a jumpsuit with a sharp object to get cloth, which can be crafted into gauze."
-  - "You can use sharp objects to butcher clothes or animals in the right click context menu. This includes glass shards."
-  - "Most explosives have an adjustable timer that you can set in the right click menu. This includes grenade penguins!"
-  - "You can stun grenade penguins, which can bide valuable time for you to kill them."
-  - "You can click on the names of items to pick them up in the right click menu, instead of hovering over the item and then selecting pick up."
-  - "Space Station 14 is open source! If there's a change you want to make, or a simple item you want to add, then try contributing to the game. It's not as hard as you'd think it is."
-  - "In a pinch, you can throw drinks or other reagent containers behind you to create a spill that can slip people chasing you."
-  - "Some weapons, such as knives & shivs, have a fast attack speed."
-  - "The jaws of life can be used to open powered doors."
-  - "If you're not a human, you can drink blood to heal back some of your blood volume, albeit very inefficiently."
-  - "If you're a human, don't drink blood! It makes you sick and you'll begin to take damage."
-  - "There is a chemical metabolism limit that limits the amount of reagents of a certain type you can digest at once. Certain species have higher metabolism limits, such as slimes."
-  - "Welding without proper eye protection can cause eye damage, which must be cured with oculine."
-  - "Zombies are very vulnerable to heat damage, making welding tools and laser guns extremely effective against them."
-  - "You can weld glass shards into glass sheets."
-  - "By right clicking on a player, and then clicking the heart icon, you can quickly examine them to check for injuries or how badly they're bleeding. You can also do this to yourself."
-  - "Monkeys and kobolds have a rare chance to be sentient. Ook!"
-  - "You can tell if an area with firelocks up is spaced by looking to see if the firelocks have lights beside them."
-  - "Instead of picking it up, you can alt-click food to eat it. This also works for mice and other creatures without hands."
+    prefix: tips-dataset-
+    count: 135
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 835c405e19..c74a60e8fc 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -7,6 +7,17 @@
   - type: ShowMindShieldIcons
   - type: ShowCriminalRecordIcons
 
+- type: entity
+  id: ShowMedicalIcons
+  abstract: true
+  noSpawn: true
+  components:
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+  - type: ShowHealthIcons
+    damageContainers: 
+    - Biological
 
 - type: entity
   parent: ClothingEyesBase
@@ -24,7 +35,7 @@
     - Silicon
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowMedicalIcons]
   id: ClothingEyesHudMedical
   name: medical hud
   description: A heads-up display that scans the humanoids in view and provides accurate data about their health status.
@@ -33,12 +44,6 @@
     sprite: Clothing/Eyes/Hud/med.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/med.rsi
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: Tag
     tags:
     - HudMedical
@@ -110,7 +115,7 @@
   - type: ShowThirstIcons
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowMedicalIcons]
   id: ClothingEyesHudMedOnion
   name: medonion hud
   description: Filler
@@ -119,16 +124,10 @@
     sprite: Clothing/Eyes/Hud/medonion.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonion.rsi
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: ShowHungerIcons
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowMedicalIcons]
   id: ClothingEyesHudMedOnionBeer
   name: medthungerst hud
   description: Filler
@@ -137,17 +136,11 @@
     sprite: Clothing/Eyes/Hud/medonionbeer.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonionbeer.rsi
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: ShowHungerIcons
   - type: ShowThirstIcons
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons]
+  parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons]
   id: ClothingEyesHudMedSec
   name: medsec hud
   description: An eye display that looks like a mixture of medical and security huds.
@@ -159,15 +152,9 @@
   - type: Construction
     graph: HudMedSec
     node: medsecHud
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers: 
-    - Biological
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons]
+  parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons]
   id: ClothingEyesHudMultiversal
   name: multiversal hud
   description: Filler
@@ -180,13 +167,10 @@
     damageContainers:
     - Biological
     - Inorganic
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: ShowSyndicateIcons
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons]
+  parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons]
   id: ClothingEyesHudOmni
   name: omni hud
   description: Filler
@@ -199,9 +183,6 @@
     damageContainers:
     - Biological
     - Inorganic
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: ShowHungerIcons
   - type: ShowThirstIcons
   - type: ShowSyndicateIcons
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
index ae7e5bcf76..1986dfc29c 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -22,6 +22,7 @@
         - CrateScience
         - CrateSurgery
       chance: 0.7
+      offset: 0.0
 
 - type: entity
   name: Filled Crate Spawner
@@ -59,3 +60,79 @@
         - CrateMaterialPlasma
         - CrateHydroponicsSeedsExotic
       rareChance: 0.1
+      offset: 0.0
+
+- type: entity
+  name: random engineering crate spawner
+  id: LootSpawnerRandomCrateEngineering
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/Crates/engineering.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - CrateEngineeringSingularityGenerator
+        - CrateEngineeringTeslaGenerator
+        - CrateEngineeringTeslaGroundingRod
+        - CrateEngineeringParticleAccelerator
+        - CrateRCD
+        - CrateEngineeringGear
+      rareChance: 0.2
+      prototypes:
+        - CrateEngineering
+        - CrateElectrical
+        - CrateEngineeringElectricalSupplies
+        - CrateRCDAmmo
+        - CrateEngineeringCableLV
+        - CrateEngineeringCableMV
+        - CrateEngineeringCableHV
+        - CrateEngineeringCableBulk
+        - CrateEngineeringSingularityContainment
+        - CrateEngineeringSingularityCollector
+        - CrateEngineeringTeslaCoil
+        - CrateEngineeringSingularityEmitter
+        - CrateEngineeringGyroscope
+        - CrateEngineeringThruster
+        - CrateEngineeringToolbox
+        - CrateEngineeringShuttle
+        - CrateEngineeringSolar
+        - CrateEngineeringJetpack
+        - CrateEmergencyRadiation
+        - CrateRadiation
+      chance: 0.9
+      offset: 0.0
+
+- type: entity
+  name: random security crate spawner
+  id: LootSpawnerRandomCrateSecurity
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/Crates/sec_gear.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it
+        - CrateArmoryShotgun
+        - CrateArmorySMG
+        - CrateSecurityRiot
+        - CrateSecurityNonlethal
+      rareChance: 0.1
+      prototypes:
+        - CrateWeaponSecure
+        - CrateArmoryLaser
+        - CrateArmoryPistols
+        - CrateTrainingBombs
+        - CrateTrackingImplants
+        - CrateSecurityTrackingMindshieldImplants
+        - CrateSecurityHelmet
+        - CrateSecurityArmor
+        - CrateRestraints
+        - CrateEmergencyExplosive
+        - CrateSecurityBiosuit
+      chance: 0.9
+      offset: 0.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/encryption_key.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/encryption_key.yml
new file mode 100644
index 0000000000..7c29de7f7c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/encryption_key.yml
@@ -0,0 +1,27 @@
+# Intentionally does not include channels like syndicate comms or binary, since these getting in to the hands of random people can cause a round to derail.
+- type: entity
+  name: random encryption key spawner
+  id: LootSpawnerEncryptionKey
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Devices/encryption_keys.rsi
+          state: crypt_rusted
+        - sprite: Objects/Devices/encryption_keys.rsi
+          state: nano_label
+    - type: RandomSpawner
+      rarePrototypes:
+        - EncryptionKeyCommand
+        - EncryptionKeySecurity
+      rareChance: 0.1
+      prototypes:
+        - EncryptionKeyCommon
+        - EncryptionKeyEngineering
+        - EncryptionKeyScience
+        - EncryptionKeyService
+        - EncryptionKeyMedical
+        - EncryptionKeyCargo
+      chance: 0.9
+      offset: 0.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
new file mode 100644
index 0000000000..e2ce2c8aff
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
@@ -0,0 +1,87 @@
+#Industrial spawners
+- type: entity
+  name: industrial fluff spawner
+  id: LootSpawnerIndustrialFluff
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Tools/flashlight.rsi
+          state: flashlight
+    - type: RandomSpawner
+      rarePrototypes:
+        - CheapLighter
+        - Pen
+        - Cigar
+        - CigarSpent
+        - Cigarette
+        - CigaretteSpent
+        - Paper
+        - FolderSpawner
+      rareChance: 0.1
+      prototypes:
+        - RemoteSignaller
+        - GeigerCounter
+        - trayScanner
+        - FlashlightLantern
+        - ClothingHandsGlovesColorBlack
+        - Lighter
+        - ClothingMaskGas
+        - HandheldGPSBasic
+      chance: 0.85
+      offset: 0.0
+
+- type: entity
+  name: industrial loot spawner
+  suffix: Tools + Materials
+  id: LootSpawnerIndustrial
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Tools/welder.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - CapacitorStockPart
+        - MicroManipulatorStockPart
+        - MatterBinStockPart
+        - CableHVStack10
+        - WelderIndustrial
+        - PowerCellHigh
+        - PowerCellSmall
+        - ClothingHandsGlovesColorYellowBudget
+      rareChance: 0.2
+      prototypes:
+        - ClothingHeadHatWelding
+        - WelderMini
+        - Crowbar
+        - CrowbarRed
+        - Screwdriver
+        - Wrench
+        - Wirecutter
+        - Welder
+        - RemoteSignaller
+        - GeigerCounter
+        - GasAnalyzer
+        - Multitool
+        - trayScanner
+        - FlashlightLantern
+        - ClothingHandsGlovesColorBlack
+        - ClothingMaskGas
+        - HandheldGPSBasic
+        - FireExtinguisher
+        - PowerCellMedium
+        - SheetSteel10
+        - SheetGlass10
+        - SheetPlastic10
+        - SheetPlasteel10
+        - PartRodMetal10
+        - CableApcStack10
+        - CableMVStack10
+        - ToolboxElectricalFilled
+        - ToolboxMechanicalFilled
+      chance: 0.8
+      offset: 0.0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/materials.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/materials.yml
new file mode 100644
index 0000000000..fbbda73ac0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/materials.yml
@@ -0,0 +1,147 @@
+# Normal materials spawners
+- type: entity
+  name: materials spawner
+  id: LootSpawnerMaterials
+  suffix: Construction Materials
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/Sheets/metal.rsi
+          state: steel_3
+    - type: RandomSpawner
+      rarePrototypes:
+        - SheetPlasteel10
+      rareChance: 0.2
+      prototypes:
+        - SheetSteel
+        - SheetGlass
+        - SheetPlastic
+        - CableApcStack
+        - CableMVStack
+        - CableHVStack
+      chance: 0.8
+      offset: 0.0
+
+- type: entity
+  name: materials spawner
+  suffix: Supplementary Materials
+  id: LootSpawnerMaterialsSupplementary
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/materials.rsi
+          state: wood_2
+    - type: RandomSpawner
+      prototypes:
+        - MaterialWoodPlank10
+        - MaterialCardboard10
+        - PartRodMetal10
+      chance: 0.8
+      offset: 0.0
+
+# High-value materials spawners
+# Maybe these should use the 10-in-stack variants?
+- type: entity
+  name: high-value materials spawner
+  suffix: Construction Materials
+  id: LootSpawnerMaterialsHighValueConstruction
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/Sheets/metal.rsi
+          state: plasteel_2
+    - type: RandomSpawner
+      rarePrototypes:
+        - SheetRPGlass
+      rareChance: 0.2
+      prototypes:
+        - SheetPlasteel
+        - SheetRGlass
+      chance: 0.8
+      offset: 0.0
+
+- type: entity
+  name: high-value materials spawner
+  id: LootSpawnerMaterialsHighValue
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/Sheets/other.rsi
+          state: plasma_2
+    - type: RandomSpawner
+      rarePrototypes:
+        - SheetUranium
+      rareChance: 0.2
+      prototypes:
+        - SheetPlasma
+        - IngotGold
+        - IngotSilver
+      chance: 0.8
+      offset: 0.0
+
+# Surplus materials spawner.
+# Intended use case: randomly place in maintenance or in storage areas.
+# Does not include weirdo stuff like Bronze or Paper since those are intended to be gimmicks.
+- type: entity
+  name: surplus materials spawner
+  id: LootSpawnerMaterialsSurplus
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/Sheets/metal.rsi
+          state: steel_3
+    - type: RandomSpawner
+      rarePrototypes:
+        - SheetUranium1
+        - IngotGold1
+        - IngotSilver1
+      rareChance: 0.1
+      prototypes:
+        - SheetPlasteel10
+        - SheetPlasma1
+        - MaterialWoodPlank10
+        - PartRodMetal10
+        - SheetSteel10
+        - SheetGlass10
+        - MaterialCloth10
+        - MaterialCardboard10
+        - SheetPlastic10
+        - CableApcStack10
+        - CableMVStack10
+        - CableHVStack10
+      chance: 0.9
+      offset: 0.0
+
+# Cable coil spawner
+- type: entity
+  name: cable coil spawner
+  id: LootSpawnerCableCoil
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Tools/cable-coils.rsi
+          state: coilall-30
+    - type: RandomSpawner
+      rarePrototypes:
+        - CableApcStack10
+        - CableMVStack10
+        - CableHVStack10
+      rareChance: 0.1
+      prototypes:
+        - CableApcStack
+        - CableMVStack
+        - CableHVStack
+      chance: 0.9
+      offset: 0.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/medical.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/medical.yml
new file mode 100644
index 0000000000..ca6618dd12
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/medical.yml
@@ -0,0 +1,65 @@
+# Minor medical loot spawner
+# Use case: Common areas that aren't medical
+- type: entity
+  name: healing supplies spawner
+  id: LootSpawnerMedicalMinor
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Specific/Medical/medical.rsi
+          state: brutepack
+    - type: RandomSpawner
+      rarePrototypes:
+        - MedkitFilled
+      rareChance: 0.1
+      prototypes:
+        - Syringe #you win some you lose some
+        - Brutepack
+        - Ointment
+        - Gauze
+        - EmergencyMedipen
+        - PillCanisterIron
+      chance: 0.9
+      offset: 0.0
+
+# Proper medical loot spawner, contains things like beakers and better meds.
+- type: entity
+  name: medical loot spawner
+  id: LootSpawnerMedicalClassy
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Specific/Medical/firstaidkits.rsi
+          state: firstaid
+    - type: RandomSpawner
+      rarePrototypes:
+        - PillCanisterDermaline
+        - PillCanisterDylovene
+        - PillCanisterBicaridine
+        - PillCanisterKelotane
+        - PillCanisterDexalin
+        - HandheldHealthAnalyzer
+        - ClothingHandsGlovesLatex
+      rareChance: 0.1
+      prototypes:
+        - Syringe
+        - Dropper
+        - Beaker
+        - LargeBeaker
+        - Brutepack
+        - Ointment
+        - Gauze
+        - EmergencyMedipen
+        - EpinephrineChemistryBottle
+        - PillCanisterTricordrazine
+        - PillCanisterCharcoal
+        - PillCanisterHyronalin
+        - PillCanisterIron
+        - Bloodpack
+        - MedkitFilled
+      chance: 0.9
+      offset: 0.0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml
new file mode 100644
index 0000000000..f5585a5e32
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml
@@ -0,0 +1,148 @@
+# Security 
+- type: entity
+  name: security loot spawner
+  suffix: Gear, Simple
+  id: LootSpawnerSecurityBasic
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Weapons/Melee/flash.rsi
+          state: flash
+    - type: RandomSpawner
+      rarePrototypes:
+        - ClothingEyesGlassesSunglasses
+        - BoxHandcuff
+      rareChance: 0.05
+      prototypes:
+        - Flash
+        - Handcuffs
+        - Zipties
+        - FlashlightSeclite
+        - Tourniquet
+      chance: 0.85
+
+- type: entity
+  name: security loot spawner
+  suffix: Gear, Better
+  id: LootSpawnerSecurity
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Weapons/Melee/flash.rsi
+          state: flash
+    - type: RandomSpawner
+      rarePrototypes:
+        - ClothingEyesGlassesSunglasses
+        - BoxHandcuff
+        - BoxFlashbang
+        - TearGasGrenade
+        - WeaponDisabler
+        - Stunbaton
+      rareChance: 0.05
+      prototypes:
+        - Flash
+        - Handcuffs
+        - Zipties
+        - FlashlightSeclite
+        - GrenadeFlashBang
+        - SecurityWhistle
+        - Tourniquet
+      chance: 0.85
+ 
+# Armory loot spawner
+# Automatics are a complete mess right now, so the AK-MS And WT-550 have been commented out for consistency's sake. I have no idea what role these guns are supposed to fufill.
+- type: entity
+  name: armory loot spawner
+  suffix: Guns, Armor
+  id: LootSpawnerArmory
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Clothing/OuterClothing/Armor/security.rsi
+          state: icon
+        - sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - ClothingHeadHelmetSwat
+        - WeaponShotgunEnforcer
+#        - WeaponRifleAk
+      rareChance: 0.05
+      prototypes:
+        - RiotShield
+        - RiotBulletShield
+        - RiotLaserShield
+        - ClothingHeadHelmetBasic
+        - ClothingHeadHelmetRiot
+        - ClothingOuterArmorBasic
+        - ClothingOuterArmorRiot
+        - ClothingOuterArmorBulletproof
+#        - WeaponSubMachineGunWt550
+        - WeaponDisabler
+        - WeaponPistolMk58
+        - WeaponRifleLecter
+        - WeaponSubMachineGunDrozd
+        - WeaponLaserCarbine
+        - WeaponShotgunKammerer
+      chance: 0.95
+      offset: 0.0
+
+- type: entity
+  name: armory loot spawner
+  suffix: Guns
+  id: LootSpawnerArmoryGunsOnly
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - WeaponShotgunEnforcer
+#        - WeaponRifleAk
+      rareChance: 0.05
+      prototypes:
+#        - WeaponSubMachineGunWt550
+        - WeaponDisabler
+        - WeaponPistolMk58
+        - WeaponRifleLecter
+        - WeaponSubMachineGunDrozd
+        - WeaponLaserCarbine
+        - WeaponShotgunKammerer
+      chance: 0.95
+      offset: 0.0
+
+- type: entity
+  name: armory loot spawner
+  suffix: Armor
+  id: LootSpawnerArmoryArmorOnly
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Clothing/OuterClothing/Armor/security.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - ClothingHeadHelmetSwat
+      rareChance: 0.05
+      prototypes:
+        - RiotShield
+        - RiotBulletShield
+        - RiotLaserShield
+        - ClothingHeadHelmetBasic
+        - ClothingHeadHelmetRiot
+        - ClothingOuterArmorBasic
+        - ClothingOuterArmorRiot
+        - ClothingOuterArmorBulletproof
+      chance: 0.95
+      offset: 0.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 7942d26f32..b21792579f 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -1,3 +1,14 @@
+- type: entity
+  abstract: true
+  parent: MarkerBase
+  id: BaseAntagSpawner
+  name: ghost role spawn point
+  components:
+  - type: GhostRole
+    raffle:
+      settings: default
+  - type: GhostRoleAntagSpawner
+
 - type: entity
   id: SpawnPointGhostRatKing
   name: ghost role spawn point
@@ -83,18 +94,13 @@
 
 - type: entity
   noSpawn: true
+  parent: BaseAntagSpawner
   id: SpawnPointLoneNukeOperative
-  name: ghost role spawn point
-  suffix: loneops
-  parent: MarkerBase
   components:
   - type: GhostRole
     name: ghost-role-information-loneop-name
     description: ghost-role-information-loneop-description
     rules: ghost-role-information-loneop-rules
-    raffle:
-      settings: default
-  - type: GhostRoleAntagSpawner
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
@@ -130,20 +136,14 @@
     description: roles-antag-nuclear-operative-objective
 
 - type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostDragon
   noSpawn: true
-  name: ghost role spawn point
-  suffix: dragon
+  parent: BaseAntagSpawner
+  id: SpawnPointGhostDragon
   components:
   - type: GhostRole
     name: ghost-role-information-space-dragon-name
     description: ghost-role-information-space-dragon-description
     rules: ghost-role-component-default-rules
-    raffle:
-      settings: default
-  - type: GhostRoleMobSpawner
-    prototype: MobDragon
   - type: Sprite
     layers:
     - state: green
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 71f5596ccf..baea453cb8 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -84,6 +84,7 @@
   - type: Hands
     showInHands: false
     disableExplosionRecursion: true
+  - type: ComplexInteraction
   - type: IntrinsicRadioReceiver
   - type: IntrinsicRadioTransmitter
     channels:
@@ -125,6 +126,7 @@
     - Stun
     - KnockedDown
     - SlowedDown
+    - Flashed
   - type: TypingIndicator
     proto: robot
   - type: Speech
@@ -146,7 +148,6 @@
     locked: true
   - type: ActivatableUIRequiresLock
   - type: LockedWiresPanel
-  - type: Flashable
   - type: Damageable
     damageContainer: Silicon
   - type: Destructible
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 81f889b438..075ac534c6 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -192,7 +192,7 @@
 
 - type: entity
   id: BorgChassisMedical
-  parent: BaseBorgChassisNT
+  parent: [BaseBorgChassisNT, ShowMedicalIcons]
   name: medical cyborg
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index a79d96065a..b5f69e6f56 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1200,6 +1200,7 @@
       state: "creampie_human"
       visible: false
   - type: Hands
+  - type: ComplexInteraction
   - type: GenericVisualizer
     visuals:
       enum.CreamPiedVisuals.Creamed:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 39e68b63a7..3b6c4e8ed9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -48,7 +48,6 @@
     sprite: Mobs/Effects/onfire.rsi
     normalState: Generic_mob_burning
   - type: Climbing
-  - type: Flashable
   - type: NameIdentifier
     group: GenericNumber
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
index 657ac466f8..285e75bca0 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -12,7 +12,6 @@
   - type: NpcFactionMember
     factions:
     - SimpleHostile
-  - type: Hands
   - type: Sprite
     drawdepth: Mobs
     sprite: Structures/Machines/VendingMachines/cola.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 23eb462db1..c1cfa40836 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -781,7 +781,6 @@
       amount: 3
     - id: DrinkTequilaBottleFull
       amount: 1
-  - type: Flashable
   - type: Tag
     tags:
     - CannotSuicide
@@ -808,7 +807,6 @@
 #    name: ghost-role-information-tropico-name
 #    description: ghost-role-information-tropico-description
 #  - type: GhostTakeoverAvailable
-#  - type: Flashable
   - type: Tag
     tags:
     - VimPilot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 3c61306e04..b2fefb67ae 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -246,7 +246,7 @@
       path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
-  parent: MobSiliconBase
+  parent: [MobSiliconBase, ShowMedicalIcons]
   id: MobMedibot
   name: medibot
   description: No substitute for a doctor, but better than nothing.
@@ -287,12 +287,6 @@
     interactFailureString: petting-failure-medibot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
 
 - type: entity
   parent: MobSiliconBase
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 12ea40b1e3..4936d883e5 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -25,6 +25,7 @@
     - ForcedSleep
     - TemporaryBlindness
     - Pacified
+    - Flashed
   - type: Buckle
   - type: StandingState
   - type: Tag
@@ -99,6 +100,7 @@
       - TemporaryBlindness
       - Pacified
       - StaminaModifier
+      - Flashed
   - type: Bloodstream
     bloodMaxVolume: 150
   - type: MobPrice
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index de3a282eeb..a3d4eafacb 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -40,6 +40,7 @@
     factions:
     - Xeno
   - type: Hands
+  - type: ComplexInteraction
   - type: Sprite
     drawdepth: Mobs
     sprite: Mobs/Aliens/Xenos/burrower.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index b294729e07..0fa85fc84f 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -18,6 +18,7 @@
     canInteract: true
   - type: GhostHearing
   - type: Hands
+  - type: ComplexInteraction
   - type: Puller
   - type: CombatMode
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index cb9dc1c911..258488af9b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -142,11 +142,10 @@
 - type: entity
   parent: BaseMobDragon
   id: MobDragon
+  suffix: No role or objectives
   components:
   - type: Dragon
     spawnRiftAction: ActionSpawnRift
-  - type: GenericAntag
-    rule: Dragon
   - type: ActionGun
     action: ActionDragonsBreath
     gunProto: DragonsBreathGun
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index c7b4464350..80ee2c55b8 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -225,6 +225,7 @@
     - type: Inventory
       templateId: holoclown
     - type: Hands
+    - type: ComplexInteraction
     - type: Clumsy
       clumsyDamage:
         types:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index 0db72b5a6d..bddf819b00 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -13,6 +13,9 @@
   name: syndicate agent
   suffix: Human, Base
   components:
+    - type: RandomHumanoidAppearance
+      randomizeName: false
+      hair: HairBald
     - type: Loadout
       prototypes: [SyndicateOperativeGearExtremelyBasic]
     - type: RandomMetadata
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index c5805f0ed9..e365ee3a1c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -1,4 +1,18 @@
-# Random humanoids
+## Random humanoids
+
+- type: randomHumanoidSettings
+  id: EventHumanoid
+  components:
+    - type: RandomHumanoidAppearance
+      randomizeName: false
+    - type: GhostTakeoverAvailable
+
+- type: randomHumanoidSettings
+  id: EventHumanoidMindShielded
+  parent: EventHumanoid
+  components:
+    - type: MindShield
+    - type: InitialInfectedExempt
 
 ## Death Squad
 
@@ -20,22 +34,20 @@
 
 - type: randomHumanoidSettings
   id: DeathSquad
+  parent: EventHumanoidMindShielded
   randomizeName: false
-  components:
-    - type: MindShield
+  components:        
     - type: GhostRole
       name: ghost-role-information-Death-Squad-name
       description: ghost-role-information-Death-Squad-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ DeathSquadGear ]
     - type: RandomMetadata
       nameSegments:
         - NamesFirstMilitaryLeader
         - NamesLastMilitary
-    - type: InitialInfectedExempt
 
 
 ## ERT Leader
@@ -58,22 +70,20 @@
 
 - type: randomHumanoidSettings
   id: ERTLeader
+  parent: EventHumanoidMindShielded
   randomizeName: false
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGear ]
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitaryLeader
       - NamesLastMilitary
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTLeaderEVA
@@ -92,16 +102,13 @@
   id: ERTLeaderEVA
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGearEVA ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTLeaderEVALecter
@@ -116,16 +123,13 @@
   id: ERTLeaderEVALecter
   parent: ERTLeaderEVA
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGearEVALecter ]
-    - type: InitialInfectedExempt
 
 ## ERT Chaplain
 
@@ -149,20 +153,17 @@
   id: ERTChaplain
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-chaplain-name
       description: ghost-role-information-ert-chaplain-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTChaplainGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTChaplainEVA
@@ -180,16 +181,13 @@
   id: ERTChaplainEVA
   parent: ERTChaplain
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-chaplain-name
       description: ghost-role-information-ert-chaplain-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTChaplainGearEVA ]
-    - type: InitialInfectedExempt
 
 ## ERT Janitor
 
@@ -213,20 +211,17 @@
   id: ERTJanitor
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-janitor-name
       description: ghost-role-information-ert-janitor-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTJanitorGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTJanitorEVA
@@ -244,16 +239,13 @@
   id: ERTJanitorEVA
   parent: ERTJanitor
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-janitor-name
       description: ghost-role-information-ert-janitor-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTJanitorGearEVA ]
-    - type: InitialInfectedExempt
 
 ## ERT Engineer
 
@@ -277,20 +269,17 @@
   id: ERTEngineer
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-engineer-name
       description: ghost-role-information-ert-engineer-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTEngineerGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTEngineerEVA
@@ -308,16 +297,13 @@
   id: ERTEngineerEVA
   parent: ERTEngineer
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-engineer-name
       description: ghost-role-information-ert-engineer-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTEngineerGearEVA ]
-    - type: InitialInfectedExempt
 
 ## ERT Security
 
@@ -341,20 +327,17 @@
   id: ERTSecurity
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTSecurityGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVA
@@ -372,16 +355,13 @@
   id: ERTSecurityEVA
   parent: ERTSecurity
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTSecurityGearEVA ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVALecter
@@ -395,16 +375,13 @@
   id: ERTSecurityEVALecter
   parent: ERTSecurityEVA
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTSecurityGearEVALecter ]
-    - type: InitialInfectedExempt
 
 ## ERT Medic
 
@@ -428,20 +405,17 @@
   id: ERTMedical
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-medical-name
       description: ghost-role-information-ert-medical-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTMedicalGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTMedicalEVA
@@ -459,16 +433,13 @@
   id: ERTMedicalEVA
   parent: ERTMedical
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-medical-name
       description: ghost-role-information-ert-medical-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTMedicalGearEVA ]
-    - type: InitialInfectedExempt
 
 ## CBURN
 
@@ -486,8 +457,8 @@
 
 - type: randomHumanoidSettings
   id: CBURNAgent
+  parent: EventHumanoidMindShielded
   components:
-    - type: MindShield
     - type: Loadout
       prototypes: [CBURNGear]
     - type: GhostRole
@@ -495,12 +466,10 @@
       description: ghost-role-information-cburn-agent-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
-    - type: InitialInfectedExempt
 ## Central Command
 
 - type: entity
@@ -516,17 +485,15 @@
 
 - type: randomHumanoidSettings
   id: CentcomOfficial
+  parent: EventHumanoidMindShielded
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-centcom-official-name
       description: ghost-role-information-centcom-official-description
       raffle:
         settings: default
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ CentcomGear ]
-    - type: InitialInfectedExempt
 
 ## Syndicate
 
@@ -545,6 +512,8 @@
 - type: randomHumanoidSettings
   id: SyndicateAgent
   components:
+    - type: RandomHumanoidAppearance
+      randomizeName: false
     - type: Loadout
       prototypes: [SyndicateOperativeGearExtremelyBasic]
 
@@ -561,6 +530,8 @@
 - type: randomHumanoidSettings
   id: NukeOp
   components:
+    - type: RandomHumanoidAppearance
+      randomizeName: false
     - type: NukeOperative
 
 - type: entity
@@ -580,6 +551,7 @@
 
 - type: randomHumanoidSettings
   id: Cluwne
+  parent: EventHumanoid
   randomizeName: false
   components:
     - type: GhostRole
@@ -587,9 +559,11 @@
       description: ghost-role-information-cluwne-description
       raffle:
         settings: default
-    - type: GhostTakeoverAvailable
     - type: Cluwne
 
+
+## Shuttle roles
+
 ## Lost Cargo technician
 
 - type: entity
@@ -619,7 +593,7 @@
 
 - type: randomHumanoidSettings
   id: LostCargoTechnician
-  randomizeName: false
+  parent: EventHumanoid
   components:
     - type: GhostRole
       name: ghost-role-information-lost-cargo-technical-name
@@ -627,13 +601,8 @@
       rules: ghost-role-information-lost-cargo-technical-rules
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ LostCargoTechGearSuit, LostCargoTechGearCoat ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 # Clown troupe
 
@@ -674,6 +643,7 @@
 
 - type: randomHumanoidSettings
   id: ClownTroupe
+  parent: EventHumanoid
   randomizeName: false
   components:
     - type: GhostRole
@@ -682,7 +652,6 @@
       rules: ghost-role-information-clown-troupe-rules
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ClownTroupe ]
     - type: RandomMetadata
@@ -691,18 +660,11 @@
 
 - type: randomHumanoidSettings
   id: ClownTroupeBanana
+  parent: ClownTroupe
   randomizeName: false
   components:
-    - type: GhostRole
-      name: ghost-role-information-clown-troupe-name
-      description: ghost-role-information-clown-troupe-description
-      rules: ghost-role-information-clown-troupe-rules
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ BananaClown ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_clown
 
 # Traveling exotic chef
 
@@ -732,7 +694,7 @@
 
 - type: randomHumanoidSettings
   id: TravelingChef
-  randomizeName: false
+  parent: EventHumanoid
   components:
     - type: GhostRole
       name: ghost-role-information-traveling-chef-name
@@ -740,13 +702,8 @@
       rules: ghost-role-information-traveling-chef-rules
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ TravelingChef ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 # Disaster victim
 
@@ -793,9 +750,11 @@
     - type: RandomHumanoidSpawner
       settings: DisasterVictimCaptain
 
+## Following use EventHumanoidMindShielded since they are heads and probably should have mindshields
+
 - type: randomHumanoidSettings
-  id: DisasterVictimResearchDirector
-  randomizeName: false
+  id: DisasterVictimHead
+  parent: EventHumanoidMindShielded
   components:
     - type: GhostRole
       name: ghost-role-information-disaster-victim-name
@@ -803,49 +762,27 @@
       rules: ghost-role-information-disaster-victim-rules
       raffle:
         settings: default
-    - type: GhostTakeoverAvailable
+
+- type: randomHumanoidSettings
+  id: DisasterVictimResearchDirector
+  parent: DisasterVictimHead
+  components:
     - type: Loadout
       prototypes: [ DisasterVictimRD, DisasterVictimRDAlt ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 - type: randomHumanoidSettings
   id: DisasterVictimCMO
-  randomizeName: false
+  parent: DisasterVictimHead
   components:
-    - type: GhostRole
-      name: ghost-role-information-disaster-victim-name
-      description: ghost-role-information-disaster-victim-description
-      rules: ghost-role-information-disaster-victim-rules
-      raffle:
-        settings: default
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ DisasterVictimCMO, DisasterVictimCMOAlt ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 - type: randomHumanoidSettings
   id: DisasterVictimCaptain
-  randomizeName: false
+  parent: DisasterVictimHead
   components:
-    - type: GhostRole
-      name: ghost-role-information-disaster-victim-name
-      description: ghost-role-information-disaster-victim-description
-      rules: ghost-role-information-disaster-victim-rules
-      raffle:
-        settings: default
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ DisasterVictimCaptain, DisasterVictimCaptainAlt ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 # Syndie Disaster Victim
 
@@ -875,7 +812,7 @@
 
 - type: randomHumanoidSettings
   id: SyndieDisasterVictim
-  randomizeName: false
+  parent: EventHumanoid
   components:
     - type: NpcFactionMember
       factions:
@@ -886,10 +823,5 @@
       rules: ghost-role-information-syndie-disaster-victim-rules
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ SyndicateOperativeGearCivilian ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 808f9fa327..5aae3bd478 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -140,6 +140,7 @@
     - TemporaryBlindness
     - Pacified
     - StaminaModifier
+    - Flashed
   - type: Reflect
     enabled: false
     reflectProb: 0
@@ -149,6 +150,7 @@
   - type: Identity
   - type: IdExaminable
   - type: Hands
+  - type: ComplexInteraction
   - type: Internals
   - type: Inventory
   - type: InventorySlots
@@ -233,7 +235,6 @@
   id: BaseMobSpeciesOrganic
   abstract: true
   components:
-  - type: Flashable
   - type: Barotrauma
     damage:
       types:
@@ -248,24 +249,7 @@
         Heat: -0.07
       groups:
         Brute: -0.07
-  # Organs
-  - type: StatusEffects
-    allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
-    - Stutter
-    - SeeingRainbows
-    - Electrocution
-    - ForcedSleep
-    - TemporaryBlindness
-    - Drunk
-    - SlurredSpeech
-    - RatvarianLanguage
-    - PressureImmunity
-    - Muted
-    - Pacified
-    - StaminaModifier
+
   - type: Blindable
   # Other
   - type: Temperature
@@ -309,6 +293,7 @@
   abstract: true
   components:
   - type: Hands
+  - type: ComplexInteraction
   - type: Inventory
   - type: InventorySlots
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 93aff069f0..d3c58a0fe7 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -84,6 +84,17 @@
     - type: StaticPrice
       price: 750
 
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: CargoSaleComputerCircuitboard
+  name: cargo sale computer board
+  description: A computer printed circuit board for a cargo sale computer.
+  components:
+    - type: Sprite
+      state: cpu_supply
+    - type: ComputerBoard
+      prototype: ComputerPalletConsole
+
 - type: entity
   id: CargoBountyComputerCircuitboard
   parent: BaseComputerCircuitboard
@@ -394,4 +405,4 @@
     - type: Sprite
       state: cpu_science
     - type: ComputerBoard
-      prototype: ComputerRoboticsControl
+      prototype: ComputerRoboticsControl
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index e3e77d5c88..b9c2b752db 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -4,7 +4,7 @@
   name: base flatpack
   description: A flatpack used for constructing something.
   categories:
-  - hideSpawnMenu
+  - HideSpawnMenu
   components:
   - type: Item
     size: Large
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index b76ca6a14a..b1a6ab0b8f 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [ BaseItem, StorePresetUplink ] #PDA's have uplinks so they have to inherit the data.
   id: BasePDA
   name: PDA
   description: Personal Data Assistant.
diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml
index 554c5214c1..e47fa00c45 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -25,7 +25,7 @@
   id: WizardsGrimoire
   name: wizards grimoire
   suffix: Wizard
-  parent: BaseItem
+  parent: [ BaseItem, StorePresetSpellbook ]
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -46,7 +46,6 @@
     - type: Store
       refundAllowed: true
       ownerOnly: true # get your own tome!
-      preset: StorePresetSpellbook
       balance:
         WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
 
@@ -55,12 +54,11 @@
   id: WizardsGrimoireNoRefund
   name: wizards grimoire
   suffix: Wizard, No Refund
-  parent: WizardsGrimoire
+  parent: [ WizardsGrimoire, StorePresetSpellbook ]
   components:
     - type: Store
       refundAllowed: false
       ownerOnly: true # get your own tome!
-      preset: StorePresetSpellbook
       balance:
         WizCoin: 10 # prices are balanced around this 10 point maximum and how strong the spells are
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 62a63c80c3..37de294cce 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -9,6 +9,8 @@
       sprite: Objects/Misc/stock_parts.rsi
     - type: Item
       size: Tiny
+    - type: Stack
+      count: 1
 
 - type: entity
   id: CapacitorStockPart
@@ -25,6 +27,8 @@
     - type: Tag
       tags:
         - CapacitorStockPart
+    - type: Stack
+      stackType: Capacitor
 
 - type: entity
   id: MicroManipulatorStockPart
@@ -38,6 +42,8 @@
     - type: MachinePart
       part: Manipulator
       rating: 1
+    - type: Stack
+      stackType: MicroManipulator
 
 - type: entity
   id: MatterBinStockPart
@@ -51,3 +57,5 @@
     - type: MachinePart
       part: MatterBin
       rating: 1
+    - type: Stack
+      stackType: MatterBin
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index c92985c2cb..9690d0bdfe 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -143,7 +143,7 @@
         - Cuffable # useless if you cant be cuffed
 
 - type: entity
-  parent: BaseSubdermalImplant
+  parent: [ BaseSubdermalImplant, StorePresetUplink ]
   id: UplinkImplant
   name: uplink implant
   description: This implant lets the user access a hidden Syndicate uplink at will.
@@ -155,7 +155,6 @@
       components:
       - Hands # prevent mouse buying grenade penguin since its not telepathic
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 0
   - type: UserInterface
diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
index 459beeef18..53d4f7953b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
@@ -48,7 +48,7 @@
 
 # Uplinks
 - type: entity
-  parent: BaseItem
+  parent: [ BaseItem, StorePresetUplink ]
   id: BaseUplinkRadio
   name: syndicate uplink
   description: Suspiciously looking old radio...
@@ -68,7 +68,6 @@
   - type: ActivatableUI
     key: enum.StoreUiKey.Key
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 0
 
@@ -78,7 +77,6 @@
   suffix: 20 TC
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 20
 
@@ -88,7 +86,6 @@
   suffix: 25 TC
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 25
 
@@ -99,7 +96,6 @@
   suffix: 40 TC, NukeOps
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 40
   - type: Tag
@@ -112,7 +108,6 @@
   suffix: 60 TC, LoneOps
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 60
   - type: Tag
@@ -125,6 +120,5 @@
   suffix: DEBUG
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 99999
diff --git a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
index 5255e5f303..cfd0b8f770 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
@@ -7,7 +7,6 @@
     state: extraction_pack
   spawn: Fulton1
   maxCount: 10
-  itemSize: 2
 
 # Entities
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/base_shadow.yml b/Resources/Prototypes/Entities/Objects/base_shadow.yml
index 2375855bf9..1cefef9e56 100644
--- a/Resources/Prototypes/Entities/Objects/base_shadow.yml
+++ b/Resources/Prototypes/Entities/Objects/base_shadow.yml
@@ -15,9 +15,6 @@
               path: /Audio/Items/hiss.ogg
               params:
                 variation: 0.08
-  - type: Flashable
-    collisionGroup:
-    - None
   - type: DamagedByFlashing
     flashDamage:
       types:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index 293aaac273..3197ba417f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -33,3 +33,14 @@
     sprite: Structures/Doors/Airlocks/Glass/external.rsi
   - type: PaintableAirlock
     group: ExternalGlass
+  - 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
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 43d1228a40..5d27cec181 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -82,29 +82,17 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
-    snapCardinals: false
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
-    - state: closed_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseUnlit"]
-    - state: welded
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: bolted_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseBolted"]
-    - state: emergency_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
-    - state: panel_open
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Occluder
     enabled: false
   - type: PaintableAirlock
     group: ShuttleGlass
   - type: Door
     occludes: false
+  - type: Fixtures
+    fixtures:
+      fix1:
+        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
+        - GlassAirlockLayer
 
 - type: entity
   id: AirlockShuttleAssembly
@@ -126,36 +114,13 @@
 
 - type: entity
   id: AirlockGlassShuttleSyndicate
-  parent: AirlockShuttle
+  parent: AirlockGlassShuttle
   name: external airlock
   suffix: Glass, Docking
   description: Necessary for connecting two space craft together.
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi
-    snapCardinals: false
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
-    - state: closed_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseUnlit"]
-    - state: welded
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: bolted_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseBolted"]
-    - state: emergency_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
-    - state: panel_open
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Occluder
-    enabled: false
-  - type: PaintableAirlock
-    group: ShuttleGlass
-  - type: Door
-    occludes: false
 
 - type: entity
   parent: AirlockShuttle
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index c098409f3a..d6815abcdc 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -105,6 +105,8 @@
       arc: 360
     - type: StaticPrice
       price: 150
+    - type: AccessReader
+      access: [ [ "Engineering" ] ]
     - type: PryUnpowered
       pryModifier: 0.5
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index b5c7a1a19c..abb12f9313 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -993,7 +993,7 @@
       enum.CargoPalletConsoleUiKey.Sale:
         type: CargoPalletConsoleBoundUserInterface
   - type: Computer
-    board: CargoRequestComputerCircuitboard
+    board: CargoSaleComputerCircuitboard
   - type: PointLight
     radius: 1.5
     energy: 1.6
@@ -1114,4 +1114,4 @@
   - type: AccessReader # only used for dangerous things
     access: [["ResearchDirector"]]
   - type: Lock
-    unlockOnClick: false
+    unlockOnClick: false
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
index b4f05cf68a..78f1504003 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
@@ -84,7 +84,7 @@
 - type: entity
   id: FlatpackerNoBoardEffect
   categories:
-  - hideSpawnMenu
+  - HideSpawnMenu
   components:
   - type: Sprite
     sprite: Structures/Machines/autolathe.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index 48994ac7d8..b63f131a7f 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -60,7 +60,7 @@
     startingCharge: 0
   - type: BatteryDischarger
   - type: TeslaCoil
-    chargeFromLightning: 500000
+    chargeFromLightning: 2000000
   - type: LightningTarget
     priority: 4
     hitProbability: 0.5
diff --git a/Resources/Prototypes/Entities/categories.yml b/Resources/Prototypes/Entities/categories.yml
new file mode 100644
index 0000000000..2fb56818f9
--- /dev/null
+++ b/Resources/Prototypes/Entities/categories.yml
@@ -0,0 +1,4 @@
+- type: entityCategory
+  id: Actions
+  name: entity-category-name-actions
+  hideSpawnMenu: true
diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
index 3787f4e603..c5a5251297 100644
--- a/Resources/Prototypes/GameRules/cargo_gifts.yml
+++ b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -1,209 +1,206 @@
+- type: entity
+  id: CargoGiftsBase
+  parent: BaseGameRule
+  abstract: true
+  components:
+  - type: GameRule
+    delay:
+      min: 10
+      max: 10
+  - type: StationEvent
+    startColor: "#18abf5"
+    startAudio:
+      path: /Audio/Announcements/announce.ogg
+  - type: CargoGiftsRule
+    sender: cargo-gift-default-sender
+
 - type: entity
   id: GiftsPizzaPartySmall
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
   - type: StationEvent
     weight: 5
-    startDelay: 10
     duration: 120
     earliestStart: 20
   - type: CargoGiftsRule
     description: cargo-gift-pizza-small
-    sender: cargo-gift-default-sender
     dest: cargo-gift-dest-bar
     gifts:
-      FoodPizzaLarge: 1              # 16 pizzas
+      FoodPizza: 1              # 4 pizzas
       FoodBarSupply: 1
       FoodSoftdrinks: 1
       CrateVendingMachineRestockRobustSoftdrinks: 1
 
 - type: entity
   id: GiftsPizzaPartyLarge
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 2
-      startDelay: 10
-      duration: 240
-      earliestStart: 20
-    - type: CargoGiftsRule
-      description: cargo-gift-pizza-large
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-bar
-      gifts:
-        FoodPizzaLarge: 4              # 64 pizzas
-        FoodBarSupply: 1
-        FoodSoftdrinksLarge: 1
+  - type: StationEvent
+    weight: 2
+    duration: 240
+    earliestStart: 20
+    minimumPlayers: 40
+  - type: CargoGiftsRule
+    description: cargo-gift-pizza-large
+    dest: cargo-gift-dest-bar
+    gifts:
+      FoodPizzaLarge: 1              # 16 pizzas
+      FoodBarSupply: 1
+      FoodSoftdrinksLarge: 1
 
 - type: entity
   id: GiftsEngineering
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 5
-      startDelay: 10
-      duration: 240
-      earliestStart: 30
-      minimumPlayers: 10
-    - type: CargoGiftsRule
-      description: cargo-gift-eng
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-eng
-      gifts:
-        EngineeringCableBulk: 1
-        AirlockKit: 1
-        MaterialSteel: 1
-        MaterialPlasteel: 1
-        MaterialGlass: 1
-        CrateVendingMachineRestockEngineering: 1
+  - type: StationEvent
+    weight: 5
+    duration: 240
+    earliestStart: 30
+    minimumPlayers: 10
+  - type: CargoGiftsRule
+    description: cargo-gift-eng
+    dest: cargo-gift-dest-eng
+    gifts:
+      EngineeringCableBulk: 1
+      AirlockKit: 1
+      MaterialSteel: 1
+      MaterialPlasteel: 1
+      MaterialGlass: 1
+      CrateVendingMachineRestockEngineering: 1
 
 - type: entity
   id: GiftsVendingRestock
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      minimumPlayers: 40
-      earliestStart: 30
-    - type: CargoGiftsRule
-      description: cargo-gift-vending
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-supp
-      gifts:
-        CrateVendingMachineRestockHotDrinks: 3
-        CrateVendingMachineRestockBooze: 1
-        CrateVendingMachineRestockNutriMax: 1
-        CrateVendingMachineRestockRobustSoftdrinks: 2
-        CrateVendingMachineRestockVendomat: 1
-        CrateVendingMachineRestockGetmoreChocolateCorp: 1
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    minimumPlayers: 40
+    earliestStart: 30
+  - type: CargoGiftsRule
+    description: cargo-gift-vending
+    dest: cargo-gift-dest-supp
+    gifts:
+      CrateVendingMachineRestockHotDrinks: 3
+      CrateVendingMachineRestockBooze: 1
+      CrateVendingMachineRestockNutriMax: 1
+      CrateVendingMachineRestockRobustSoftdrinks: 2
+      CrateVendingMachineRestockVendomat: 1
+      CrateVendingMachineRestockGetmoreChocolateCorp: 1
 
 - type: entity
   id: GiftsJanitor
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 6
-      startDelay: 10
-      duration: 120
-      minimumPlayers: 30
-      earliestStart: 20
-    - type: CargoGiftsRule
-      description: cargo-gift-cleaning
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-janitor
-      gifts:
-        ServiceJanitorial: 2
-        ServiceLightsReplacement: 2
-        ServiceJanitorBiosuit: 1
+  - type: StationEvent
+    weight: 6
+    duration: 120
+    minimumPlayers: 30
+    earliestStart: 20
+  - type: CargoGiftsRule
+    description: cargo-gift-cleaning
+    dest: cargo-gift-dest-janitor
+    gifts:
+      ServiceJanitorial: 2
+      ServiceLightsReplacement: 2
+      ServiceJanitorBiosuit: 1
 
 - type: entity
   id: GiftsMedical
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 8
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 30
-    - type: CargoGiftsRule
-      description: cargo-gift-medical-supply
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-med
-      gifts:
-        MedicalSupplies: 1
-        MedicalChemistrySupplies: 1
-        EmergencyBruteKit: 1
-        EmergencyAdvancedKit: 1
-        MedicalBiosuit: 1
+  - type: StationEvent
+    weight: 8
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 30
+  - type: CargoGiftsRule
+    description: cargo-gift-medical-supply
+    dest: cargo-gift-dest-med
+    gifts:
+      MedicalSupplies: 1
+      MedicalChemistrySupplies: 1
+      EmergencyBruteKit: 1
+      EmergencyAdvancedKit: 1
+      MedicalBiosuit: 1
 
 - type: entity
   id: GiftsSpacingSupplies
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      earliestStart: 10
-      minimumPlayers: 40
-    - type: CargoGiftsRule
-      description: cargo-gift-space-protection
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-supp
-      gifts:
-        EmergencyInternalsLarge: 2
-        EmergencyInflatablewall: 1
-        EmergencyAdvancedKit: 1
-        MedicalBiosuit: 1
-        EmergencyO2Kit: 1
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    earliestStart: 10
+    minimumPlayers: 40
+  - type: CargoGiftsRule
+    description: cargo-gift-space-protection
+    dest: cargo-gift-dest-supp
+    gifts:
+      EmergencyInternalsLarge: 2
+      EmergencyInflatablewall: 1
+      EmergencyAdvancedKit: 1
+      MedicalBiosuit: 1
+      EmergencyO2Kit: 1
 
 - type: entity
   id: GiftsFireProtection
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 40
-    - type: CargoGiftsRule
-      description: cargo-gift-fire-protection
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-supp
-      gifts:
-        EmergencyFire: 2
-        EmergencyBurnKit: 1
-        EmergencyBruteKit: 1
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 40
+  - type: CargoGiftsRule
+    description: cargo-gift-fire-protection
+    dest: cargo-gift-dest-supp
+    gifts:
+      EmergencyFire: 2
+      EmergencyBurnKit: 1
+      EmergencyBruteKit: 1
 
 - type: entity
   id: GiftsSecurityGuns
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 3
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 50
-    - type: CargoGiftsRule
-      description: cargo-gift-security-guns
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-sec
-      gifts:
-        SecurityArmor: 3
-        ArmorySmg: 1
-        ArmoryShotgun: 1
-        ArmoryLaser: 1
+  - type: StationEvent
+    weight: 3
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 50
+  - type: CargoGiftsRule
+    description: cargo-gift-security-guns
+    dest: cargo-gift-dest-sec
+    gifts:
+      SecurityArmor: 3
+      ArmorySmg: 1
+      ArmoryShotgun: 1
+      ArmoryLaser: 1
 
 - type: entity
   id: GiftsSecurityRiot
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 50
-    - type: CargoGiftsRule
-      description: cargo-gift-security-riot
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-sec
-      gifts:
-        SecurityRiot: 2
-        SecurityRestraints: 2
-        SecurityNonLethal: 2
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 50
+  - type: CargoGiftsRule
+    description: cargo-gift-security-riot
+    dest: cargo-gift-dest-sec
+    gifts:
+      SecurityRiot: 2
+      SecurityRestraints: 2
+      SecurityNonLethal: 2
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index b1b48258ba..9f6e6a8125 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -1,22 +1,63 @@
+- type: entity
+  id: BaseStationEvent
+  parent: BaseGameRule
+  abstract: true
+  noSpawn: true
+  components:
+    - type: GameRule
+      delay:
+        min:  10
+        max:  20
+
+- type: entity
+  id: BaseStationEventShortDelay
+  parent: BaseGameRule
+  abstract: true
+  noSpawn: true
+  components:
+    - type: GameRule
+      delay:
+        min:  10
+        max:  20
+
+- type: entity
+  id: BaseStationEventLongDelay
+  parent: BaseGameRule
+  abstract: true
+  noSpawn: true
+  components:
+    - type: GameRule
+      delay:
+        min:  40
+        max:  60
+
 - type: entity
   id: AnomalySpawn
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
+    startAnnouncementColor: "#18abf5"
+    startAudio:
+      path: /Audio/Announcements/announce.ogg
     weight: 8
-    startDelay: 30
     duration: 35
   - type: AnomalySpawnRule
 
 - type: entity
   id: BluespaceArtifact
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
+  - type: GameRule
+    delay:
+      min:  30
+      max:  30
   - type: StationEvent
+    startAnnouncementColor: "#18abf5"
+    startAudio:
+      path: /Audio/Announcements/announce.ogg
     weight: 8
-    startDelay: 30
     duration: 35
   - type: BluespaceArtifactRule
 
@@ -86,12 +127,28 @@
   components:
   - type: StationEvent
     weight: 6.5
-    duration: 1
     earliestStart: 40
     reoccurrenceDelay: 20
     minimumPlayers: 20
-  - type: RandomSpawnRule
-    prototype: SpawnPointGhostDragon
+  - type: AntagRandomSpawn
+  - type: AntagSpawner
+    prototype: MobDragon
+  - type: AntagObjectives
+    objectives:
+    - CarpRiftsObjective
+    - DragonSurviveObjective
+  - type: AntagSelection
+    agentName: dragon-round-end-agent-name
+    definitions:
+    - spawnerPrototype: SpawnPointGhostDragon
+      min: 1
+      max: 1
+      pickPlayer: false
+      mindComponents:
+      - type: DragonRole
+        prototype: Dragon
+      - type: RoleBriefing
+        briefing: dragon-role-briefing
 
 - type: entity
   parent: BaseGameRule
@@ -132,7 +189,7 @@
 
 - type: entity
   id: GasLeak
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
@@ -141,25 +198,23 @@
       path: /Audio/Announcements/attention.ogg
     endAnnouncement: station-event-gas-leak-end-announcement
     weight: 8
-    startDelay: 20
   - type: GasLeakRule
 
 - type: entity
   id: KudzuGrowth
-  parent: BaseGameRule
+  parent: BaseStationEventLongDelay
   noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 15
     minimumPlayers: 15
     weight: 7
-    startDelay: 50
     duration: 240
   - type: KudzuGrowthRule
 
 - type: entity
   id: MeteorSwarm
-  parent: BaseGameRule
+  parent: BaseStationEventLongDelay
   noSpawn: true
   components:
   - type: StationEvent
@@ -173,19 +228,17 @@
       params:
         volume: -4
     duration: null #ending is handled by MeteorSwarmRule
-    startDelay: 30
   - type: MeteorSwarmRule
 
 - type: entity
   id: MouseMigration
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 15
     weight: 6
     duration: 50
@@ -205,14 +258,13 @@
 
 - type: entity
   id: CockroachMigration
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     weight: 6
     duration: 50
   - type: VentCrittersRule
@@ -224,7 +276,7 @@
 
 - type: entity
   id: PowerGridCheck
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
@@ -235,7 +287,6 @@
       path: /Audio/Announcements/power_off.ogg
       params:
        volume: -4
-    startDelay: 24
     duration: 60
     maxDuration: 120
   - type: PowerGridCheckRule
@@ -284,7 +335,7 @@
 
 - type: entity
   id: VentClog
-  parent: BaseGameRule
+  parent: BaseStationEventLongDelay
   noSpawn: true
   components:
   - type: StationEvent
@@ -294,20 +345,18 @@
     earliestStart: 15
     minimumPlayers: 15
     weight: 5
-    startDelay: 50
     duration: 60
   - type: VentClogRule
 
 - type: entity
   id: SlimesSpawn
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
     weight: 5
@@ -323,14 +372,13 @@
 
 - type: entity
   id: SpiderSpawn
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
     weight: 5
@@ -342,14 +390,13 @@
 
 - type: entity
   id: SpiderClownSpawn
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 20
     minimumPlayers: 20
     weight: 1.5
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index 1b58ada648..fe5af117e6 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -17,18 +17,6 @@
   - type: NinjaRule
     threats: NinjaThreats
 
-# stores configuration for dragon
-- type: entity
-  noSpawn: true
-  parent: BaseGameRule
-  id: Dragon
-  components:
-  - type: GenericAntagRule
-    agentName: dragon-round-end-agent-name
-    objectives:
-    - CarpRiftsObjective
-    - DragonSurviveObjective
-
 - type: entity
   noSpawn: true
   parent: BaseGameRule
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index cdd19dc308..99e9182103 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -31,7 +31,7 @@
     - !type:PlantAdjustHealth
       amount: -0.5
     - !type:PlantAdjustMutationMod
-      prob: 0.3
+      probability: 0.3
       amount: 0.4
   metabolisms:
     Medicine:
@@ -115,10 +115,10 @@
     - !type:PlantAdjustNutrition
       amount: 0.05
     - !type:PlantAdjustWeeds
-      prob: 0.025
+      probability: 0.025
       amount: 1
     - !type:PlantAdjustPests
-      prob: 0.025
+      probability: 0.025
       amount: 1
     - !type:RobustHarvest {}
   metabolisms:
@@ -273,12 +273,12 @@
   - !type:PlantAdjustNutrition
     amount: 0.1
   - !type:PlantAdjustPests
-    prob: 0.1
+    probability: 0.1
     amount: -1
   - !type:PlantAdjustHealth
     amount: 0.1
   - !type:PlantAffectGrowth
-    prob: 0.2
+    probability: 0.2
     amount: 1
   - !type:PlantDiethylamine {}
   metabolisms:
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index e47335b1b4..8d317102c1 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -85,7 +85,7 @@
   desc: reagent-desc-fluorine
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#ba85cc"
   boilingPoint: -188.11
   meltingPoint: -219.67
   plantMetabolism:
@@ -123,7 +123,7 @@
   desc: reagent-desc-hydrogen
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#cccccc"
   boilingPoint: -253.0
   meltingPoint: -259.2
 
@@ -176,7 +176,7 @@
   desc: reagent-desc-lithium
   physicalDesc: reagent-physical-desc-shiny
   flavor: metallic
-  color: "#c6c8cc"
+  color: "#d6c0a7"
   meltingPoint: 180.5
   boilingPoint: 1330.0
   metabolisms:
@@ -235,7 +235,7 @@
   desc: reagent-desc-phosphorus
   physicalDesc: reagent-physical-desc-powdery
   flavor: metallic
-  color: "#ede4e4"
+  color: "#f5da9a"
   meltingPoint: 44.2
   boilingPoint: 280.5
   plantMetabolism:
@@ -312,7 +312,7 @@
   desc: reagent-desc-sodium
   physicalDesc: reagent-physical-desc-metallic
   flavor: bitter
-  color: "#c6c8cc"
+  color: "#a7b3d6"
   meltingPoint: 97.8
   boilingPoint: 883.0
 
@@ -334,7 +334,7 @@
   - !type:PlantAdjustHealth
     amount: -1.5
   - !type:PlantAdjustMutationMod
-    prob: 0.2
+    probability: 0.2
     amount: 0.1
   metabolisms:
     Poison:
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 06fb2b269b..9ef508feea 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -4,7 +4,7 @@
   desc: reagent-desc-oxygen
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#c4f5ff"
   boilingPoint: -183.0
   meltingPoint: -218.4
   metabolisms:
@@ -190,7 +190,7 @@
   desc: reagent-desc-nitrogen
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#a1e1ff"
   boilingPoint: -195.8
   meltingPoint: -210.0
   metabolisms:
@@ -232,7 +232,7 @@
   desc: reagent-desc-nitrous-oxide
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#5d88c9"
   boilingPoint: -88
   meltingPoint: -90
   metabolisms:
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index 1647e98bce..19f2fee183 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -178,7 +178,7 @@
   targetNode: pipe
   category: construction-category-utilities
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
   icon:
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-s
diff --git a/Resources/Prototypes/Roles/Antags/dragon.yml b/Resources/Prototypes/Roles/Antags/dragon.yml
new file mode 100644
index 0000000000..6630b812e3
--- /dev/null
+++ b/Resources/Prototypes/Roles/Antags/dragon.yml
@@ -0,0 +1,5 @@
+- type: antag
+  id: Dragon
+  name: roles-antag-dragon-name
+  antagonist: true
+  objective: roles-antag-dragon-objective
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
index 0caffb301f..cd6aed7cdf 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: glass }
   spawn: SheetGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ReinforcedGlass
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rglass }
   spawn: SheetRGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: PlasmaGlass
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: pglass }
   spawn: SheetPGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ReinforcedPlasmaGlass
@@ -28,7 +25,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rpglass }
   spawn: SheetRPGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: UraniumGlass
@@ -36,7 +32,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: uglass }
   spawn: SheetUGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ReinforcedUraniumGlass
@@ -44,7 +39,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: ruglass }
   spawn: SheetRUGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ClockworkGlass
@@ -52,4 +46,3 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: cglass }
   spawn: SheetClockworkGlass1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
index 77f750c205..7520130b9b 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: steel }
   spawn: SheetSteel1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Plasteel
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plasteel }
   spawn: SheetPlasteel1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Brass
@@ -20,4 +18,3 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: brass }
   spawn: SheetBrass1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
index 96f22ae656..565b1fc1ae 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
   spawn: SheetPaper1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Plasma
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plasma }
   spawn: SheetPlasma1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Plastic
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plastic }
   spawn: SheetPlastic1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Uranium
@@ -28,4 +25,3 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: uranium }
   spawn: SheetUranium1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/crystals.yml b/Resources/Prototypes/Stacks/Materials/crystals.yml
index 274f9c10ea..28f4ed70ca 100644
--- a/Resources/Prototypes/Stacks/Materials/crystals.yml
+++ b/Resources/Prototypes/Stacks/Materials/crystals.yml
@@ -3,4 +3,3 @@
   name: telecrystal
   icon: Objects/Specific/Syndicate/telecrystal.rsi
   spawn: Telecrystal1
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml
index 956523c92b..1fd67a096d 100644
--- a/Resources/Prototypes/Stacks/Materials/ingots.yml
+++ b/Resources/Prototypes/Stacks/Materials/ingots.yml
@@ -4,7 +4,6 @@
   icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
   spawn: IngotGold1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Silver
@@ -12,4 +11,3 @@
   icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
   spawn: IngotSilver1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml
index cc963dde59..1157dc3f00 100644
--- a/Resources/Prototypes/Stacks/Materials/materials.yml
+++ b/Resources/Prototypes/Stacks/Materials/materials.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
   spawn: MaterialBiomass1
   maxCount: 100
-  itemSize: 1
 
 - type: stack
   id: WoodPlank
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
   spawn: MaterialWoodPlank1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Cardboard
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
   spawn: MaterialCardboard1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Cloth
@@ -28,7 +25,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
   spawn: MaterialCloth1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Durathread
@@ -36,7 +32,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
   spawn: MaterialDurathread1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Diamond
@@ -44,7 +39,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
   spawn: MaterialDiamond1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: Cotton
@@ -52,7 +46,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
   spawn: MaterialCotton1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Pyrotton
@@ -60,7 +53,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
   spawn: MaterialPyrotton1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Bananium
@@ -68,7 +60,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
   spawn: MaterialBananium1
   maxCount: 10
-  itemSize: 2
 
 - type: stack
   id: MeatSheets
@@ -76,7 +67,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
   spawn: MaterialSheetMeat1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: WebSilk
@@ -84,7 +74,6 @@
   icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
   spawn: MaterialWebSilk1
   maxCount: 50
-  itemSize: 1
 
 - type: stack
   id: Bones
@@ -92,7 +81,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones}
   spawn: MaterialBones1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Gunpowder
@@ -100,4 +88,3 @@
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: MaterialGunpowder
   maxCount: 60
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
index 2a95393c27..51254b5a7a 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SteelOre
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: iron }
   spawn: SteelOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: PlasmaOre
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: plasma }
   spawn: PlasmaOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SilverOre
@@ -28,7 +25,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: silver }
   spawn: SilverOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SpaceQuartz
@@ -36,7 +32,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: spacequartz }
   spawn: SpaceQuartz1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: UraniumOre
@@ -44,7 +39,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: uranium }
   spawn: UraniumOre1
   maxCount: 30
-  itemSize: 2
 
 
 - type: stack
@@ -53,7 +47,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: bananium }
   spawn: BananiumOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: Coal
@@ -61,7 +54,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: coal }
   spawn: Coal1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SaltOre
@@ -69,4 +61,3 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: salt }
   spawn: Salt1
   maxCount: 30
-  itemSize: 2
diff --git a/Resources/Prototypes/Stacks/Materials/parts.yml b/Resources/Prototypes/Stacks/Materials/parts.yml
index 947bbb1bf2..50ceb28757 100644
--- a/Resources/Prototypes/Stacks/Materials/parts.yml
+++ b/Resources/Prototypes/Stacks/Materials/parts.yml
@@ -4,4 +4,3 @@
   icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
   spawn: PartRodMetal1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml
index 2936772f08..e7feab7b52 100644
--- a/Resources/Prototypes/Stacks/consumable_stacks.yml
+++ b/Resources/Prototypes/Stacks/consumable_stacks.yml
@@ -5,7 +5,6 @@
   name: pancake
   spawn: FoodBakedPancake
   maxCount: 3
-  itemSize: 1
 
 # Food Containers
 
@@ -15,7 +14,6 @@
   icon: { sprite: Objects/Consumable/Food/Baked/pizza.rsi, state: box }
   spawn: FoodBoxPizza
   maxCount: 30
-  itemSize: 10
 
 # Smokeables
 
@@ -25,7 +23,6 @@
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigpaper }
   spawn: PaperRolling
   maxCount: 5
-  itemSize: 1
 
 - type: stack
   id: CigaretteFilter
@@ -33,7 +30,6 @@
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigfilter }
   spawn: CigaretteFilter
   maxCount: 5
-  itemSize: 2
 
 - type: stack
   id: GroundTobacco
@@ -41,7 +37,6 @@
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundTobacco
   maxCount: 5
-  itemSize: 1
 
 - type: stack
   id: GroundCannabis
@@ -49,7 +44,6 @@
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundCannabis
   maxCount:
-  itemSize: 1
 
 - type: stack
   id: GroundCannabisRainbow
@@ -57,7 +51,6 @@
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: powderpile_rainbow }
   spawn: GroundCannabisRainbow
   maxCount:
-  itemSize: 1
 
 - type: stack
   id: LeavesTobaccoDried
@@ -65,7 +58,6 @@
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesTobaccoDried
   maxCount: 5
-  itemSize: 5
 
 - type: stack
   id: LeavesCannabisDried
@@ -73,12 +65,9 @@
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesCannabisDried
   maxCount: 5
-  itemSize: 5
 
 - type: stack
   id: LeavesCannabisRainbowDried
   name: dried rainbow cannabis leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: dried }
   spawn: LeavesCannabisRainbowDried
-  maxCount: 5
-  itemSize: 5
diff --git a/Resources/Prototypes/Stacks/engineering_stacks.yml b/Resources/Prototypes/Stacks/engineering_stacks.yml
index 77cc620402..b4550015dc 100644
--- a/Resources/Prototypes/Stacks/engineering_stacks.yml
+++ b/Resources/Prototypes/Stacks/engineering_stacks.yml
@@ -4,11 +4,9 @@
   name: inflatable wall
   spawn: InflatableWallStack1
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: InflatableDoor
   name: inflatable door
   spawn: InflatableDoorStack1
   maxCount: 4
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index c5e37013b8..c88786f0dc 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -3,469 +3,402 @@
   name: steel tile
   spawn: FloorTileItemSteel
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMetalDiamond
   name: steel tile
   spawn: FloorTileItemMetalDiamond
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWood
   name: wood floor
   spawn: FloorTileItemWood
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWhite
   name: white tile
   spawn: FloorTileItemWhite
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileDark
   name: dark tile
   spawn: FloorTileItemDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileTechmaint
   name: techmaint floor
   spawn: FloorTileItemTechmaint
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileFreezer
   name: freezer tile
   spawn: FloorTileItemFreezer
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileShowroom
   name: showroom tile
   spawn: FloorTileItemShowroom
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGCircuit
   name: green-circuit floor
   spawn: FloorTileItemGCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGold
   name: gold floor
   spawn: FloorTileItemGold
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileReinforced
   name: reinforced tile
   spawn: FloorTileItemReinforced
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMono
   name: mono tile
   spawn: FloorTileItemMono
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBrassFilled
   name: filled brass plate
   spawn: FloorTileItemBrassFilled
   maxCount: 30
-  itemSize: 5
-  
+
 - type: stack
   id: FloorTileBrassReebe
   name: smooth brass plate
   spawn: FloorTileItemBrassReebe
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileLino
   name: linoleum floor
   spawn: FloorTileItemLino
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileHydro
   name: hydro tile
   spawn: FloorTileItemHydro
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileLime
   name: lime tile
   spawn: FloorTileItemLime
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileDirty
   name: dirty tile
   spawn: FloorTileItemDirty
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleWhite
   name: white shuttle tile
   spawn: FloorTileItemShuttleWhite
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleBlue
   name: blue shuttle tile
   spawn: FloorTileItemShuttleBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleOrange
   name: orange shuttle tile
   spawn: FloorTileItemShuttleOrange
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttlePurple
   name: purple shuttle tile
   spawn: FloorTileItemShuttlePurple
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleRed
   name: red shuttle tile
   spawn: FloorTileItemShuttleRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleGrey
   name: grey shuttle tile
   spawn: FloorTileItemShuttleGrey
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleBlack
   name: black shuttle tile
   spawn: FloorTileItemShuttleBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackEighties
   name: eighties floor tile
   spawn: FloorTileItemEighties
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackArcadeBlue
   name: blue arcade tile
   spawn: FloorTileItemArcadeBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackArcadeBlue2
   name: blue arcade tile
   spawn: FloorTileItemArcadeBlue2
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackArcadeRed
   name: red arcade tile
   spawn: FloorTileItemArcadeRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetRed
   name: red carpet tile
   spawn: FloorCarpetItemRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetBlack
   name: block carpet tile
   spawn: FloorCarpetItemBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetBlue
   name: blue carpet tile
   spawn: FloorCarpetItemBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetGreen
   name: green carpet tile
   spawn: FloorCarpetItemGreen
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetOrange
   name: orange carpet tile
   spawn: FloorCarpetItemOrange
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetSkyBlue
   name: skyblue carpet tile
   spawn: FloorCarpetItemSkyBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetPurple
   name: purple carpet tile
   spawn: FloorCarpetItemPurple
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetPink
   name: pink carpet tile
   spawn: FloorCarpetItemPink
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetCyan
   name: cyan carpet tile
   spawn: FloorCarpetItemCyan
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetWhite
   name: white carpet tile
   spawn: FloorCarpetItemWhite
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackCarpetClown
   name: clown carpet tile
   spawn: FloorTileItemCarpetClown
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackCarpetOffice
   name: office carpet tile
   spawn: FloorTileItemCarpetOffice
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackBoxing
   name: boxing ring tile
   spawn: FloorTileItemBoxing
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackGym
   name: gym floor tile
   spawn: FloorTileItemGym
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileElevatorShaft
   name: elevator shaft tile
   spawn: FloorTileItemElevatorShaft
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileRockVault
   name: rock vault tile
   spawn: FloorTileItemRockVault
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBlue
   name: blue floor tile
   spawn: FloorTileItemBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMining
   name: mining floor tile
   spawn: FloorTileItemMining
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMiningDark
   name: dark mining floor tile
   spawn: FloorTileItemMiningDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMiningLight
   name: light mining floor tile
   spawn: FloorTileItemMiningLight
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBar
   name: item bar floor tile
   spawn: FloorTileItemBar
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileClown
   name: clown floor tile
   spawn: FloorTileItemClown
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMime
   name: mime floor tile
   spawn: FloorTileItemMime
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileKitchen
   name: kitchen floor tile
   spawn: FloorTileItemKitchen
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileLaundry
   name: laundry floor tile
   spawn: FloorTileItemLaundry
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileConcrete
   name: concrete tile
   spawn: FloorTileItemGrayConcrete
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGrayConcrete
   name: gray concrete tile
   spawn: FloorTileItemLaundry
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileOldConcrete
   name: old concrete tile
   spawn: FloorTileItemOldConcrete
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileSilver
   name: silver floor tile
   spawn: FloorTileItemSilver
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBCircuit
   name: bcircuit floor tile
   spawn: FloorTileItemBCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGrass
   name: grass floor tile
   spawn: FloorTileItemGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGrassJungle
   name: grass jungle floor tile
   spawn: FloorTileItemGrassJungle
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileSnow
   name: snow floor tile
   spawn: FloorTileItemSnow
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWoodPattern
   name: wood pattern floor
   spawn: FloorTileItemWoodPattern
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileFlesh
   name: flesh floor
   spawn: FloorTileItemFlesh
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileSteelMaint
   name: steel maint floor
   spawn: FloorTileItemSteelMaint
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGratingMaint
   name: grating maint floor
   spawn: FloorTileItemGratingMaint
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWeb
   name: web tile
   spawn: FloorTileItemWeb
   maxCount: 30
-  itemSize: 5
 
 # Faux science tiles
 - type: stack
@@ -473,38 +406,33 @@
   name: astro-grass floor
   spawn: FloorTileItemAstroGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMowedAstroGrass
   name: mowed astro-grass floor
   spawn: FloorTileItemMowedAstroGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileJungleAstroGrass
   name: jungle astro-grass floor
   spawn: FloorTileItemJungleAstroGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileAstroIce
   name: astro-ice floor
   spawn: FloorTileItemAstroIce
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileAstroSnow
   name: astro-snow floor
   spawn: FloorTileItemAstroSnow
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWoodLarge
   name: large wood floor
   spawn: FloorTileItemWoodLarge
-  maxCount: 30
\ No newline at end of file
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/medical_stacks.yml b/Resources/Prototypes/Stacks/medical_stacks.yml
index 9d2b77ec93..7ad3c21634 100644
--- a/Resources/Prototypes/Stacks/medical_stacks.yml
+++ b/Resources/Prototypes/Stacks/medical_stacks.yml
@@ -4,7 +4,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment }
   spawn: Ointment
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: AloeCream
@@ -12,7 +11,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Hydroponics/aloe.rsi", state: cream }
   spawn: AloeCream
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: Gauze
@@ -20,7 +18,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Gauze
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: Brutepack
@@ -28,7 +25,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Brutepack
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: Bloodpack
@@ -36,7 +32,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: bloodpack }
   spawn: Bloodpack
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: MedicatedSuture
@@ -44,7 +39,6 @@
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: medicated-suture }
   spawn: MedicatedSuture
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: RegenerativeMesh
@@ -52,6 +46,4 @@
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: regenerative-mesh}
   spawn: RegenerativeMesh
   maxCount: 10
-  itemSize: 1
-
 
diff --git a/Resources/Prototypes/Stacks/power_stacks.yml b/Resources/Prototypes/Stacks/power_stacks.yml
index 5acf4819de..7f015659e9 100644
--- a/Resources/Prototypes/Stacks/power_stacks.yml
+++ b/Resources/Prototypes/Stacks/power_stacks.yml
@@ -4,7 +4,6 @@
   icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
   spawn: CableApcStack1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: CableMV
@@ -12,7 +11,6 @@
   icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
   spawn: CableMVStack1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: CableHV
@@ -20,4 +18,3 @@
   icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
   spawn: CableHVStack1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/science_stacks.yml b/Resources/Prototypes/Stacks/science_stacks.yml
index 010a5dc659..bf58fad915 100644
--- a/Resources/Prototypes/Stacks/science_stacks.yml
+++ b/Resources/Prototypes/Stacks/science_stacks.yml
@@ -3,4 +3,21 @@
   name: artifact fragment
   spawn: ArtifactFragment1
   maxCount: 30
-  itemSize: 5
\ No newline at end of file
+
+- type: stack
+  id: Capacitor
+  name: capacitor
+  spawn: CapacitorStockPart
+  maxCount: 10
+
+- type: stack
+  id: MicroManipulator
+  name: micro manipulator
+  spawn: MicroManipulatorStockPart
+  maxCount: 10
+
+- type: stack
+  id: MatterBin
+  name: matter bin
+  spawn: MatterBinStockPart
+  maxCount: 10
diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml
index 166c29fe41..762ed68921 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -1,29 +1,37 @@
-- type: storePreset
+- type: entity
   id: StorePresetUplink
-  storeName: Uplink
-  categories:
-  - UplinkWeaponry
-  - UplinkAmmo
-  - UplinkExplosives
-  - UplinkChemicals
-  - UplinkDeception
-  - UplinkDisruption
-  - UplinkImplants
-  - UplinkAllies
-  - UplinkWearables
-  - UplinkJob
-  - UplinkPointless
-  currencyWhitelist:
-  - Telecrystal
+  abstract: true
+  components:
+  - type: Store
+    name: store-preset-name-uplink
+    categories:
+    - UplinkWeaponry
+    - UplinkAmmo
+    - UplinkExplosives
+    - UplinkChemicals
+    - UplinkDeception
+    - UplinkDisruption
+    - UplinkImplants
+    - UplinkAllies
+    - UplinkWearables
+    - UplinkJob
+    - UplinkPointless
+    currencyWhitelist:
+    - Telecrystal
+    balance:
+      Telecrystal: 0
 
-- type: storePreset
+- type: entity
   id: StorePresetSpellbook
-  storeName: Spellbook
-  categories:
-  - SpellbookOffensive    #Fireball, Rod Form
-  - SpellbookDefensive    #Magic Missile, Wall of Force
-  - SpellbookUtility      #Body Swap, Lich, Teleport, Knock, Polymorph
-  - SpellbookEquipment    #Battlemage Robes, Staff of Locker
-  - SpellbookEvents       #Summon Weapons, Summon Ghosts
-  currencyWhitelist:
+  abstract: true
+  components:
+  - type: Store
+    name: store-preset-name-spellbook
+    categories:
+    - SpellbookOffensive    #Fireball, Rod Form
+    - SpellbookDefensive    #Magic Missile, Wall of Force
+    - SpellbookUtility      #Body Swap, Lich, Teleport, Knock, Polymorph
+    - SpellbookEquipment    #Battlemage Robes, Staff of Locker
+    - SpellbookEvents       #Summon Weapons, Summon Ghosts
+    currencyWhitelist:
     - WizCoin
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index a991bf4035..27609b1bb5 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -59,3 +59,6 @@
 
 - type: statusEffect
   id: StaminaModifier
+
+- type: statusEffect
+  id: Flashed
diff --git a/Resources/Textures/Shaders/flashed_effect.swsl b/Resources/Textures/Shaders/flashed_effect.swsl
index ec486ab531..519a9fdd99 100644
--- a/Resources/Textures/Shaders/flashed_effect.swsl
+++ b/Resources/Textures/Shaders/flashed_effect.swsl
@@ -11,7 +11,7 @@ void fragment() {
 
     highp vec4 textureMix = mix(tex1, tex2, 0.5);
 
-    // Gradually mixes between the texture mix and a full-white texture, causing the "blinding" effect
+    // Gradually mixes between the texture mix and a full-black texture, causing the "blinding" effect
     highp vec4 mixed = mix(vec4(0.0, 0.0, 0.0, 1.0), textureMix, percentComplete);
 
     COLOR = vec4(mixed.rgb, remaining);
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 42cc4668a9..b68a2b22df 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -90,12 +90,12 @@
 
 - Flags: ADMIN
   Commands:
-  - delete
-  - kick
   - listplayers
   - tp
   - tpto
-  - respawn
+
+- Flags: FUN
+  Commands:
   - tippy
   - tip
 
@@ -111,6 +111,12 @@
   Commands:
   - spawn
   - cspawn
+  - delete
+
+- Flags: MODERATOR
+  Commands:
+  - kick
+  - respawn
 
 - Flags: HOST
   Commands:
diff --git a/Resources/mapping_actions.yml b/Resources/mapping_actions.yml
index 9498c3062a..e7ab1b4bf3 100644
--- a/Resources/mapping_actions.yml
+++ b/Resources/mapping_actions.yml
@@ -1,6 +1,47 @@
+- action: !type:InstantActionComponent
+    icon: /Textures/Tiles/cropped_parallax.png
+    keywords: []
+    checkCanInteract: False
+    checkConsciousness: False
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      placementOption: AlignTileAny
+      tileId: Space
+  assignments:
+  - 0: 8
+  name: space
+- action: !type:InstantActionComponent
+    icon: Interface/VerbIcons/delete.svg.192dpi.png
+    keywords: []
+    checkCanInteract: False
+    checkConsciousness: False
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      eraser: True
+  assignments:
+  - 0: 9
+  name: action-name-mapping-erase
+- action: !type:InstantActionComponent
+    icon: /Textures/Tiles/plating.png
+    keywords: []
+    checkCanInteract: False
+    checkConsciousness: False
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      placementOption: AlignTileAny
+      tileId: Plating
+  assignments:
+  - 0: 7
+  name: plating
 - action: !type:InstantActionComponent
     icon:
-      entity: ReinforcedWindow
+      entity: Grille
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -9,10 +50,10 @@
     temporary: True
     event: !type:StartPlacementActionEvent
       placementOption: SnapgridCenter
-      entityType: ReinforcedWindow
+      entityType: Grille
   assignments:
-  - 0: 3
-  name: ReinforcedWindow
+  - 0: 4
+  name: Grille
 - action: !type:InstantActionComponent
     icon:
       entity: WallSolid
@@ -28,21 +69,6 @@
   assignments:
   - 0: 0
   name: WallSolid
-- action: !type:InstantActionComponent
-    icon:
-      entity: WallReinforced
-    keywords: []
-    checkCanInteract: False
-    checkConsciousness: False
-    clientExclusive: True
-    autoPopulate: False
-    temporary: True
-    event: !type:StartPlacementActionEvent
-      placementOption: SnapgridCenter
-      entityType: WallReinforced
-  assignments:
-  - 0: 1
-  name: WallReinforced
 - action: !type:InstantActionComponent
     icon:
       entity: Window
@@ -58,6 +84,36 @@
   assignments:
   - 0: 2
   name: Window
+- action: !type:InstantActionComponent
+    icon:
+      entity: WallReinforced
+    keywords: []
+    checkCanInteract: False
+    checkConsciousness: False
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      placementOption: SnapgridCenter
+      entityType: WallReinforced
+  assignments:
+  - 0: 1
+  name: WallReinforced
+- action: !type:InstantActionComponent
+    icon:
+      entity: ReinforcedWindow
+    keywords: []
+    checkCanInteract: False
+    checkConsciousness: False
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      placementOption: SnapgridCenter
+      entityType: ReinforcedWindow
+  assignments:
+  - 0: 3
+  name: ReinforcedWindow
 - action: !type:InstantActionComponent
     icon:
       entity: Firelock
@@ -73,39 +129,6 @@
   assignments:
   - 0: 5
   name: Firelock
-- action: !type:InstantActionComponent
-    icon:
-      entity: Grille
-    keywords: []
-    checkCanInteract: False
-    checkConsciousness: False
-    clientExclusive: True
-    autoPopulate: False
-    temporary: True
-    event: !type:StartPlacementActionEvent
-      placementOption: SnapgridCenter
-      entityType: Grille
-  assignments:
-  - 0: 4
-  name: Grille
-- action: !type:InstantActionComponent
-    icon: Interface/VerbIcons/delete.svg.192dpi.png
-    keywords: []
-    checkCanInteract: False
-    checkConsciousness: False
-    clientExclusive: True
-    autoPopulate: False
-    temporary: True
-    event: !type:StartPlacementActionEvent
-      eraser: True
-  assignments:
-  - 0: 9
-  - 1: 9
-  - 2: 9
-  - 4: 9
-  - 5: 9
-  - 6: 9
-  name: action-name-mapping-erase
 - action: !type:InstantActionComponent
     icon:
       entity: GasPipeStraight
@@ -1110,34 +1133,4 @@
   assignments:
   - 0: 6
   name: steel floor
-- action: !type:InstantActionComponent
-    icon: /Textures/Tiles/plating.png
-    keywords: []
-    checkCanInteract: False
-    checkConsciousness: False
-    clientExclusive: True
-    autoPopulate: False
-    temporary: True
-    event: !type:StartPlacementActionEvent
-      placementOption: AlignTileAny
-      tileId: Plating
-  assignments:
-  - 0: 7
-  - 1: 8
-  - 2: 8
-  name: plating
-- action: !type:InstantActionComponent
-    icon: /Textures/Tiles/cropped_parallax.png
-    keywords: []
-    checkCanInteract: False
-    checkConsciousness: False
-    clientExclusive: True
-    autoPopulate: False
-    temporary: True
-    event: !type:StartPlacementActionEvent
-      placementOption: AlignTileAny
-      tileId: Space
-  assignments:
-  - 0: 8
-  name: space
 ...
diff --git a/RobustToolbox b/RobustToolbox
index c89c529ba4..ff4548f108 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit c89c529ba4fa7516e2265f3c47549da35ab6c3d8
+Subproject commit ff4548f108a5b11e1a81cb7c01f7462400e4af2b