diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
index 66d2463669..bd6603bd34 100644
--- a/BuildChecker/git_helper.py
+++ b/BuildChecker/git_helper.py
@@ -13,7 +13,7 @@ from typing import List
 
 SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
 # If this doesn't match the saved version we overwrite them all.
-CURRENT_HOOKS_VERSION = "3"
+CURRENT_HOOKS_VERSION = "4"
 QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
 
 
diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
index ee4309de1d..1b91112ff0 100755
--- a/BuildChecker/hooks/post-checkout
+++ b/BuildChecker/hooks/post-checkout
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 gitroot=$(git rev-parse --show-toplevel)
 
diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge
index 5cf3d91120..864a9cff50 100755
--- a/BuildChecker/hooks/post-merge
+++ b/BuildChecker/hooks/post-merge
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Just call post-checkout since it does the same thing.
 gitroot=$(git rev-parse --git-path hooks)
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 209c58c950..ea96b13376 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -9,6 +9,7 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using System.Numerics;
 using System.Linq;
+using Content.Client.Stylesheets;
 
 namespace Content.Client.Access.UI
 {
@@ -49,12 +50,12 @@ namespace Content.Client.Access.UI
             icons.Sort((x, y) => string.Compare(x.LocalizedJobName, y.LocalizedJobName, StringComparison.CurrentCulture));
             foreach (var jobIcon in icons)
             {
-                String styleBase = StyleBase.ButtonOpenBoth;
+                String styleBase = StyleClass.ButtonOpenBoth;
                 var modulo = i % JobIconColumnCount;
                 if (modulo == 0)
-                    styleBase = StyleBase.ButtonOpenRight;
+                    styleBase = StyleClass.ButtonOpenRight;
                 else if (modulo == JobIconColumnCount - 1)
-                    styleBase = StyleBase.ButtonOpenLeft;
+                    styleBase = StyleClass.ButtonOpenLeft;
 
                 // Generate buttons
                 var jobIconButton = new Button
diff --git a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
index 7af78d9e5f..2a85530c48 100644
--- a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
+++ b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs
@@ -119,11 +119,11 @@ public sealed partial class GroupedAccessLevelChecklist : BoxContainer
             if (_groupedAccessLevels.Count > 1)
             {
                 if (AccessGroupList.ChildCount == 0)
-                    accessGroupButton.AddStyleClass(StyleBase.ButtonOpenLeft);
+                    accessGroupButton.AddStyleClass(StyleClass.ButtonOpenLeft);
                 else if (_groupedAccessLevels.Count > 1 && AccessGroupList.ChildCount == (_groupedAccessLevels.Count - 1))
-                    accessGroupButton.AddStyleClass(StyleBase.ButtonOpenRight);
+                    accessGroupButton.AddStyleClass(StyleClass.ButtonOpenRight);
                 else
-                    accessGroupButton.AddStyleClass(StyleBase.ButtonOpenBoth);
+                    accessGroupButton.AddStyleClass(StyleClass.ButtonOpenBoth);
             }
 
             accessGroupButton.Pressed = _accessGroupTabIndex == orderedAccessGroups.IndexOf(accessGroup);
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
index a2f5f3382b..0a695a3dce 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
@@ -1,6 +1,7 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             MinSize="650 290">
     <BoxContainer Orientation="Vertical">
+        <!-- Privileged and target IDs, crew manifest button. -->
         <GridContainer Columns="2">
             <GridContainer Columns="3" HorizontalExpand="True">
                 <Label Text="{Loc 'id-card-console-window-privileged-id'}" />
@@ -16,6 +17,7 @@
             </BoxContainer>
         </GridContainer>
         <Control MinSize="0 8" />
+        <!-- Full name and job title editing. -->
         <GridContainer Columns="3" HSeparationOverride="4">
             <Label Name="FullNameLabel" Text="{Loc 'id-card-console-window-full-name-label'}" />
             <LineEdit Name="FullNameLineEdit" HorizontalExpand="True" />
@@ -26,10 +28,19 @@
             <Button Name="JobTitleSaveButton" Text="{Loc 'id-card-console-window-save-button'}" Disabled="True" />
         </GridContainer>
         <Control MinSize="0 8" />
-        <GridContainer Columns="2">
-            <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
-            <OptionButton Name="JobPresetOptionButton" />
-        </GridContainer>
+        <!-- Job preset selection, grant/revoke all access buttons. -->
+        <BoxContainer Margin="0 8 0 4">
+            <BoxContainer>
+                <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
+                <OptionButton Name="JobPresetOptionButton" />
+            </BoxContainer>
+            <Control HorizontalExpand="True"/>
+            <BoxContainer>
+                <Button Name="SelectAllButton" Text="{Loc 'id-card-console-window-select-all-button'}" />
+                <Button Name="DeselectAllButton" Text="{Loc 'id-card-console-window-deselect-all-button'}" />
+            </BoxContainer>
+        </BoxContainer>
+        <!-- Individual access buttons -->
         <Control Name="AccessLevelControlContainer" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
index 202653f700..30a7d969b6 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -79,6 +79,18 @@ namespace Content.Client.Access.UI
                 JobPresetOptionButton.AddItem(Loc.GetString(job.Name), _jobPrototypeIds.Count - 1);
             }
 
+            SelectAllButton.OnPressed += _ =>
+            {
+                SetAllAccess(true);
+                SubmitData();
+            };
+
+            DeselectAllButton.OnPressed += _ =>
+            {
+                SetAllAccess(false);
+                SubmitData();
+            };
+
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
             _accessButtons.Populate(accessLevels, prototypeManager);
             AccessLevelControlContainer.AddChild(_accessButtons);
@@ -89,14 +101,13 @@ namespace Content.Client.Access.UI
             }
         }
 
-        private void ClearAllAccess()
+        /// <param name="enabled">If true, every individual access button will be pressed. If false, each will be depressed.</param>
+        private void SetAllAccess(bool enabled)
         {
             foreach (var button in _accessButtons.ButtonsList.Values)
             {
-                if (button.Pressed)
-                {
-                    button.Pressed = false;
-                }
+                if (!button.Disabled && button.Pressed != enabled)
+                    button.Pressed = enabled;
             }
         }
 
@@ -110,7 +121,7 @@ namespace Content.Client.Access.UI
             JobTitleLineEdit.Text = Loc.GetString(job.Name);
             args.Button.SelectId(args.Id);
 
-            ClearAllAccess();
+            SetAllAccess(false);
 
             // this is a sussy way to do this
             foreach (var access in job.Access)
diff --git a/Content.Client/Actions/UI/ActionAlertTooltip.cs b/Content.Client/Actions/UI/ActionAlertTooltip.cs
index 664a67b406..065c16d61b 100644
--- a/Content.Client/Actions/UI/ActionAlertTooltip.cs
+++ b/Content.Client/Actions/UI/ActionAlertTooltip.cs
@@ -23,9 +23,10 @@ namespace Content.Client.Actions.UI
 
         public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string? requires = null)
         {
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSystem;
             _gameTiming = IoCManager.Resolve<IGameTiming>();
 
-            SetOnlyStyleClass(StyleNano.StyleClassTooltipPanel);
+            SetOnlyStyleClass(StyleClass.TooltipPanel);
 
             BoxContainer vbox;
             AddChild(vbox = new BoxContainer
@@ -36,7 +37,7 @@ namespace Content.Client.Actions.UI
             var nameLabel = new RichTextLabel
             {
                 MaxWidth = TooltipTextMaxWidth,
-                StyleClasses = {StyleNano.StyleClassTooltipActionTitle}
+                StyleClasses = { StyleClass.TooltipTitle }
             };
             nameLabel.SetMessage(name);
             vbox.AddChild(nameLabel);
@@ -46,7 +47,7 @@ namespace Content.Client.Actions.UI
                 var description = new RichTextLabel
                 {
                     MaxWidth = TooltipTextMaxWidth,
-                    StyleClasses = {StyleNano.StyleClassTooltipActionDescription}
+                    StyleClasses = { StyleClass.TooltipDesc }
                 };
                 description.SetMessage(desc);
                 vbox.AddChild(description);
@@ -55,7 +56,7 @@ namespace Content.Client.Actions.UI
             vbox.AddChild(_cooldownLabel = new RichTextLabel
             {
                 MaxWidth = TooltipTextMaxWidth,
-                StyleClasses = {StyleNano.StyleClassTooltipActionCooldown},
+                StyleClasses = { StyleClass.TooltipDesc },
                 Visible = false
             });
 
@@ -64,7 +65,7 @@ namespace Content.Client.Actions.UI
                 var requiresLabel = new RichTextLabel
                 {
                     MaxWidth = TooltipTextMaxWidth,
-                    StyleClasses = {StyleNano.StyleClassTooltipActionRequirements}
+                    StyleClasses = { StyleClass.TooltipDesc }
                 };
 
                 if (!FormattedMessage.TryFromMarkup("[color=#635c5c]" + requires + "[/color]", out var markup))
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml
index cc5207bb3a..bfe6b31c28 100644
--- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml
@@ -7,7 +7,7 @@
         </PanelContainer.PanelOverride>
 
         <Control HorizontalAlignment="Center" VerticalAlignment="Center" MaxWidth="600">
-            <PanelContainer StyleClasses="AngleRect" />
+            <PanelContainer StyleClasses="BackgroundPanel" />
 
             <BoxContainer Orientation="Vertical" Margin="4">
                 <RichTextLabel Name="Description" />
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
index 148cbf4e18..7870dae7b2 100644
--- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
@@ -12,17 +12,19 @@ namespace Content.Client.Administration.UI.AdminRemarks;
 [GenerateTypedNameReferences]
 public sealed partial class AdminMessagePopupWindow : Control
 {
+    [Dependency] private readonly IStylesheetManager _styleMan = default!;
+
     private float _timer = float.MaxValue;
 
     public event Action? OnDismissPressed;
-
     public event Action? OnAcceptPressed;
 
     public AdminMessagePopupWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+        Stylesheet = _styleMan.SheetSystem;
 
         AcceptButton.OnPressed += OnAcceptButtonPressed;
         DismissButton.OnPressed += OnDismissButtonPressed;
@@ -49,7 +51,8 @@ public sealed partial class AdminMessagePopupWindow : Control
             MessageContainer.AddChild(new AdminMessagePopupMessage(message));
         }
 
-        Description.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
+        Description.SetMessage(
+            FormattedMessage.FromMarkup(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
     }
 
     private void OnDismissButtonPressed(BaseButton.ButtonEventArgs obj)
diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
index d20c741673..7566942506 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
@@ -226,7 +226,7 @@ public sealed partial class BanPanel : DefaultWindow
         var roleGroupCheckbox = new Button
         {
             Name = $"{groupName}GroupCheckbox",
-            Text = "Ban all",
+            Text = Loc.GetString("role-bans-ban-group"),
             Margin = new Thickness(0, 0, 5, 0),
             ToggleMode = true,
         };
@@ -391,7 +391,7 @@ public sealed partial class BanPanel : DefaultWindow
         TimeLine.Text = args.Text;
         if (!double.TryParse(args.Text, out var result))
         {
-            ExpiresLabel.Text = "err";
+            ExpiresLabel.Text = Loc.GetString("ban-panel-expiry-error");
             ErrorLevel |= ErrorLevelEnum.Minutes;
             TimeLine.ModulateSelfOverride = Color.Red;
             UpdateSubmitEnabled();
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
index 2c27fdd2ce..fdaa838201 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
@@ -18,7 +18,7 @@
                 <Button Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
                 <Control HorizontalExpand="True" />
                 <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" StyleClasses="OpenRight" />
-                <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" StyleClasses="OpenBoth" />
+                <Button Visible="False" Access="Public" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" StyleClasses="OpenBoth" />
                 <controls:ConfirmButton Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" ConfirmationText="{Loc 'admin-player-actions-confirm'}" StyleClasses="OpenBoth" />
                 <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" StyleClasses="OpenBoth" />
                 <controls:ConfirmButton Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" ConfirmationText="{Loc 'admin-player-actions-confirm'}" StyleClasses="OpenBoth" />
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 1544b827ae..28aca23f75 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -166,7 +166,7 @@ public sealed class AdminLogsEui : BaseEui
         ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters
         {
             Maximized = false,
-            Title = "Admin Logs",
+            Title = Loc.GetString("admin-logs-title"),
             Monitor = monitor,
             Width = 1100,
             Height = 400
diff --git a/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml b/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml
index 326e4bf3a3..09d36af1b0 100644
--- a/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml
+++ b/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml
@@ -5,7 +5,7 @@
                 <BoxContainer Orientation="Vertical" Name="Notes" Access="Public" VerticalExpand="True"/>
             </ScrollContainer>
             <Button Name="ShowMoreButton" Text="{Loc admin-notes-show-more}" Visible="False" HorizontalAlignment="Center" />
-            <Button Name="NewNoteButton" Text="{Loc admin-notes-new-note}" Disabled="True" />
+            <Button Name="NewNoteButton" Access="Public" Text="{Loc admin-notes-new-note}" Disabled="True" />
         </BoxContainer>
     </PanelContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml b/Content.Client/Administration/UI/Notes/NoteEdit.xaml
index 72b2c55ce8..793d84113d 100644
--- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml
+++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml
@@ -3,7 +3,7 @@
                       Title="Loading..."
                       MinSize="400 200">
     <BoxContainer Orientation="Vertical" Margin="4">
-        <TextEdit Name="NoteTextEdit" HorizontalExpand="True" VerticalExpand="True" />
+        <TextEdit Name="NoteTextEdit" Access="Public" HorizontalExpand="True" VerticalExpand="True" />
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Label Name="ExpiryLabel" Text="{Loc admin-note-editor-expiry-label}" Visible="False" />
             <HistoryLineEdit Name="ExpiryLineEdit" PlaceHolder="{Loc admin-note-editor-expiry-placeholder}"
@@ -17,7 +17,7 @@
                       ToolTip="{Loc admin-note-editor-secret-tooltip}" />
             <CheckBox Name="PermanentCheckBox" Pressed="True" Text="{Loc admin-note-editor-expiry-checkbox}"
                       ToolTip="{Loc admin-note-editor-expiry-checkbox-tooltip}" />
-            <Button Name="SubmitButton" Text="{Loc admin-note-editor-submit}" HorizontalAlignment="Right" />
+            <Button Name="SubmitButton" Access="Public" Text="{Loc admin-note-editor-submit}" HorizontalAlignment="Right" />
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
index c8e3afeb22..0c27d9d646 100644
--- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
@@ -133,7 +133,7 @@ public sealed partial class NoteEdit : FancyWindow
     private bool IsSecret { get; set; }
     private NoteType NoteType { get; set; }
 
-    private NoteSeverity? NoteSeverity
+    public NoteSeverity? NoteSeverity
     {
         get => _noteSeverity;
         set
diff --git a/Content.Client/Administration/UI/PermissionsEui.cs b/Content.Client/Administration/UI/PermissionsEui.cs
index fe1237d4c9..96b53babb5 100644
--- a/Content.Client/Administration/UI/PermissionsEui.cs
+++ b/Content.Client/Administration/UI/PermissionsEui.cs
@@ -27,7 +27,7 @@ namespace Content.Client.Administration.UI
         [Dependency] private readonly IClientAdminManager _adminManager = default!;
 
         private readonly Menu _menu;
-        private readonly List<DefaultWindow> _subWindows = new();
+        private readonly List<BaseWindow> _subWindows = new();
 
         private Dictionary<int, PermissionsEuiState.AdminRankData> _ranks =
             new();
@@ -216,7 +216,7 @@ namespace Content.Client.Administration.UI
                 var titleControl = new Label { Text = admin.Title ?? Loc.GetString("permissions-eui-edit-admin-title-control-text").ToLowerInvariant() };
                 if (admin.Title == null) // none
                 {
-                    titleControl.StyleClasses.Add(StyleBase.StyleClassItalic);
+                    titleControl.StyleClasses.Add(StyleClass.Italic);
                 }
 
                 al.AddChild(titleControl);
@@ -240,7 +240,7 @@ namespace Content.Client.Administration.UI
                 var rankControl = new Label { Text = rank };
                 if (italic)
                 {
-                    rankControl.StyleClasses.Add(StyleBase.StyleClassItalic);
+                    rankControl.StyleClasses.Add(StyleClass.Italic);
                 }
 
                 al.AddChild(rankControl);
@@ -340,10 +340,9 @@ namespace Content.Client.Administration.UI
                 tab.AddChild(adminVBox);
                 tab.AddChild(rankVBox);
 
-                Contents.AddChild(tab);
+                ContentsContainer.AddChild(tab);
+                ContentsContainer.MinSize = new(600, 400);
             }
-
-            protected override Vector2 ContentsMinimumSize => new Vector2(600, 400);
         }
 
         private sealed class EditAdminWindow : DefaultWindow
@@ -419,21 +418,21 @@ namespace Content.Client.Administration.UI
                     var inherit = new Button
                     {
                         Text = "I",
-                        StyleClasses = { StyleBase.ButtonOpenRight },
+                        StyleClasses = { StyleClass.ButtonOpenRight },
                         Disabled = disable,
                         Group = group,
                     };
                     var sub = new Button
                     {
                         Text = "-",
-                        StyleClasses = { StyleBase.ButtonOpenBoth },
+                        StyleClasses = { StyleClass.ButtonOpenBoth },
                         Disabled = disable,
                         Group = group
                     };
                     var plus = new Button
                     {
                         Text = "+",
-                        StyleClasses = { StyleBase.ButtonOpenLeft },
+                        StyleClasses = { StyleClass.ButtonOpenLeft },
                         Disabled = disable,
                         Group = group
                     };
@@ -479,7 +478,7 @@ namespace Content.Client.Administration.UI
 
                 bottomButtons.AddChild(SaveButton);
 
-                Contents.AddChild(new BoxContainer
+                ContentsContainer.AddChild(new BoxContainer
                 {
                     Orientation = LayoutOrientation.Vertical,
                     Children =
@@ -605,7 +604,7 @@ namespace Content.Client.Administration.UI
 
                 bottomButtons.AddChild(SaveButton);
 
-                Contents.AddChild(new BoxContainer
+                ContentsContainer.AddChild(new BoxContainer
                 {
                     Orientation = LayoutOrientation.Vertical,
                     Children =
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
index 0d4668d5bf..783d4c6106 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -7,10 +7,8 @@
     MinSize="50 50">
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="3">
-            <cc:UICommandButton Command="kick" Text="{Loc admin-player-actions-window-title}" WindowType="{x:Type at:PlayerActionsWindow}" />
             <cc:CommandButton Command="banpanel" Text="{Loc admin-player-actions-window-ban}" />
             <cc:CommandButton Command="aghost" Text="{Loc admin-player-actions-window-admin-ghost}" />
-            <cc:UICommandButton Command="tpto" Text="{Loc admin-player-actions-window-teleport}" WindowType="{x:Type at:TeleportWindow}" />
             <cc:CommandButton Command="permissions" Text="{Loc admin-player-actions-window-permissions}" />
             <cc:CommandButton Command="announceui" Text="{Loc admin-player-actions-window-announce}"/>
             <cc:UICommandButton Command="callshuttle" Text="{Loc admin-player-actions-window-shuttle}" WindowType="{x:Type at:AdminShuttleWindow}"/>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
deleted file mode 100644
index 10718c25a5..0000000000
--- a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<DefaultWindow
-    xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    Title="{Loc admin-player-actions-window-title}" MinSize="425 272">
-    <BoxContainer Orientation="Vertical">
-        <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc admin-player-actions-reason}" MinWidth="100" />
-            <Control MinWidth="50" />
-            <LineEdit Name="ReasonLine" MinWidth="100" HorizontalExpand="True" />
-        </BoxContainer>
-        <cc:PlayerListControl Name="PlayerList" VerticalExpand="True" />
-        <BoxContainer Orientation="Horizontal">
-            <controls:ConfirmButton Name="SubmitKickButton" Text="{Loc admin-player-actions-kick}" ConfirmationText="{Loc 'admin-player-actions-confirm'}" Disabled="True"/>
-            <Button Name="SubmitAHelpButton" Text="{Loc admin-player-actions-ahelp}" Disabled="True"/>
-            <controls:ConfirmButton Name="SubmitRespawnButton" Text="{Loc admin-player-actions-respawn}" ConfirmationText="{Loc 'admin-player-actions-confirm'}" Disabled="True"/>
-        </BoxContainer>
-    </BoxContainer>
-</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
deleted file mode 100644
index 2216b6dfb0..0000000000
--- a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Content.Shared.Administration;
-using JetBrains.Annotations;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Console;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Administration.UI.Tabs.AdminTab
-{
-    [GenerateTypedNameReferences]
-    [UsedImplicitly]
-    public sealed partial class PlayerActionsWindow : DefaultWindow
-    {
-        private PlayerInfo? _selectedPlayer;
-
-        public PlayerActionsWindow()
-        {
-            RobustXamlLoader.Load(this);
-
-            SubmitKickButton.OnPressed += SubmitKickButtonOnPressed;
-            SubmitAHelpButton.OnPressed += SubmitAhelpButtonOnPressed;
-            SubmitRespawnButton.OnPressed += SubmitRespawnButtonOnPressed;
-            PlayerList.OnSelectionChanged += OnListOnOnSelectionChanged;
-        }
-
-        private void OnListOnOnSelectionChanged(PlayerInfo? obj)
-        {
-            _selectedPlayer = obj;
-            var disableButtons = _selectedPlayer == null;
-            SubmitKickButton.Disabled = disableButtons;
-            SubmitAHelpButton.Disabled = disableButtons;
-            SubmitRespawnButton.Disabled = disableButtons;
-        }
-
-        private void SubmitKickButtonOnPressed(BaseButton.ButtonEventArgs obj)
-        {
-            if (_selectedPlayer == null)
-                return;
-
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
-                $"kick \"{_selectedPlayer.Username}\" \"{CommandParsing.Escape(ReasonLine.Text)}\"");
-        }
-
-        private void SubmitAhelpButtonOnPressed(BaseButton.ButtonEventArgs obj)
-        {
-            if (_selectedPlayer == null)
-                return;
-
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
-                $"openahelp \"{_selectedPlayer.SessionId}\"");
-        }
-
-        private void SubmitRespawnButtonOnPressed(BaseButton.ButtonEventArgs obj)
-        {
-            if (_selectedPlayer == null)
-                return;
-
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
-                $"respawn \"{_selectedPlayer.Username}\"");
-        }
-    }
-}
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
deleted file mode 100644
index cceb21f14d..0000000000
--- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<DefaultWindow
-    xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    Title="{Loc admin-ui-teleport}" MinSize="425 230">
-    <BoxContainer Orientation="Vertical">
-        <cc:PlayerListControl Name="PlayerList" />
-        <Button Name="SubmitButton" Text="{Loc admin-ui-teleport}" />
-    </BoxContainer>
-</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
deleted file mode 100644
index 1978b5c3c0..0000000000
--- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Administration;
-using JetBrains.Annotations;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Console;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.IoC;
-
-namespace Content.Client.Administration.UI.Tabs.AdminTab
-{
-    [GenerateTypedNameReferences]
-    [UsedImplicitly]
-    public sealed partial class TeleportWindow : DefaultWindow
-    {
-        private PlayerInfo? _selectedPlayer;
-
-        protected override void EnteredTree()
-        {
-            SubmitButton.OnPressed += SubmitButtonOnOnPressed;
-            PlayerList.OnSelectionChanged += OnListOnOnSelectionChanged;
-        }
-
-        private void OnListOnOnSelectionChanged(PlayerInfo? obj)
-        {
-            _selectedPlayer = obj;
-            SubmitButton.Disabled = _selectedPlayer == null;
-        }
-
-        private void SubmitButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
-        {
-            if (_selectedPlayer == null)
-                return;
-            // Execute command
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
-                $"tpto \"{_selectedPlayer.Username}\"");
-        }
-    }
-}
diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml
index 9784b34557..88df194ecb 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml
@@ -14,7 +14,7 @@
                               VerticalExpand="True"
                               Margin="0 0 0 0"
                               VerticalAlignment="Center">
-                    <Label Text="{Loc 'anomaly-generator-fuel-display'}" StyleClasses="StatusFieldTitle" />
+                    <Label Text="{Loc 'anomaly-generator-fuel-display'}" StyleClasses="highlight" />
                     <ProgressBar Name="FuelBar"
                                  HorizontalExpand="True"
                                  MaxValue="1"
@@ -27,8 +27,8 @@
                                Text="0 %" />
                     </ProgressBar>
                 </BoxContainer>
-                <RichTextLabel Name="CooldownLabel" StyleClasses="StatusFieldTitle" />
-                <RichTextLabel Name="ReadyLabel" StyleClasses="StatusFieldTitle" />
+                <RichTextLabel Name="CooldownLabel" StyleClasses="highlight" />
+                <RichTextLabel Name="ReadyLabel" StyleClasses="highlight" />
             </BoxContainer>
             <!--Sprite View-->
             <PanelContainer Margin="12 0 0 0"
diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs
index ad360c5439..545afacc5e 100644
--- a/Content.Client/Arcade/BlockGameMenu.cs
+++ b/Content.Client/Arcade/BlockGameMenu.cs
@@ -338,7 +338,7 @@ namespace Content.Client.Arcade
             menuInnerPanel.AddChild(menuContainer);
             #endregion
 
-            Contents.AddChild(_mainPanel);
+            ContentsContainer.AddChild(_mainPanel);
 
             CanKeyboardFocus = true;
         }
diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
index 1ee4c26818..3d25d2208d 100644
--- a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
+++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
@@ -86,7 +86,7 @@ namespace Content.Client.Arcade
             newGame.OnPressed += _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.NewGame);
             grid.AddChild(newGame);
 
-            Contents.AddChild(grid);
+            ContentsContainer.AddChild(grid);
         }
 
         private void UpdateMetadata(SharedSpaceVillainArcadeComponent.SpaceVillainArcadeMetaDataUpdateMessage message)
diff --git a/Content.Client/AssemblyInfo.cs b/Content.Client/AssemblyInfo.cs
index 54b2cd50ac..513ab37ab2 100644
--- a/Content.Client/AssemblyInfo.cs
+++ b/Content.Client/AssemblyInfo.cs
@@ -1,3 +1,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Content.Tests")]
+[assembly: InternalsVisibleTo("Content.IntegrationTests")]
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index 64680b5321..60e06e98ce 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -1,6 +1,6 @@
 using Content.Client.Atmos.Monitor.UI.Widgets;
 using Content.Client.Message;
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Palette;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Monitor;
@@ -17,7 +17,7 @@ namespace Content.Client.Atmos.Monitor.UI;
 public sealed partial class AirAlarmWindow : FancyWindow
 {
     public event Action<string, IAtmosDeviceData>? AtmosDeviceDataChanged;
-	public event Action<IAtmosDeviceData>? AtmosDeviceDataCopied;
+    public event Action<IAtmosDeviceData>? AtmosDeviceDataCopied;
     public event Action<string, AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? AtmosAlarmThresholdChanged;
     public event Action<AirAlarmMode>? AirAlarmModeChanged;
     public event Action<bool>? AutoModeChanged;
@@ -131,7 +131,7 @@ public sealed partial class AirAlarmWindow : FancyWindow
             case GasVentPumpData pump:
                 if (!_pumps.TryGetValue(addr, out var pumpControl))
                 {
-                    var control= new PumpControl(pump, addr);
+                    var control = new PumpControl(pump, addr);
                     control.PumpDataChanged += AtmosDeviceDataChanged;
                     control.PumpDataCopied += AtmosDeviceDataCopied;
                     _pumps.Add(addr, control);
@@ -186,11 +186,9 @@ public sealed partial class AirAlarmWindow : FancyWindow
     {
         return curAlarm switch
         {
-            AtmosAlarmType.Danger => StyleNano.DangerousRedFore,
-            AtmosAlarmType.Warning => StyleNano.ConcerningOrangeFore,
-            _ => StyleNano.GoodGreenFore,
+            AtmosAlarmType.Danger => Palettes.Status.Critical,
+            AtmosAlarmType.Warning => Palettes.Status.Warning,
+            _ => Palettes.Status.Good,
         };
     }
-
-
 }
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
index 38c631e630..f4b31fd95b 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Client.Stylesheets;
 using Content.Shared.Atmos.Monitor;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -42,11 +43,11 @@ public sealed partial class ThresholdBoundControl : BoxContainer
 
         if (enabled)
         {
-            CBoundLabel.RemoveStyleClass("Disabled");
+            CBoundLabel.RemoveStyleClass(StyleClass.LabelWeak);
         }
         else
         {
-            CBoundLabel.SetOnlyStyleClass("Disabled");
+            CBoundLabel.SetOnlyStyleClass(StyleClass.LabelWeak);
         }
     }
 
diff --git a/Content.Client/Atmos/UI/GasCanisterWindow.xaml b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
index f76e32a31d..3c7647385a 100644
--- a/Content.Client/Atmos/UI/GasCanisterWindow.xaml
+++ b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
@@ -4,7 +4,7 @@
             MinSize="480 400" Title="Canister">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Vertical" VerticalExpand="True">
-            <Label Text="{Loc comp-gas-canister-ui-canister-status}" FontColorOverride="{x:Static s:StyleNano.NanoGold}" StyleClasses="LabelBig"/>
+            <Label Text="{Loc comp-gas-canister-ui-canister-status}" StyleClasses="LabelHeading"/>
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc comp-gas-canister-ui-canister-pressure}"/>
                 <Label Name="CanisterPressureLabel" Align="Center" HorizontalExpand="True"/>
@@ -16,7 +16,7 @@
         </BoxContainer>
 
         <BoxContainer Orientation="Vertical" VerticalExpand="True">
-            <Label Text="{Loc comp-gas-canister-ui-holding-tank-status}" FontColorOverride="{x:Static s:StyleNano.NanoGold}" StyleClasses="LabelBig"/>
+            <Label Text="{Loc comp-gas-canister-ui-holding-tank-status}" StyleClasses="LabelHeading"/>
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc comp-gas-canister-ui-holding-tank-label}"/>
                 <Label Name="TankLabelLabel" Text="{Loc comp-gas-canister-ui-holding-tank-label-empty}" Align="Center" HorizontalExpand="True"/>
@@ -29,7 +29,7 @@
         </BoxContainer>
 
         <BoxContainer Orientation="Vertical" VerticalExpand="True">
-            <Label Text="{Loc comp-gas-canister-ui-release-valve-status}" FontColorOverride="{x:Static s:StyleNano.NanoGold}" StyleClasses="LabelBig"/>
+            <Label Text="{Loc comp-gas-canister-ui-release-valve-status}" StyleClasses="LabelHeading"/>
             <BoxContainer Orientation="Horizontal">
                 <BoxContainer Orientation="Vertical">
                     <Label Text="{Loc comp-gas-canister-ui-release-pressure}"/>
diff --git a/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml b/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml
index 5acb142a60..3378dc7797 100644
--- a/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml
+++ b/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml
@@ -7,10 +7,7 @@
     Orientation="Vertical"
     HorizontalExpand="True"
     Margin="0 0 0 5">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="{xNamespace:Static style:StyleNano.ButtonColorDisabled}" />
-        </PanelContainer.PanelOverride>
+    <PanelContainer StyleClasses="PanelDark">
         <Collapsible Name="Collapsible">
             <CollapsibleHeading Name="Heading" MinHeight="35"/>
             <CollapsibleBody Name="Body">
diff --git a/Content.Client/Bed/Cryostorage/CryostorageMenu.xaml b/Content.Client/Bed/Cryostorage/CryostorageMenu.xaml
index 5360cdb38e..b0f8d5cb0a 100644
--- a/Content.Client/Bed/Cryostorage/CryostorageMenu.xaml
+++ b/Content.Client/Bed/Cryostorage/CryostorageMenu.xaml
@@ -14,10 +14,8 @@
         <PanelContainer
             VerticalExpand="True"
             HorizontalExpand="True"
-            Margin="15">
-            <PanelContainer.PanelOverride>
-                <graphics:StyleBoxFlat BackgroundColor="{xNamespace:Static style:StyleNano.PanelDark}" />
-            </PanelContainer.PanelOverride>
+            Margin="15"
+            StyleClasses="PanelDark">
             <ScrollContainer VerticalExpand="True" HorizontalExpand="True">
                 <Control>
                     <Label Text="{Loc 'cryostorage-ui-label-no-bodies'}" Name="EmptyLabel" HorizontalAlignment="Center" VerticalAlignment="Center"/>
diff --git a/Content.Client/Bql/ToolshedVisualizeWindow.xaml b/Content.Client/Bql/ToolshedVisualizeWindow.xaml
index 9affbf2181..b20d05b4f3 100644
--- a/Content.Client/Bql/ToolshedVisualizeWindow.xaml
+++ b/Content.Client/Bql/ToolshedVisualizeWindow.xaml
@@ -1,7 +1,7 @@
 <DefaultWindow
     xmlns="https://spacestation14.io"
     Title="{Loc 'ui-bql-results-title'}">
-    <BoxContainer Orientation="Vertical">
+    <BoxContainer Orientation="Vertical" MinSize="500 700">
         <Label Name="StatusLabel" />
         <ScrollContainer VerticalExpand="True">
             <BoxContainer Orientation="Vertical" Name="ItemList" VerticalExpand="True" />
diff --git a/Content.Client/Bql/ToolshedVisualizeWindow.xaml.cs b/Content.Client/Bql/ToolshedVisualizeWindow.xaml.cs
index 55ee029a91..35a7524a6f 100644
--- a/Content.Client/Bql/ToolshedVisualizeWindow.xaml.cs
+++ b/Content.Client/Bql/ToolshedVisualizeWindow.xaml.cs
@@ -21,8 +21,6 @@ internal sealed partial class ToolshedVisualizeWindow : DefaultWindow
         RobustXamlLoader.Load(this);
     }
 
-    protected override Vector2 ContentsMinimumSize => new(500, 700);
-
     public void Update((string name, NetEntity entity)[] entities)
     {
         StatusLabel.Text = _loc.GetString("ui-bql-results-status", ("count", entities.Length));
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml b/Content.Client/Cargo/UI/BountyEntry.xaml
index 7c61323bd5..99874cf1a5 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml
@@ -3,7 +3,7 @@
               Margin="10 10 10 0"
               HorizontalExpand="True"
               Visible="True">
-    <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True">
+    <PanelContainer StyleClasses="BackgroundPanel" HorizontalExpand="True">
         <BoxContainer Orientation="Vertical"
                       HorizontalExpand="True">
             <BoxContainer Orientation="Horizontal">
diff --git a/Content.Client/Changeling/UI/ChangelingTransformBoundUserInterface.cs b/Content.Client/Changeling/UI/ChangelingTransformBoundUserInterface.cs
index 97c07dd8c9..64d809c0c5 100644
--- a/Content.Client/Changeling/UI/ChangelingTransformBoundUserInterface.cs
+++ b/Content.Client/Changeling/UI/ChangelingTransformBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Palette;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Changeling.Components;
 using Content.Shared.Changeling.Systems;
@@ -11,8 +11,8 @@ namespace Content.Client.Changeling.UI;
 public sealed partial class ChangelingTransformBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
     private SimpleRadialMenu? _menu;
-    private static readonly Color SelectedOptionBackground = StyleNano.ButtonColorGoodDefault.WithAlpha(128);
-    private static readonly Color SelectedOptionHoverBackground = StyleNano.ButtonColorGoodHovered.WithAlpha(128);
+    private static readonly Color SelectedOptionBackground = Palettes.Green.Element.WithAlpha(128);
+    private static readonly Color SelectedOptionHoverBackground = Palettes.Green.HoveredElement.WithAlpha(128);
 
     protected override void Open()
     {
diff --git a/Content.Client/Changelog/ChangelogButton.cs b/Content.Client/Changelog/ChangelogButton.cs
index 6e8862492c..8611866b0d 100644
--- a/Content.Client/Changelog/ChangelogButton.cs
+++ b/Content.Client/Changelog/ChangelogButton.cs
@@ -36,12 +36,12 @@ namespace Content.Client.Changelog
             if (_changelogManager.NewChangelogEntries)
             {
                 Text = Loc.GetString("changelog-button-new-entries");
-                StyleClasses.Add(StyleBase.ButtonCaution);
+                StyleClasses.Add(StyleClass.Negative);
             }
             else
             {
                 Text = Loc.GetString("changelog-button");
-                StyleClasses.Remove(StyleBase.ButtonCaution);
+                StyleClasses.Remove(StyleClass.Negative);
             }
         }
     }
diff --git a/Content.Client/Changelog/ChangelogTab.xaml.cs b/Content.Client/Changelog/ChangelogTab.xaml.cs
index 851ed20422..61ce509594 100644
--- a/Content.Client/Changelog/ChangelogTab.xaml.cs
+++ b/Content.Client/Changelog/ChangelogTab.xaml.cs
@@ -58,7 +58,7 @@ public sealed partial class ChangelogTab : Control
             ChangelogBody.AddChild(new Label
             {
                 Text = dayNice,
-                StyleClasses = { StyleBase.StyleClassLabelHeading },
+                StyleClasses = { StyleClass.LabelHeading },
                 Margin = new Thickness(4, 6, 0, 0)
             });
 
@@ -117,7 +117,7 @@ public sealed partial class ChangelogTab : Control
                     };
 
                     readDivider.AddChild(hBox);
-                    readDivider.AddChild(new PanelContainer { StyleClasses = { StyleBase.ClassLowDivider } });
+                    readDivider.AddChild(new PanelContainer { StyleClasses = { StyleClass.LowDivider } });
                     ChangelogBody.AddChild(readDivider);
 
                     if (first)
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml b/Content.Client/Changelog/ChangelogWindow.xaml
index 355452dbfa..8325de02b5 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml
+++ b/Content.Client/Changelog/ChangelogWindow.xaml
@@ -2,8 +2,9 @@
                     xmlns:ui="clr-namespace:Content.Client.Changelog"
                     Title="{Loc 'changelog-window-title'}"
                     MinSize="500 400"
-                    SetSize="500 400">
-    <PanelContainer StyleClasses="AngleRect" />
+                    SetSize="500 400"
+                    Stylesheet="Interface">
+    <PanelContainer StyleClasses="BackgroundPanel" />
     <BoxContainer Orientation="Vertical">
         <TabContainer Name="Tabs" Access="Public" HorizontalExpand="True" VerticalExpand="True" />
         <PanelContainer StyleClasses="LowDivider" />
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index d8f560f151..801d0859c3 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -21,8 +21,7 @@ namespace Content.Client.Changelog
         public ChangelogWindow()
         {
             RobustXamlLoader.Load(this);
-            WindowTitle.AddStyleClass(StyleBase.StyleClassLabelHeading);
-            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+            WindowTitle.AddStyleClass(StyleClass.LabelHeading);
         }
 
         protected override void Opened()
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
index aca316f6b3..5bc640ab44 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
@@ -33,8 +33,8 @@
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc 'chem-master-window-buffer-text'}" />
                 <Control HorizontalExpand="True" />
+                <Button MinSize="80 0" Margin="0 0 10 0" Name="BufferSortButton" Access="Public" Text="{Loc 'chem-master-window-sort-type-none'}" />
                 <Button MinSize="80 0" Name="BufferTransferButton" Access="Public" Text="{Loc 'chem-master-window-transfer-button'}" ToggleMode="True" StyleClasses="OpenRight" />
-                <Button MinSize="80 0" Name="BufferSortButton" Access="Public" Text="{Loc 'chem-master-window-sort-type-none'}" StyleClasses="OpenBoth" />
                 <Button MinSize="80 0" Name="BufferDiscardButton" Access="Public" Text="{Loc 'chem-master-window-discard-button'}" ToggleMode="True" StyleClasses="OpenLeft" />
             </BoxContainer>
 
@@ -82,7 +82,7 @@
                 <Label Text="{Loc 'chem-master-window-packaging-text'}" />
                 <Control HorizontalExpand="True"/>
                 <Label Text="{Loc 'chem-master-window-buffer-label'}" />
-                <Label Name="BufferCurrentVolume" StyleClasses="LabelSecondaryColor" />
+                <Label Name="BufferCurrentVolume" StyleClasses="LabelWeak" />
             </BoxContainer>
 
             <!-- Wrap the packaging info-->
@@ -112,9 +112,9 @@
                     <BoxContainer Orientation="Horizontal">
                         <Label Text="{Loc 'chem-master-window-pills-label'}" />
                         <Control HorizontalExpand="True" MinSize="50 0" />
-                        <Label Text="{Loc 'chem-master-window-pills-number-label'}" Margin="5 0 0 0" StyleClasses="LabelSecondaryColor" />
+                        <Label Text="{Loc 'chem-master-window-pills-number-label'}" Margin="5 0 0 0" StyleClasses="LabelWeak" />
                         <SpinBox MinSize="100 0" Name="PillNumber" Access="Public" Value="0" />
-                        <Label Text="{Loc 'chem-master-window-dose-label'}" Margin="5 0 0 0" StyleClasses="LabelSecondaryColor" />
+                        <Label Text="{Loc 'chem-master-window-dose-label'}" Margin="5 0 0 0" StyleClasses="LabelWeak" />
                         <SpinBox MinSize="100 0" Name="PillDosage" Access="Public" Value="1" />
                         <Button MinSize="80 0" Name="CreatePillButton" Access="Public" Text="{Loc 'chem-master-window-create-button'}" />
                     </BoxContainer>
@@ -122,7 +122,7 @@
                     <BoxContainer Orientation="Horizontal">
                         <Label Text="{Loc 'chem-master-window-bottles-label'}" />
                         <Control HorizontalExpand="True" MinSize="50 0" />
-                        <Label Text="{Loc 'chem-master-window-dose-label'}" Margin="5 0 0 0" StyleClasses="LabelSecondaryColor" />
+                        <Label Text="{Loc 'chem-master-window-dose-label'}" Margin="5 0 0 0" StyleClasses="LabelWeak" />
                         <SpinBox MinSize="100 0" Name="BottleDosage" Access="Public" Value="0" />
                         <Button MinSize="80 0" Name="CreateBottleButton" Access="Public" Text="{Loc 'chem-master-window-create-button'}" />
                     </BoxContainer>
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index 14b55066e9..d610f34b29 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -53,14 +53,14 @@ namespace Content.Client.Chemistry.UI
             {
                 // For every button decide which stylebase to have
                 // Every row has 10 buttons
-                String styleBase = StyleBase.ButtonOpenBoth;
+                String styleBase = StyleClass.ButtonOpenBoth;
                 uint modulo = i % 10;
                 if (i > 0 && modulo == 0)
-                    styleBase = StyleBase.ButtonOpenRight;
+                    styleBase = StyleClass.ButtonOpenRight;
                 else if (i > 0 && modulo == 9)
-                    styleBase = StyleBase.ButtonOpenLeft;
+                    styleBase = StyleClass.ButtonOpenLeft;
                 else if (i == 0)
-                    styleBase = StyleBase.ButtonOpenRight;
+                    styleBase = StyleClass.ButtonOpenRight;
 
                 // Generate buttons
                 PillTypeButtons[i] = new Button
@@ -113,16 +113,16 @@ namespace Content.Client.Chemistry.UI
 
             var buttonConfigs = new (string text, ChemMasterReagentAmount amount, string styleClass)[]
             {
-                ("1", ChemMasterReagentAmount.U1, StyleBase.ButtonOpenBoth),
-                ("5", ChemMasterReagentAmount.U5, StyleBase.ButtonOpenBoth),
-                ("10", ChemMasterReagentAmount.U10, StyleBase.ButtonOpenBoth),
-                ("15", ChemMasterReagentAmount.U15, StyleBase.ButtonOpenBoth),
-                ("20", ChemMasterReagentAmount.U20, StyleBase.ButtonOpenBoth),
-                ("25", ChemMasterReagentAmount.U25, StyleBase.ButtonOpenBoth),
-                ("30", ChemMasterReagentAmount.U30, StyleBase.ButtonOpenBoth),
-                ("50", ChemMasterReagentAmount.U50, StyleBase.ButtonOpenBoth),
-                ("100", ChemMasterReagentAmount.U100, StyleBase.ButtonOpenBoth),
-                (Loc.GetString("chem-master-window-buffer-all-amount"), ChemMasterReagentAmount.All, StyleBase.ButtonOpenLeft),
+                ("1", ChemMasterReagentAmount.U1, StyleClass.ButtonOpenBoth),
+                ("5", ChemMasterReagentAmount.U5, StyleClass.ButtonOpenBoth),
+                ("10", ChemMasterReagentAmount.U10, StyleClass.ButtonOpenBoth),
+                ("15", ChemMasterReagentAmount.U15, StyleClass.ButtonOpenBoth),
+                ("20", ChemMasterReagentAmount.U20, StyleClass.ButtonOpenBoth),
+                ("25", ChemMasterReagentAmount.U25, StyleClass.ButtonOpenBoth),
+                ("30", ChemMasterReagentAmount.U30, StyleClass.ButtonOpenBoth),
+                ("50", ChemMasterReagentAmount.U50, StyleClass.ButtonOpenBoth),
+                ("100", ChemMasterReagentAmount.U100, StyleClass.ButtonOpenBoth),
+                (Loc.GetString("chem-master-window-buffer-all-amount"), ChemMasterReagentAmount.All, StyleClass.ButtonOpenLeft),
             };
 
             var buttons = new List<ReagentButton>();
@@ -252,7 +252,7 @@ namespace Content.Client.Chemistry.UI
             var bufferVol = new Label
             {
                 Text = $"{state.BufferCurrentVolume}u",
-                StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
+                StyleClasses = { StyleClass.LabelWeak }
             };
             bufferHBox.AddChild(bufferVol);
 
@@ -321,7 +321,7 @@ namespace Content.Client.Chemistry.UI
                     new Label
                     {
                         Text = $"{info.CurrentVolume}/{info.MaxVolume}",
-                        StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
+                        StyleClasses = { StyleClass.LabelWeak }
                     }
                 }
             });
@@ -376,7 +376,7 @@ namespace Content.Client.Chemistry.UI
                     new Label
                     {
                         Text = $"{quantity}u",
-                        StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
+                        StyleClasses = { StyleClass.LabelWeak }
                     },
 
                     // Padding
diff --git a/Content.Client/Chemistry/UI/HyposprayStatusControl.cs b/Content.Client/Chemistry/UI/HyposprayStatusControl.cs
index 37b6fb5ed8..a564bcefc6 100644
--- a/Content.Client/Chemistry/UI/HyposprayStatusControl.cs
+++ b/Content.Client/Chemistry/UI/HyposprayStatusControl.cs
@@ -23,7 +23,7 @@ public sealed class HyposprayStatusControl : Control
     {
         _parent = parent;
         _solutionContainers = solutionContainers;
-        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+        _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
         AddChild(_label);
     }
 
diff --git a/Content.Client/Chemistry/UI/InjectorStatusControl.cs b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
index 0358876b76..24f988bd35 100644
--- a/Content.Client/Chemistry/UI/InjectorStatusControl.cs
+++ b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
@@ -24,7 +24,7 @@ public sealed class InjectorStatusControl : Control
     {
         _parent = parent;
         _solutionContainers = solutionContainers;
-        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+        _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
         AddChild(_label);
     }
 
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
index 2b64eed570..1b56a1b4ec 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
@@ -107,7 +107,7 @@ namespace Content.Client.Chemistry.UI
                 var quantityLabel = new Label
                 {
                     Text = Loc.GetString("reagent-dispenser-window-quantity-label-text", ("quantity", quantity)),
-                    StyleClasses = { StyleNano.StyleClassLabelSecondaryColor },
+                    StyleClasses = { StyleClass.LabelWeak },
                 };
 
                 ContainerInfo.Children.Add(new BoxContainer
diff --git a/Content.Client/Chemistry/UI/SolutionStatusControl.cs b/Content.Client/Chemistry/UI/SolutionStatusControl.cs
index 1a33ffb0e1..8a551a262c 100644
--- a/Content.Client/Chemistry/UI/SolutionStatusControl.cs
+++ b/Content.Client/Chemistry/UI/SolutionStatusControl.cs
@@ -29,7 +29,7 @@ public sealed class SolutionStatusControl : PollingItemStatusControl<SolutionSta
         _parent = parent;
         _entityManager = entityManager;
         _solutionContainers = solutionContainers;
-        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+        _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
         AddChild(_label);
     }
 
diff --git a/Content.Client/Cloning/UI/AcceptCloningWindow.cs b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
index 01824ad482..e4f472068d 100644
--- a/Content.Client/Cloning/UI/AcceptCloningWindow.cs
+++ b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
@@ -17,7 +17,7 @@ namespace Content.Client.Cloning.UI
 
             Title = Loc.GetString("accept-cloning-window-title");
 
-            Contents.AddChild(new BoxContainer
+            ContentsContainer.AddChild(new BoxContainer
             {
                 Orientation = LayoutOrientation.Vertical,
                 Children =
diff --git a/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs b/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs
index fb4447bdf9..eb5ce3051b 100644
--- a/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs
+++ b/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs
@@ -67,7 +67,7 @@ public sealed partial class ChameleonMenu : DefaultWindow
                 MinSize = new Vector2(48, 48),
                 HorizontalExpand = true,
                 Group = group,
-                StyleClasses = {StyleBase.ButtonSquare},
+                StyleClasses = {StyleClass.ButtonSquare},
                 ToggleMode = true,
                 Pressed = _selectedId == id,
                 ToolTip = proto.Name
diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs
index 4ca68c5fa0..845c72f954 100644
--- a/Content.Client/Configurable/UI/ConfigurationMenu.cs
+++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs
@@ -68,7 +68,7 @@ namespace Content.Client.Configurable.UI
             outerColumn.AddChild(Column);
             baseContainer.AddChild(outerColumn);
             baseContainer.AddChild(confirmButton);
-            Contents.AddChild(baseContainer);
+            ContentsContainer.AddChild(baseContainer);
         }
 
         private void OnConfirm(ButtonEventArgs args)
diff --git a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml
index d0e39865b8..271b6b1bff 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml
+++ b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml
@@ -13,7 +13,8 @@
                 Name="IconLabel"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Bottom"
-                StyleClasses="contextMenuIconLabel"
+                StyleClasses="LabelSubText"
+                Align="Right"
                 Visible="false"/>
         </SpriteView>
         <RichTextLabel
diff --git a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs
index 364986dd9d..91d34b037b 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs
@@ -16,7 +16,6 @@ namespace Content.Client.ContextMenu.UI
     {
         public const string StyleClassContextMenuButton = "contextMenuButton";
         public const string StyleClassContextMenuExpansionTexture = "contextMenuExpansionTexture";
-        public const string StyleClassEntityMenuIconLabel = "contextMenuIconLabel";
 
         public const float ElementMargin = 2;
         public const float ElementHeight = 32;
diff --git a/Content.Client/Crayon/CrayonComponent.cs b/Content.Client/Crayon/CrayonComponent.cs
deleted file mode 100644
index 5729c616c2..0000000000
--- a/Content.Client/Crayon/CrayonComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Crayon;
-using Robust.Shared.GameObjects;
-using Robust.Shared.ViewVariables;
-
-namespace Content.Client.Crayon
-{
-    [RegisterComponent]
-    public sealed partial class CrayonComponent : SharedCrayonComponent
-    {
-        [ViewVariables(VVAccess.ReadWrite)] public bool UIUpdateNeeded;
-        [ViewVariables] public int Charges { get; set; }
-        [ViewVariables] public int Capacity { get; set; }
-    }
-}
diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs
index dc03979481..c0d127dd40 100644
--- a/Content.Client/Crayon/CrayonSystem.cs
+++ b/Content.Client/Crayon/CrayonSystem.cs
@@ -1,67 +1,52 @@
 using Content.Client.Items;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
+using Content.Shared.Charges.Components;
+using Content.Shared.Charges.Systems;
 using Content.Shared.Crayon;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
-using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Crayon;
 
 public sealed class CrayonSystem : SharedCrayonSystem
 {
-    // Didn't do in shared because I don't think most of the server stuff can be predicted.
+    [Dependency] private readonly SharedChargesSystem _charges = default!;
+    [Dependency] private readonly EntityManager _entityManager = default!;
+
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<CrayonComponent, ComponentHandleState>(OnCrayonHandleState);
-        Subs.ItemStatus<CrayonComponent>(ent => new StatusControl(ent));
-    }
 
-    private static void OnCrayonHandleState(EntityUid uid, CrayonComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not CrayonComponentState state) return;
-
-        component.Color = state.Color;
-        component.SelectedState = state.State;
-        component.Charges = state.Charges;
-        component.Capacity = state.Capacity;
-
-        component.UIUpdateNeeded = true;
+        Subs.ItemStatus<CrayonComponent>(ent => new StatusControl(ent, _charges, _entityManager));
     }
 
     private sealed class StatusControl : Control
     {
-        private readonly CrayonComponent _parent;
+        private readonly Entity<CrayonComponent> _crayon;
+        private readonly SharedChargesSystem _charges;
         private readonly RichTextLabel _label;
+        private readonly int _capacity;
 
-        public StatusControl(CrayonComponent parent)
+        public StatusControl(Entity<CrayonComponent> crayon, SharedChargesSystem charges, EntityManager entityManage)
         {
-            _parent = parent;
-            _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+            _crayon = crayon;
+            _charges = charges;
+            _capacity = entityManage.GetComponent<LimitedChargesComponent>(_crayon.Owner).MaxCharges;
+            _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
             AddChild(_label);
-
-            parent.UIUpdateNeeded = true;
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
         {
             base.FrameUpdate(args);
 
-            if (!_parent.UIUpdateNeeded)
-            {
-                return;
-            }
-
-            _parent.UIUpdateNeeded = false;
             _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label",
-                ("color",_parent.Color),
-                ("state",_parent.SelectedState),
-                ("charges", _parent.Charges),
-                ("capacity",_parent.Capacity)));
+                ("color",_crayon.Comp.Color),
+                ("state",_crayon.Comp.SelectedState),
+                ("charges", _charges.GetCurrentCharges(_crayon.Owner)),
+                ("capacity", _capacity)));
         }
     }
 }
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
index f1ac5a79cb..166ba01832 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
@@ -137,7 +137,8 @@ namespace Content.Client.Crayon.UI
 
         private void ButtonOnPressed(ButtonEventArgs obj)
         {
-            if (obj.Button.Name == null) return;
+            if (obj.Button.Name == null)
+                return;
 
             _selected = obj.Button.Name;
             _autoSelected = null;
diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs
index 68418eb3c8..f34ff43afe 100644
--- a/Content.Client/Credits/CreditsWindow.xaml.cs
+++ b/Content.Client/Credits/CreditsWindow.xaml.cs
@@ -100,11 +100,11 @@ public sealed partial class CreditsWindow : DefaultWindow
 
         var container = new BoxContainer { Orientation = LayoutOrientation.Horizontal };
 
-        var previousPageButton = new Button { Text = "Previous Page" };
+        var previousPageButton = new Button { Text = Loc.GetString("credits-window-previous-page-button") };
         previousPageButton.OnPressed +=
             _ => PopulateAttributions(attributionsContainer, count - AttributionsSourcesPerPage);
 
-        var nextPageButton = new Button { Text = "Next Page" };
+        var nextPageButton = new Button { Text = Loc.GetString("credits-window-next-page-button") };
         nextPageButton.OnPressed +=
             _ => PopulateAttributions(attributionsContainer, count + AttributionsSourcesPerPage);
 
@@ -258,7 +258,7 @@ public sealed partial class CreditsWindow : DefaultWindow
         foreach (var entry in CreditsManager.GetLicenses(_resourceManager).OrderBy(p => p.Name))
         {
             licensesContainer.AddChild(new Label
-                { StyleClasses = { StyleBase.StyleClassLabelHeading }, Text = entry.Name });
+                { StyleClasses = { StyleClass.LabelHeading }, Text = entry.Name });
 
             // We split these line by line because otherwise
             // the LGPL causes Clyde to go out of bounds in the rendering code.
@@ -299,7 +299,7 @@ public sealed partial class CreditsWindow : DefaultWindow
 
             first = false;
             patronsContainer.AddChild(new Label
-                { StyleClasses = { StyleBase.StyleClassLabelHeading }, Text = $"{tier.Key}" });
+                { StyleClasses = { StyleClass.LabelHeading }, Text = $"{tier.Key}" });
 
             var msg = string.Join(", ", tier.OrderBy(p => p.Name).Select(p => p.Name));
 
@@ -347,7 +347,7 @@ public sealed partial class CreditsWindow : DefaultWindow
 
             first = false;
             ss14ContributorsContainer.AddChild(new Label
-                { StyleClasses = { StyleBase.StyleClassLabelHeading }, Text = title });
+                { StyleClasses = { StyleClass.LabelHeading }, Text = title });
 
             var label = new RichTextLabel();
             var text = _resourceManager.ContentFileReadAllText($"/Credits/{path}");
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
index 179304a978..f88fa07f5a 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
@@ -58,7 +58,7 @@
                            StyleClasses="LabelBig" />
                     <BoxContainer Orientation="Horizontal"
                                   Margin="0 0 0 5">
-                        <Label Text="{Loc 'crew-monitoring-user-interface-job'}"
+                        <Label Text="{Loc 'crew-monitoring-ui-job-label'}"
                                FontColorOverride="DarkGray" />
                         <TextureRect Name="PersonJobIcon"
                                      TextureScale="2 2"
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
index 33b4fbc335..dcae68fa7e 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
@@ -276,7 +276,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
 
     private void SetStatus(SecurityStatus status)
     {
-        if (status == SecurityStatus.Wanted || status == SecurityStatus.Suspected)
+        if (status == SecurityStatus.Wanted || status == SecurityStatus.Suspected || status == SecurityStatus.Hostile)
         {
             GetReason(status);
             return;
@@ -322,6 +322,8 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
             SecurityStatus.Detained => "hud_incarcerated",
             SecurityStatus.Discharged => "hud_discharged",
             SecurityStatus.Suspected => "hud_suspected",
+            SecurityStatus.Hostile => "hud_hostile",
+            SecurityStatus.Eliminated => "hud_eliminated",
             _ => "SecurityIconNone"
         };
     }
diff --git a/Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs
new file mode 100644
index 0000000000..a78603c22c
--- /dev/null
+++ b/Content.Client/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Damage.Systems;
+
+namespace Content.Client.Damage.Systems;
+
+public sealed class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem;
diff --git a/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs b/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs
index adeb451a07..873fb851b7 100644
--- a/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs
+++ b/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs
@@ -157,15 +157,12 @@ public sealed partial class DecalPlacerWindow : DefaultWindow
             {
                 var panelContainer = new PanelContainer
                 {
-                    PanelOverride = new StyleBoxFlat
-                    {
-                        BackgroundColor = StyleNano.ButtonColorDefault
-                    },
                     Children =
                     {
                         button
                     }
                 };
+                panelContainer.SetOnlyStyleClass(StyleClass.PanelLight);
                 Grid.AddChild(panelContainer);
             }
             else
diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs
index ae9c7eda78..0f6537eead 100644
--- a/Content.Client/Doors/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -68,7 +68,7 @@ public sealed class DoorSystem : SharedDoorSystem
             {
                 new AnimationTrackSpriteFlick
                 {
-                    LayerKey = DoorVisualLayers.BaseUnlit,
+                    LayerKey = DoorVisualLayers.BaseEmagging,
                     KeyFrames =
                     {
                         new AnimationTrackSpriteFlick.KeyFrame(comp.EmaggingSpriteState, 0f),
@@ -92,6 +92,10 @@ public sealed class DoorSystem : SharedDoorSystem
         if (_animationSystem.HasRunningAnimation(entity, DoorComponent.AnimationKey))
             _animationSystem.Stop(entity.Owner, DoorComponent.AnimationKey);
 
+        // We are checking beforehand since some doors may not have an emagging visual layer, and we don't want LayerSetVisible to throw an error.
+        if (_sprite.TryGetLayer(entity.Owner, DoorVisualLayers.BaseEmagging, out var _, false))
+            _sprite.LayerSetVisible(entity.Owner, DoorVisualLayers.BaseEmagging, state == DoorState.Emagging);
+
         UpdateAppearanceForDoorState(entity, args.Sprite, state);
     }
 
@@ -134,7 +138,9 @@ public sealed class DoorSystem : SharedDoorSystem
 
                 return;
             case DoorState.Emagging:
-                _animationSystem.Play(entity, (Animation)entity.Comp.EmaggingAnimation, DoorComponent.AnimationKey);
+                // We are checking beforehand since some doors may not have an emagging visual layer.
+                if (_sprite.TryGetLayer(entity.Owner, DoorVisualLayers.BaseEmagging, out var _, false))
+                    _animationSystem.Play(entity, (Animation)entity.Comp.EmaggingAnimation, DoorComponent.AnimationKey);
 
                 return;
         }
diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs
index c806cdad66..692232776a 100644
--- a/Content.Client/Drunk/DrunkOverlay.cs
+++ b/Content.Client/Drunk/DrunkOverlay.cs
@@ -27,6 +27,15 @@ public sealed class DrunkOverlay : Overlay
 
     private const float VisualThreshold = 10.0f;
     private const float PowerDivisor = 250.0f;
+    /// <remarks>
+    /// This is a magic number based on my person preference of how quickly the bloodloss effect should kick in.
+    /// It is entirely arbitrary, and you should change it if it sucks.
+    /// Honestly should be refactored to be based on amount of blood lost but that's out of scope for what I'm doing atm.
+    /// Also caps all booze visual effects to a max intensity of 100 seconds or 100 booze power.
+    /// </remarks>
+    private const float MaxBoozePower = 100f;
+
+    private const float BoozePowerScale = 8f;
 
     private float _visualScale = 0;
 
@@ -50,15 +59,9 @@ public sealed class DrunkOverlay : Overlay
 
         var time = status.Item2;
 
-        var power = SharedDrunkSystem.MagicNumber;
+        var power = time == null ? MaxBoozePower : (float) Math.Min((time - _timing.CurTime).Value.TotalSeconds, MaxBoozePower);
 
-        if (time != null)
-        {
-            var curTime = _timing.CurTime;
-            power = (float) (time - curTime).Value.TotalSeconds;
-        }
-
-        CurrentBoozePower += 8f * (power * 0.5f - CurrentBoozePower) * args.DeltaSeconds / (power+1);
+        CurrentBoozePower += BoozePowerScale * (power - CurrentBoozePower) * args.DeltaSeconds / (power+1);
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 223652f3b9..d4fdfc41d4 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -154,12 +154,6 @@ namespace Content.Client.Entry
             _configManager.SetCVar("interface.resolutionAutoScaleMinimum", 0.5f);
         }
 
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            _titleWindowManager.Shutdown();
-        }
-
         public override void PostInit()
         {
             base.PostInit();
diff --git a/Content.Client/Fax/UI/FaxWindow.xaml b/Content.Client/Fax/UI/FaxWindow.xaml
index 04b297ab92..4161c1e307 100644
--- a/Content.Client/Fax/UI/FaxWindow.xaml
+++ b/Content.Client/Fax/UI/FaxWindow.xaml
@@ -56,7 +56,7 @@
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
                                 Scale="0.9 0.9"
-                                StyleClasses="Refresh" />
+                                StyleClasses="RefreshButton" />
                          </Button>
                    </BoxContainer>
                 </BoxContainer>
diff --git a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs
index 57645e386e..2feca1f176 100644
--- a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs
+++ b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs
@@ -21,7 +21,7 @@ public sealed class HandheldGpsStatusControl : Control
         _parent = parent;
         _entMan = IoCManager.Resolve<IEntityManager>();
         _transform = _entMan.System<TransformSystem>();
-        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+        _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
         AddChild(_label);
         UpdateGpsDetails();
     }
diff --git a/Content.Client/GameTicking/Managers/TitleWindowManager.cs b/Content.Client/GameTicking/Managers/TitleWindowManager.cs
index 18ce16f634..bc33e78411 100644
--- a/Content.Client/GameTicking/Managers/TitleWindowManager.cs
+++ b/Content.Client/GameTicking/Managers/TitleWindowManager.cs
@@ -15,48 +15,29 @@ public sealed class TitleWindowManager
 
     public void Initialize()
     {
-        _cfg.OnValueChanged(CVars.GameHostName, OnHostnameChange, true);
-        _cfg.OnValueChanged(CCVars.GameHostnameInTitlebar, OnHostnameTitleChange, true);
+        _cfg.OnValueChanged(CVars.GameHostName, _ => OnHostnameChange(), true);
+        _cfg.OnValueChanged(CCVars.GameHostnameInTitlebar, _ => OnHostnameChange(), true);
 
-        _client.RunLevelChanged += OnRunLevelChangedChange;
+        _client.RunLevelChanged += (_, _) => OnHostnameChange();
     }
 
-    public void Shutdown()
-    {
-        _cfg.UnsubValueChanged(CVars.GameHostName, OnHostnameChange);
-        _cfg.UnsubValueChanged(CCVars.GameHostnameInTitlebar, OnHostnameTitleChange);
-    }
-
-    private void OnHostnameChange(string hostname)
+    private void OnHostnameChange()
     {
         var defaultWindowTitle = _gameController.GameTitle();
 
-        // Since the game assumes the server name is MyServer and that GameHostnameInTitlebar CCVar is true by default
-        // Lets just... not show anything. This also is used to revert back to just the game title on disconnect.
-        if (_client.RunLevel == ClientRunLevel.Initialize)
+        // When the client starts connecting, it will be using either the default hostname, or whatever hostname
+        // is set in its config file (aka the last server they connected to) until it receives the latest cvars.
+        // If they are not connected then we will not show anything other than the usual window title.
+        if (_client.RunLevel != ClientRunLevel.InGame)
         {
             _clyde.SetWindowTitle(defaultWindowTitle);
             return;
         }
 
-        if (_cfg.GetCVar(CCVars.GameHostnameInTitlebar))
-            // If you really dislike the dash I guess change it here
-            _clyde.SetWindowTitle(hostname + " - " + defaultWindowTitle);
-        else
-            _clyde.SetWindowTitle(defaultWindowTitle);
-    }
-
-    // Clients by default assume game.hostname_in_titlebar is true
-    // but we need to clear it as soon as we join and actually receive the servers preference on this.
-    // This will ensure we rerun OnHostnameChange and set the correct title bar name.
-    private void OnHostnameTitleChange(bool colonthree)
-    {
-        OnHostnameChange(_cfg.GetCVar(CVars.GameHostName));
-    }
-
-    // This is just used we can rerun the hostname change function when we disconnect to revert back to just the games title.
-    private void OnRunLevelChangedChange(object? sender, RunLevelChangedEventArgs runLevelChangedEventArgs)
-    {
-        OnHostnameChange(_cfg.GetCVar(CVars.GameHostName));
+        _clyde.SetWindowTitle(
+            _cfg.GetCVar(CCVars.GameHostnameInTitlebar)
+                ? _cfg.GetCVar(CVars.GameHostName) + " - " + defaultWindowTitle
+                : defaultWindowTitle);
     }
+    // You thought I would remove the :3 from this code? You were wrong.
 }
diff --git a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
index 9fb7c339d3..4e4076d98c 100644
--- a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
+++ b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
@@ -159,7 +159,7 @@ public sealed partial class GatewayWindow : FancyWindow,
 
             if (Pressable())
             {
-                openButton.AddStyleClass(StyleBase.ButtonCaution);
+                openButton.AddStyleClass(StyleClass.Negative);
             }
 
             var buttonContainer = new BoxContainer()
diff --git a/Content.Client/Ghost/UI/ReturnToBodyMenu.cs b/Content.Client/Ghost/UI/ReturnToBodyMenu.cs
index 69f04993c9..384ffb6be6 100644
--- a/Content.Client/Ghost/UI/ReturnToBodyMenu.cs
+++ b/Content.Client/Ghost/UI/ReturnToBodyMenu.cs
@@ -15,7 +15,7 @@ public sealed class ReturnToBodyMenu : DefaultWindow
     {
         Title = Loc.GetString("ghost-return-to-body-title");
 
-        Contents.AddChild(new BoxContainer
+        ContentsContainer.AddChild(new BoxContainer
         {
             Orientation = LayoutOrientation.Vertical,
             Children =
diff --git a/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml b/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml
new file mode 100644
index 0000000000..0af8ee3ec0
--- /dev/null
+++ b/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml
@@ -0,0 +1,18 @@
+<Control xmlns="https://spacestation14.io"
+        xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+        xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    <PanelContainer HorizontalExpand="True" Margin="5 5 5 5">
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BorderThickness="1" BorderColor="#777777"/>
+        </PanelContainer.PanelOverride>
+        <BoxContainer Orientation="Vertical" Margin="5 5 5 5" Name="LawsetContainer">
+            <PanelContainer Name="NameBackground">
+                <PanelContainer.PanelOverride>
+                    <gfx:StyleBoxFlat BackgroundColor="#16168C"/>
+                </PanelContainer.PanelOverride>
+                <RichTextLabel Name="LawsetName" HorizontalAlignment="Center"/>
+            </PanelContainer>
+            <!--RichTextLabels containing the individual laws are inserted here-->
+        </BoxContainer>
+    </PanelContainer>
+</Control>
diff --git a/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml.cs
new file mode 100644
index 0000000000..86f7dce9e3
--- /dev/null
+++ b/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml.cs
@@ -0,0 +1,96 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Client.Guidebook.Richtext;
+using Content.Client.Message;
+using Content.Client.UserInterface.ControlExtensions;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+using Content.Shared.Silicons.Laws;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Guidebook.Controls;
+
+/// <summary>
+/// Control for embedding an AI Lawset in a guidebook
+/// </summary>
+[UsedImplicitly, GenerateTypedNameReferences]
+public sealed partial class GuideLawsetEmbed : Control, IDocumentTag, ISearchableControl, IPrototypeRepresentationControl
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    private ISawmill _logging = default!;
+
+    public IPrototype? RepresentedPrototype { get; private set; }
+
+    public GuideLawsetEmbed()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        MouseFilter = MouseFilterMode.Stop;
+    }
+
+    public GuideLawsetEmbed(SiliconLawsetPrototype lawset) : this()
+    {
+        GenerateControl(lawset);
+    }
+
+    private void GenerateControl(SiliconLawsetPrototype lawset)
+    {
+        RepresentedPrototype = lawset;
+
+        var lawsetNameString = lawset.Name == null ? lawset.ID : Loc.GetString(lawset.Name);
+        LawsetName.SetMarkup($"[bold]{FormattedMessage.EscapeText(lawsetNameString)}[/bold]");
+
+        var i = 1;
+        foreach (var lawID in lawset.Laws)
+        {
+            var lawPrototype = _prototype.Index<SiliconLawPrototype>(lawID);
+            var locLawString = Loc.GetString(lawPrototype.LawString);
+
+            RichTextLabel lawN = new()
+            {
+                Margin = new(0, 5, 0, 1)
+            };
+            var locLawStatement = Loc.GetString("laws-number-wrapper", ("lawnumber", i), ("lawstring", locLawString));
+            lawN.SetMarkup(locLawStatement);
+            LawsetContainer.AddChild(lawN);
+
+            i++;
+        }
+    }
+
+    public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
+    {
+        control = null;
+        if (!args.TryGetValue("Lawset", out var id))
+        {
+            _logging.Error("Lawset embed tag is missing lawset prototype argument");
+            return false;
+        }
+
+        if (!_prototype.TryIndex<SiliconLawsetPrototype>(id, out var lawset))
+        {
+            _logging.Error($"Specified SiliconLawsetPrototype \"{id}\" is not a valid Lawset prototype");
+            return false;
+        }
+
+        GenerateControl(lawset);
+
+        control = this;
+        return true;
+    }
+
+    public bool CheckMatchesSearch(string query)
+    {
+        return this.ChildrenContainText(query);
+    }
+
+    public void SetHiddenState(bool state, string query)
+    {
+        Visible = CheckMatchesSearch(query) ? state : !state;
+    }
+}
diff --git a/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml b/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml
new file mode 100644
index 0000000000..59434cff0b
--- /dev/null
+++ b/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml
@@ -0,0 +1,5 @@
+<Control xmlns="https://spacestation14.io">
+    <BoxContainer Orientation="Vertical"
+                Name="GroupContainer">
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml.cs
new file mode 100644
index 0000000000..108f066c39
--- /dev/null
+++ b/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml.cs
@@ -0,0 +1,40 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Client.Guidebook.Richtext;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+using Content.Shared.Silicons.Laws;
+
+namespace Content.Client.Guidebook.Controls;
+
+/// <summary>
+/// Control for iterating and embedding every SiliconLawsetPrototype into the guidebook.
+/// </summary>
+[UsedImplicitly, GenerateTypedNameReferences]
+public sealed partial class GuideLawsetListEmbed : Control, IDocumentTag
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public GuideLawsetListEmbed()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        MouseFilter = MouseFilterMode.Stop;
+    }
+
+    public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
+    {
+        foreach (var lawset in _prototype.EnumeratePrototypes<SiliconLawsetPrototype>().OrderBy(x => x.ID))
+        {
+            GuideLawsetEmbed embed = new(lawset);
+            GroupContainer.AddChild(embed);
+        }
+
+        control = this;
+        return true;
+    }
+}
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
index 78e65db2a3..1f543cf402 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
@@ -4,11 +4,11 @@
         <BoxContainer Orientation="Vertical" HorizontalExpand="True">
             <humanoid:MarkingPicker Name="MarkingPickerWidget" />
             <BoxContainer>
-                <CheckBox Name="MarkingForced" Text="Force" Pressed="True" />
-                <CheckBox Name="MarkingIgnoreSpecies" Text="Ignore Species" Pressed="True" />
+                <CheckBox Name="MarkingForced" Text="{Loc humanoid-marking-modifier-force}" Pressed="True" />
+                <CheckBox Name="MarkingIgnoreSpecies" Text="{Loc humanoid-marking-modifier-ignore-species}" Pressed="True" />
             </BoxContainer>
             <Collapsible HorizontalExpand="True">
-                <CollapsibleHeading Title="Base layers" />
+                <CollapsibleHeading Title="{Loc humanoid-marking-modifier-base-layers}" />
                 <CollapsibleBody HorizontalExpand="True">
                     <BoxContainer Name="BaseLayersContainer" Orientation="Vertical" HorizontalExpand="True" />
                 </CollapsibleBody>
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
index 4cde587c58..4d9d6a90ba 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
@@ -118,7 +118,7 @@ public sealed partial class HumanoidMarkingModifierWindow : DefaultWindow
             });
             _enable = new CheckBox
             {
-                Text = "Enable",
+                Text = Loc.GetString("humanoid-marking-modifier-enable"),
                 HorizontalAlignment = HAlignment.Right
             };
 
@@ -134,8 +134,8 @@ public sealed partial class HumanoidMarkingModifierWindow : DefaultWindow
                 OnStateChanged!();
             };
 
-            var lineEditBox = new BoxContainer();
-            lineEditBox.AddChild(new Label { Text = "Prototype id: "});
+            var lineEditBox = new BoxContainer { SeparationOverride = 4 };
+            lineEditBox.AddChild(new Label { Text = Loc.GetString("humanoid-marking-modifier-prototype-id") });
 
             // TODO: This line edit should really be an options / dropdown selector, not text.
             _lineEdit = new() { MinWidth = 200 };
diff --git a/Content.Client/Implants/UI/ChameleonControllerMenu.xaml.cs b/Content.Client/Implants/UI/ChameleonControllerMenu.xaml.cs
index c12ddb9319..6f66990b4e 100644
--- a/Content.Client/Implants/UI/ChameleonControllerMenu.xaml.cs
+++ b/Content.Client/Implants/UI/ChameleonControllerMenu.xaml.cs
@@ -116,7 +116,7 @@ public sealed partial class ChameleonControllerMenu : FancyWindow
         var button = new Button
         {
             HorizontalExpand = true,
-            StyleClasses = {StyleBase.ButtonSquare},
+            StyleClasses = {StyleClass.ButtonSquare},
             ToolTip = Loc.GetString(name),
             Text = Loc.GetString(name),
             Margin = new Thickness(0, 0, 15, 0),
diff --git a/Content.Client/Implants/UI/ImplanterStatusControl.cs b/Content.Client/Implants/UI/ImplanterStatusControl.cs
index 24445eeecf..43579ae6be 100644
--- a/Content.Client/Implants/UI/ImplanterStatusControl.cs
+++ b/Content.Client/Implants/UI/ImplanterStatusControl.cs
@@ -19,7 +19,7 @@ public sealed class ImplanterStatusControl : Control
     {
         IoCManager.InjectDependencies(this);
         _parent = parent;
-        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+        _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
         _label.MaxWidth = 350;
         AddChild(new ClipControl { Children = { _label } });
 
diff --git a/Content.Client/Info/RulesAndInfoWindow.cs b/Content.Client/Info/RulesAndInfoWindow.cs
index b9131dcb3c..4f483cf26c 100644
--- a/Content.Client/Info/RulesAndInfoWindow.cs
+++ b/Content.Client/Info/RulesAndInfoWindow.cs
@@ -36,7 +36,7 @@ namespace Content.Client.Info
 
             PopulateTutorial(tutorialList);
 
-            Contents.AddChild(rootContainer);
+            ContentsContainer.AddChild(rootContainer);
 
             SetSize = new Vector2(650, 650);
         }
diff --git a/Content.Client/Info/RulesPopup.xaml b/Content.Client/Info/RulesPopup.xaml
index 80ed415550..c94f061865 100644
--- a/Content.Client/Info/RulesPopup.xaml
+++ b/Content.Client/Info/RulesPopup.xaml
@@ -16,7 +16,7 @@
                             Text="{Loc 'ui-rules-accept'}"
                             Disabled="True" />
                     <Button Name="QuitButton"
-                            StyleClasses="Caution"
+                            StyleClasses="negative"
                             Text="{Loc 'ui-escape-quit'}" />
                 </BoxContainer>
             </BoxContainer>
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 381406d2ac..6d18bd6bda 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -154,7 +154,7 @@ namespace Content.Client.Inventory
                 var button = new Button()
                 {
                     Text = Loc.GetString("strippable-bound-user-interface-stripping-menu-ensnare-button"),
-                    StyleClasses = { StyleBase.ButtonOpenRight }
+                    StyleClasses = { StyleClass.ButtonOpenRight }
                 };
 
                 button.OnPressed += (_) => SendPredictedMessage(new StrippingEnsnareButtonPressed());
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
index cd81ea0a9b..cf0b5634c5 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
@@ -2,7 +2,6 @@
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-    xmlns:style="clr-namespace:Content.Client.Stylesheets"
     Title="{Loc 'microwave-menu-title'}"
     MinWidth="512"
     MinSize="512 256">
@@ -78,14 +77,14 @@
                                         Name="StartButton"
                                         Access="Public"
                                         Text="{Loc 'microwave-menu-start-button'}"
-                                        StyleClasses="ButtonColorGreen"
+                                        StyleClasses="positive"
                                         TextAlign="Center" />
                                     <Button
                                         Name="EjectButton"
                                         Access="Public"
                                         Text="{Loc 'microwave-menu-eject-all-text'}"
                                         ToolTip="{Loc 'microwave-menu-eject-all-tooltip'}"
-                                        StyleClasses="ButtonColorRed"
+                                        StyleClasses="negative"
                                         TextAlign="Center" />
                                 </BoxContainer>
                             </BoxContainer>
diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs
index b9b58f2322..95d5cc7ab3 100644
--- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs
+++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs
@@ -33,6 +33,7 @@ namespace Content.Client.Labels.UI
 
             _window.OnLabelChanged += OnLabelChanged;
             Reload();
+            _window.SetInitialLabelState(); // Must be after Reload() has set the label text
         }
 
         private void OnLabelChanged(string newLabel)
diff --git a/Content.Client/Labels/UI/HandLabelerWindow.xaml b/Content.Client/Labels/UI/HandLabelerWindow.xaml
index 0bf03410c1..7bbadb843d 100644
--- a/Content.Client/Labels/UI/HandLabelerWindow.xaml
+++ b/Content.Client/Labels/UI/HandLabelerWindow.xaml
@@ -1,8 +1,14 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Title="{Loc 'hand-labeler-ui-header'}">
-    <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
+            Title="{Loc 'hand-labeler-ui-header'}"
+            SetWidth="400"
+            MinWidth="150">
+    <BoxContainer Orientation="Vertical" SeparationOverride="4">
         <Label Name="CurrentTextLabel" Text="{Loc 'hand-labeler-current-text-label'}" />
         <LineEdit Name="LabelLineEdit" />
+        <BoxContainer Orientation="Horizontal" Align="Center">
+            <Button Name="ResetLabelButton" Text="{Loc 'hand-labeler-ui-reset-label-text'}" StyleClasses="OpenRight" />
+            <Button Name="ClearLabelButton" Text="{Loc 'hand-labeler-ui-clear-label-text'}" StyleClasses="OpenLeft" />
+        </BoxContainer>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs b/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs
index 528e227f55..32c9d980a4 100644
--- a/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs
+++ b/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs
@@ -16,6 +16,7 @@ namespace Content.Client.Labels.UI
         // TODO LineEdit Make this a bool on the LineEdit control
 
         private string _label = string.Empty;
+        private string _initialLabel = string.Empty;
 
         public HandLabelerWindow()
         {
@@ -25,6 +26,7 @@ namespace Content.Client.Labels.UI
             {
                 _label = e.Text;
                 OnLabelChanged?.Invoke(_label);
+                UpdateButtons();
             };
 
             LabelLineEdit.OnFocusEnter += _ => _focused = true;
@@ -33,12 +35,14 @@ namespace Content.Client.Labels.UI
                 _focused = false;
                 LabelLineEdit.Text = _label;
             };
+            ResetLabelButton.OnPressed += _ => LabelLineEdit.SetText(_initialLabel, true);
+            ClearLabelButton.OnPressed += _ => LabelLineEdit.SetText("", true);
         }
 
         protected override void Opened()
         {
             base.Opened();
-            
+
             // Give the editor keyboard focus, since that's the only
             // thing the user will want to be doing with this UI
             LabelLineEdit.GrabKeyboardFocus();
@@ -51,7 +55,25 @@ namespace Content.Client.Labels.UI
 
             _label = label;
             if (!_focused)
+            {
                 LabelLineEdit.Text = label;
+                UpdateButtons();
+            }
+        }
+
+        public void SetInitialLabelState()
+        {
+            LabelLineEdit.Text = _label;
+            LabelLineEdit.CursorPosition = _label.Length;
+            LabelLineEdit.SelectionStart = 0;
+            _initialLabel = _label;
+            UpdateButtons();
+        }
+
+        public void UpdateButtons()
+        {
+            ResetLabelButton.Disabled = (LabelLineEdit.Text == _initialLabel);
+            ClearLabelButton.Disabled = (LabelLineEdit.Text == "");
         }
 
         public void SetMaxLabelLength(int maxLength)
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index 31c30eb8cb..5d39407ccf 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -61,7 +61,7 @@ namespace Content.Client.LateJoin
                 VerticalExpand = true,
             };
 
-            Contents.AddChild(_base);
+            ContentsContainer.AddChild(_base);
 
             _jobRequirements.Updated += RebuildUI;
             RebuildUI();
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml
index 34b32f84fe..a8e5a63704 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -5,7 +5,7 @@
          xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <parallax:ParallaxControl SpeedX="20"/>
     <Control HorizontalAlignment="Center" VerticalAlignment="Center">
-        <PanelContainer StyleClasses="AngleRect" />
+        <PanelContainer StyleClasses="BackgroundPanel" />
         <BoxContainer Orientation="Vertical" MinSize="300 200">
             <BoxContainer Orientation="Horizontal">
                 <Label Margin="8 0 0 0" Text="{Loc 'connecting-title'}"
@@ -68,7 +68,7 @@
         </BoxContainer>
     </Control>
     <!-- Bottom window for tips -->
-    <PanelContainer Name="LoginTips" StyleClasses="AngleRect" Margin="0 10" MaxWidth="600" VerticalExpand="True" VerticalAlignment="Bottom">
+    <PanelContainer Name="LoginTips" StyleClasses="BackgroundPanel" Margin="0 10" MaxWidth="600" VerticalExpand="True" VerticalAlignment="Bottom">
         <BoxContainer Orientation="Vertical" VerticalExpand="True">
             <controls:StripeBack>
                 <BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml.cs b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
index cf89f98095..fe48642ed3 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
@@ -43,7 +43,7 @@ namespace Content.Client.Launcher
 
             LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
 
-            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSystem;
 
             ChangeLoginTip();
             RetryButton.OnPressed += ReconnectButtonPressed;
diff --git a/Content.Client/Lobby/UI/CharacterPickerButton.xaml b/Content.Client/Lobby/UI/CharacterPickerButton.xaml
index ecd706f5a7..723da433a1 100644
--- a/Content.Client/Lobby/UI/CharacterPickerButton.xaml
+++ b/Content.Client/Lobby/UI/CharacterPickerButton.xaml
@@ -18,7 +18,7 @@
         <Button Name="ConfirmDeleteButton"
                 Text="{Loc 'character-setup-gui-character-picker-button-confirm-delete-button'}"
                 Visible="False"
-                ModulateSelfOverride="{x:Static style:StyleNano.ButtonColorCautionDefault}"/>
+                StyleClasses="negative"/>
 
     </BoxContainer>
 </ContainerButton>
diff --git a/Content.Client/Lobby/UI/CharacterSetupGui.xaml b/Content.Client/Lobby/UI/CharacterSetupGui.xaml
index 94dd363b5b..9d1ccb20f0 100644
--- a/Content.Client/Lobby/UI/CharacterSetupGui.xaml
+++ b/Content.Client/Lobby/UI/CharacterSetupGui.xaml
@@ -34,19 +34,13 @@
                         Text="{Loc 'character-setup-gui-character-setup-close-button'}"
                         StyleClasses="ButtonBig"/>
             </BoxContainer>
-            <PanelContainer>
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BackgroundColor="{x:Static style:StyleNano.NanoGold}" ContentMarginTopOverride="2" />
-                </PanelContainer.PanelOverride>
+            <PanelContainer StyleClasses="highlight">
             </PanelContainer>
             <BoxContainer Orientation="Horizontal" VerticalExpand="True" SeparationOverride="0">
                 <ScrollContainer MinSize="325 0" Margin="5 5 0 0">
                     <BoxContainer Name="Characters" Orientation="Vertical" />
                 </ScrollContainer>
-                <PanelContainer MinSize="2 0">
-                    <PanelContainer.PanelOverride>
-                        <gfx:StyleBoxFlat BackgroundColor="{x:Static style:StyleNano.NanoGold}" ContentMarginTopOverride="2" />
-                    </PanelContainer.PanelOverride>
+                <PanelContainer MinSize="2 0" StyleClasses="highlight">
                 </PanelContainer>
                 <BoxContainer Name="CharEditor" HorizontalExpand="True" />
             </BoxContainer>
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index d4218578ca..cae660cf9a 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -6,8 +6,8 @@ using Content.Client.Lobby.UI.Loadouts;
 using Content.Client.Lobby.UI.Roles;
 using Content.Client.Message;
 using Content.Client.Players.PlayTimeTracking;
-using Content.Client.Sprite;
 using Content.Client.Stylesheets;
+using Content.Client.Sprite;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
@@ -598,7 +598,7 @@ namespace Content.Client.Lobby.UI
                     {
                         Text = Loc.GetString(category.Name),
                         Margin = new Thickness(0, 10, 0, 0),
-                        StyleClasses = { StyleBase.StyleClassLabelHeading },
+                        StyleClasses = { StyleClass.LabelHeading },
                     });
                 }
 
@@ -666,6 +666,7 @@ namespace Content.Client.Lobby.UI
             _species.Clear();
 
             _species.AddRange(_prototypeManager.EnumeratePrototypes<SpeciesPrototype>().Where(o => o.RoundStart));
+            _species.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.CurrentCultureIgnoreCase));
             var speciesIds = _species.Select(o => o.ID).ToList();
 
             for (var i = 0; i < _species.Count; i++)
@@ -1420,7 +1421,7 @@ namespace Content.Client.Lobby.UI
                 return;
 
             const string style = "SpeciesInfoDefault";
-            SpeciesInfoButton.StyleClasses.Add(style);
+            SpeciesInfoButton.StyleIdentifier = style;
         }
 
         private void UpdateMarkings()
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditorSheetlet.cs b/Content.Client/Lobby/UI/HumanoidProfileEditorSheetlet.cs
new file mode 100644
index 0000000000..016541dc23
--- /dev/null
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditorSheetlet.cs
@@ -0,0 +1,28 @@
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Lobby.UI;
+
+[CommonSheetlet]
+public sealed class HumanoidProfileEditorSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        return
+        [
+            E<TextureButton>()
+                .Identifier("SpeciesInfoDefault")
+                .Prop(TextureButton.StylePropertyTexture,
+                    ResCache.GetTexture("/Textures/Interface/VerbIcons/information.svg.192dpi.png")),
+            // copied from `StyleNano`, but this is unused
+            // E<TextureButton>()
+            //     .Identifier("SpeciesInfoWarning")
+            //     .Prop(TextureButton.StylePropertyTexture,
+            //         ResCache.GetTexture("/Textures/Interface/info.svg.192dpi.png"))
+            //     .Prop(Control.StylePropertyModulateSelf, sheet.HighlightPalette[0]),
+        ];
+    }
+}
diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml b/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml
index 0deb1c82ba..f89b38ca8a 100644
--- a/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml
+++ b/Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml
@@ -1,7 +1,7 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Orientation="Vertical">
-    <PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="5">
+    <PanelContainer StyleClasses="BackgroundPanel" HorizontalExpand="True" Margin="5">
         <BoxContainer Name="LoadoutsContainer" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True"/>
     </PanelContainer>
     <!-- Buffer space so we have 10 margin between controls but also 10 to the borders -->
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 64291816ab..9b5c761644 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -20,7 +20,7 @@
                 <Control Name="DefaultState" VerticalExpand="True">
                     <BoxContainer Name="TopLeft" Orientation="Vertical">
                         <!-- Left Top Panel -->
-                        <PanelContainer StyleClasses="AngleRect" HorizontalAlignment="Left" Name="LeftSideTop"
+                        <PanelContainer StyleClasses="BackgroundPanel" HorizontalAlignment="Left" Name="LeftSideTop"
                                         VerticalAlignment="Top">
                             <BoxContainer Orientation="Vertical" HorizontalAlignment="Center" MaxWidth="800">
                                 <info:LinkBanner Name="LinkBanner" VerticalExpand="false" HorizontalAlignment="Center"
@@ -53,7 +53,7 @@
                     <!-- Left Bot Panel -->
                     <BoxContainer Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom">
                         <info:DevInfoBanner Name="DevInfoBanner" VerticalExpand="false" Margin="3 3 3 3" />
-                        <PanelContainer StyleClasses="AngleRect">
+                        <PanelContainer StyleClasses="BackgroundPanel">
                             <RichTextLabel Name="LobbySong" Access="Public" HorizontalAlignment="Center" />
                         </PanelContainer>
                     </BoxContainer>
@@ -63,7 +63,7 @@
                 <Control Access="Public" Visible="False" Name="CharacterSetupState" VerticalExpand="True" />
             </BoxContainer>
             <!-- Right Panel -->
-            <PanelContainer Name="RightSide" Access="Public" StyleClasses="AngleRect" HorizontalAlignment="Right" VerticalExpand="True"
+            <PanelContainer Name="RightSide" Access="Public" StyleClasses="BackgroundPanel" HorizontalAlignment="Right" VerticalExpand="True"
                             VerticalAlignment="Stretch">
                 <BoxContainer Orientation="Vertical" HorizontalExpand="True">
                     <!-- Top row -->
@@ -73,7 +73,7 @@
                                HorizontalExpand="True" HorizontalAlignment="Center" />
                     </BoxContainer>
                     <!-- Gold line -->
-                    <controls:HLine Color="{x:Static style:StyleNano.NanoGold}" Thickness="2" />
+                    <controls:HLine StyleClasses="highlight" Thickness="2" />
                     <controls:HSpacer Spacing="10" />
                     <!-- Voting & misc button bar -->
                     <BoxContainer Orientation="Horizontal" MinSize="0 40" HorizontalAlignment="Right">
@@ -97,7 +97,7 @@
                     <controls:HSpacer Spacing="5" />
                     <BoxContainer MinHeight="10" />
                     <!-- Gold line -->
-                    <controls:HLine Color="{x:Static style:StyleNano.NanoGold}" Thickness="2" Access="Public" />
+                    <controls:HLine StyleClasses="highlight" Thickness="2" Access="Public" />
                     <controls:HSpacer Spacing="10" />
                     <widgets:ChatBox Name="Chat" Access="Public" VerticalExpand="True" Margin="3 3 3 3" MinHeight="50" />
                 </BoxContainer>
@@ -111,7 +111,7 @@
             </PanelContainer>
         </SplitContainer>
         <PanelContainer Name="ExpandPanel"
-                        StyleClasses="AngleRect" 
+                        StyleClasses="BackgroundPanel"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
                         Margin="0 2 2 0"
diff --git a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
index 2feac5792a..adc1673326 100644
--- a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
+++ b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
@@ -7,7 +7,7 @@
         <BoxContainer Orientation="Horizontal">
             <Button Name="NevermindButton" Text="{Loc 'observe-nevermind'}" SizeFlagsStretchRatio="1"/>
             <Control HorizontalExpand="True" SizeFlagsStretchRatio="2" />
-            <cc:CommandButton Command="observe" Name="ObserveButton" StyleClasses="Caution" Text="{Loc 'observe-confirm'}" SizeFlagsStretchRatio="1"/>
+            <cc:CommandButton Command="observe" Name="ObserveButton" StyleClasses="negative" Text="{Loc 'observe-confirm'}" SizeFlagsStretchRatio="1"/>
             <cc:CommandButton Command="observe admin" Name="ObserveAsAdminButton" Text="{Loc 'observe-as-admin'}" SizeFlagsStretchRatio="1" Visible="False"/>
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml.cs b/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml.cs
index ce75537355..3e6f4cfb2f 100644
--- a/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml.cs
+++ b/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml.cs
@@ -31,9 +31,9 @@ public sealed partial class RequirementsSelector : BoxContainer
         RobustXamlLoader.Load(this);
         _options = new RadioOptions<int>(RadioOptionsLayout.Horizontal)
         {
-            FirstButtonStyle = StyleBase.ButtonOpenRight,
-            ButtonStyle = StyleBase.ButtonOpenBoth,
-            LastButtonStyle = StyleBase.ButtonOpenLeft,
+            FirstButtonStyle = StyleClass.ButtonOpenRight,
+            ButtonStyle = StyleClass.ButtonOpenBoth,
+            LastButtonStyle = StyleClass.ButtonOpenLeft,
             HorizontalExpand = true,
         };
         //Override default radio option button width
@@ -50,7 +50,7 @@ public sealed partial class RequirementsSelector : BoxContainer
             Text = Loc.GetString("role-timer-locked"),
             Visible = true,
             HorizontalAlignment = HAlignment.Center,
-            StyleClasses = {StyleBase.StyleClassLabelSubText},
+            StyleClasses = {StyleClass.LabelSubText},
         };
 
         _lockStripe = new StripeBack()
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
index 1d5244305d..45bd94f7b6 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
@@ -11,6 +11,9 @@ namespace Content.Client.MainMenu.UI;
 [GenerateTypedNameReferences]
 public sealed partial class MainMenuControl : Control
 {
+    public const string StyleIdentifierMainMenu = "mainMenu";
+    public const string StyleIdentifierMainMenuVBox = "mainMenuVBox";
+
     public MainMenuControl(IResourceCache resCache, IConfigurationManager configMan)
     {
         RobustXamlLoader.Load(this);
diff --git a/Content.Client/MainMenu/UI/MainMenuSheetlet.cs b/Content.Client/MainMenu/UI/MainMenuSheetlet.cs
new file mode 100644
index 0000000000..45171af3b7
--- /dev/null
+++ b/Content.Client/MainMenu/UI/MainMenuSheetlet.cs
@@ -0,0 +1,27 @@
+using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Fonts;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.MainMenu.UI;
+
+[CommonSheetlet]
+public sealed class MainMenuSheetlet : Sheetlet<NanotrasenStylesheet>
+{
+    public override StyleRule[] GetRules(NanotrasenStylesheet sheet, object config)
+    {
+        return
+        [
+            // make those buttons bigger
+            E<Button>()
+                .Identifier(MainMenuControl.StyleIdentifierMainMenu)
+                .ParentOf(E<Label>())
+                .Font(sheet.BaseFont.GetFont(16, FontKind.Bold)),
+            E<BoxContainer>()
+                .Identifier(MainMenuControl.StyleIdentifierMainMenuVBox)
+                .Prop(BoxContainer.StylePropertySeparation, 2),
+        ];
+    }
+}
diff --git a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml
index f4fb9da062..d12b90918b 100644
--- a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml
+++ b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml
@@ -1,7 +1,7 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
          MouseFilter="Stop">
-    <PanelContainer StyleClasses="BackgroundOpenLeft"/>
+    <PanelContainer StyleClasses="BackgroundPanelOpenLeft"/>
     <PanelContainer>
         <PanelContainer.PanelOverride>
             <graphics:StyleBoxFlat BorderColor="#25252A" BorderThickness="0 0 0 3"/>
@@ -20,7 +20,7 @@
             <Label Text="{Loc news-write-ui-article-name-label}" Margin="17 10 0 9" VerticalAlignment="Center"/>
             <LineEdit Name="TitleField" Margin="6 10 0 9" MinWidth="260" MinHeight="23" Access="Public"/>
             <Control HorizontalExpand="True" />
-            <Label Name="RichTextInfoLabel" Text="?" MouseFilter="Pass" Margin="14 0" StyleClasses="LabelSecondaryColor"/>
+            <Label Name="RichTextInfoLabel" Text="?" MouseFilter="Pass" Margin="14 0" StyleClasses="LabelWeak"/>
         </BoxContainer>
         <Control Name="TextEditPanel" VerticalExpand="True" Margin="11 0 11 0">
             <PanelContainer>
@@ -43,7 +43,7 @@
         <BoxContainer Orientation="Horizontal" Margin="12 5 12 8">
             <Control>
                 <Button Name="ButtonCancel" SetHeight="32" SetWidth="85"
-                        StyleClasses="ButtonColorRed" Text="{Loc news-write-ui-cancel-text}"/>
+                        StyleClasses="negative" Text="{Loc news-write-ui-cancel-text}"/>
             </Control>
             <Control HorizontalExpand="True"/>
             <BoxContainer Orientation="Horizontal">
diff --git a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
index 90a66bec7f..fef94a2bd3 100644
--- a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
+++ b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
@@ -22,8 +22,8 @@ public sealed partial class ArticleEditorPanel : Control
     {
         RobustXamlLoader.Load(this);
 
-        ButtonPublish.StyleClasses.Add(StyleBase.ButtonOpenLeft);
-        ButtonPublish.StyleClasses.Add(StyleNano.StyleClassButtonColorGreen);
+        ButtonPublish.StyleClasses.Add(StyleClass.ButtonOpenLeft);
+        ButtonPublish.StyleClasses.Add(StyleClass.Positive);
 
         ContentField.GetChild(0).Margin = new Thickness(9, 3);
         // Customize scrollbar width and margin. This is not possible in xaml
diff --git a/Content.Client/MassMedia/Ui/NewsArticleCard.xaml b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml
index abfc1cbcf1..09e207b7cc 100644
--- a/Content.Client/MassMedia/Ui/NewsArticleCard.xaml
+++ b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml
@@ -3,7 +3,7 @@
          xmlns:system="clr-namespace:System;assembly=System.Runtime"
          xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
          Margin="0 0 0 8">
-    <PanelContainer StyleClasses="AngleRect" ModulateSelfOverride="#2b2b31"/>
+    <PanelContainer StyleClasses="BackgroundPanel" ModulateSelfOverride="#2b2b31"/>
     <BoxContainer Orientation="Vertical" SetHeight="60">
         <Control HorizontalExpand="True" SetHeight="27">
             <PanelContainer>
@@ -21,7 +21,7 @@
                     HorizontalAlignment="Right" Margin="8 6 6 6" SetHeight="19" SetWidth="52" Access="Public">
                 <Button.StyleClasses>
                     <system:String>ButtonSmall</system:String>
-                    <system:String>ButtonColorRed</system:String>
+                    <system:String>negative</system:String>
                 </Button.StyleClasses>
             </controls:ConfirmButton>
         </BoxContainer>
diff --git a/Content.Client/Materials/UI/MaterialDisplay.xaml.cs b/Content.Client/Materials/UI/MaterialDisplay.xaml.cs
index eaa16af658..8a6c18feea 100644
--- a/Content.Client/Materials/UI/MaterialDisplay.xaml.cs
+++ b/Content.Client/Materials/UI/MaterialDisplay.xaml.cs
@@ -77,11 +77,11 @@ public sealed partial class MaterialDisplay : PanelContainer
         {
             var sheetsToEject = sheetsToEjectArray[i];
 
-            var styleClass = StyleBase.ButtonOpenBoth;
+            var styleClass = StyleClass.ButtonOpenBoth;
             if (i == 0)
-                styleClass = StyleBase.ButtonOpenRight;
+                styleClass = StyleClass.ButtonOpenRight;
             else if (i == sheetsToEjectArray.Length - 1)
-                styleClass = StyleBase.ButtonOpenLeft;
+                styleClass = StyleClass.ButtonOpenLeft;
 
             var button = new Button
             {
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
index 651c76e61f..1a68099de0 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
@@ -62,7 +62,7 @@ public sealed partial class CrewMonitoringNavMapControl : NavMapControl
                 continue;
 
             if (!LocalizedNames.TryGetValue(netEntity, out var name))
-                name = "Unknown";
+                name = Loc.GetString("navmap-unknown-entity");
 
             var message = name + "\n" + Loc.GetString("navmap-location",
                 ("x", MathF.Round(blip.Coordinates.X)),
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
index dd40749d33..86e1ce689a 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
@@ -1,7 +1,7 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                xmlns:ui="clr-namespace:Content.Client.Medical.CrewMonitoring"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               Title="{Loc 'crew-monitoring-user-interface-title'}"
+               Title="{Loc crew-monitoring-ui-title}"
                Resizable="False"
                SetSize="1210 700"
                MinSize="1210 700">
@@ -11,12 +11,12 @@
             <BoxContainer Orientation="Vertical" Margin="0 0 10 0">
                 <controls:StripeBack>
                     <PanelContainer>
-                        <Label Name="StationName" Text="Unknown station" Align="Center" Margin="0 5 0 3"/>
+                        <Label Name="StationName" Text="{Loc crew-monitoring-ui-no-station-label}" Align="Center" Margin="0 5 0 3"/>
                     </PanelContainer>
                 </controls:StripeBack>
 
                 <LineEdit Name="SearchLineEdit" HorizontalExpand="True"
-                          PlaceHolder="{Loc crew-monitor-filter-line-placeholder}" />
+                          PlaceHolder="{Loc crew-monitoring-ui-filter-line-placeholder}" />
 
                 <ScrollContainer Name="SensorScroller"
                                  VerticalExpand="True"
@@ -29,7 +29,7 @@
                         <!-- Table rows are filled by code -->
                     </BoxContainer>
                     <Label  Name="NoServerLabel"
-                            Text="{Loc 'crew-monitoring-user-interface-no-server'}"
+                            Text="{Loc crew-monitoring-ui-no-server-label}"
                             StyleClasses="LabelHeading"
                             FontColorOverride="Red"
                             HorizontalAlignment="Center"
@@ -42,8 +42,8 @@
         <BoxContainer Orientation="Vertical">
             <PanelContainer StyleClasses="LowDivider" />
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
-                <Label Text="{Loc 'crew-monitoring-user-interface-flavor-left'}" StyleClasses="WindowFooterText" />
-                <Label Text="{Loc 'crew-monitoring-user-interface-flavor-right'}" StyleClasses="WindowFooterText"
+                <Label Text="{Loc crew-monitoring-ui-flavor-left-label}" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc crew-monitoring-ui-flavor-right-label}" StyleClasses="WindowFooterText"
                         HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
                 <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
                         VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index b3b3508169..3872fa50cc 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -130,7 +130,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
             };
 
             deparmentLabel.SetMessage(department);
-            deparmentLabel.StyleClasses.Add(StyleNano.StyleClassTooltipActionDescription);
+            deparmentLabel.StyleClasses.Add("font-large");
 
             SensorsTable.AddChild(deparmentLabel);
 
@@ -155,8 +155,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
                 HorizontalExpand = true,
             };
 
-            deparmentLabel.SetMessage(Loc.GetString("crew-monitoring-user-interface-no-department"));
-            deparmentLabel.StyleClasses.Add(StyleNano.StyleClassTooltipActionDescription);
+            deparmentLabel.SetMessage(Loc.GetString("crew-monitoring-ui-no-department-label"));
 
             SensorsTable.AddChild(deparmentLabel);
 
@@ -194,7 +193,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
             };
 
             if (sensor.SuitSensorUid == _trackedEntity)
-                sensorButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
+                sensorButton.AddStyleClass(StyleClass.Positive);
 
             SensorsTable.AddChild(sensorButton);
 
@@ -364,10 +363,10 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
             var castSensor = (CrewMonitoringButton) sensor;
 
             if (castSensor.SuitSensorUid == prevTrackedEntity)
-                castSensor.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
+                castSensor.RemoveStyleClass(StyleClass.Positive);
 
             else if (castSensor.SuitSensorUid == currTrackedEntity)
-                castSensor.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
+                castSensor.AddStyleClass(StyleClass.Positive);
 
             if (castSensor?.Coordinates == null)
                 continue;
diff --git a/Content.Client/NPC/NPCWindow.xaml b/Content.Client/NPC/NPCWindow.xaml
index 68e58eca46..bff05bc093 100644
--- a/Content.Client/NPC/NPCWindow.xaml
+++ b/Content.Client/NPC/NPCWindow.xaml
@@ -1,24 +1,24 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-            Title="NPC debug"
+            Title="{Loc npc-debug-overlay-window-title}"
             MinSize="200 200">
     <BoxContainer Name="Options" Orientation="Vertical" Margin="8 8">
         <controls:StripeBack>
-            <Label Text="NPC" HorizontalAlignment="Center"/>
+            <Label Text="{Loc npc-debug-overlay-window-section-npc-label}" HorizontalAlignment="Center"/>
         </controls:StripeBack>
         <BoxContainer Name="NPCBox" Orientation="Vertical">
-            <CheckBox Name="NPCThonk" Text="Thonk"/>
+            <CheckBox Name="NPCThonk" Text="{Loc npc-debug-overlay-window-show-htn-tree-checkbox}"/>
         </BoxContainer>
         <controls:StripeBack>
-            <Label Text="Pathfinder" HorizontalAlignment="Center"/>
+            <Label Text="{Loc npc-debug-overlay-window-section-pathfinder-label}" HorizontalAlignment="Center"/>
         </controls:StripeBack>
         <BoxContainer Name="PathfinderBox" Orientation="Vertical">
-            <CheckBox Name="PathCrumbs" Text="Breadcrumbs"/>
-            <CheckBox Name="PathPolys" Text="Polygons"/>
-            <CheckBox Name="PathNeighbors" Text="Neighbors"/>
-            <CheckBox Name="PathRouteCosts" Text="Route costs"/>
-            <CheckBox Name="PathRoutes" Text="Routes"/>
+            <CheckBox Name="PathCrumbs" Text="{Loc npc-debug-overlay-window-path-breadcrumbs-checkbox}"/>
+            <CheckBox Name="PathPolys" Text="{Loc npc-debug-overlay-window-path-polygons-checkbox}"/>
+            <CheckBox Name="PathNeighbors" Text="{Loc npc-debug-overlay-window-path-neighbors-checkbox}"/>
+            <CheckBox Name="PathRouteCosts" Text="{Loc npc-debug-overlay-window-path-route-costs-checkbox}"/>
+            <CheckBox Name="PathRoutes" Text="{Loc npc-debug-overlay-window-path-routes-checkbox}"/>
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
index fcd2f75918..0afda39b1d 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
@@ -15,8 +15,8 @@ public sealed partial class NetworkConfiguratorConfigurationMenu : FancyWindow
     {
         RobustXamlLoader.Load(this);
 
-        Clear.StyleClasses.Add(StyleBase.ButtonOpenLeft);
-        Clear.StyleClasses.Add(StyleNano.StyleClassButtonColorRed);
+        Clear.StyleClasses.Add(StyleClass.ButtonOpenLeft);
+        Clear.StyleClasses.Add(StyleClass.Negative);
         DeviceList.OnRemoveAddress += args =>
         {
             OnRemoveAddress?.Invoke(args);
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml
index c99ae1e26f..8e587750cd 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml
@@ -1,9 +1,8 @@
 <ScrollContainer xmlns="https://spacestation14.io"
                  HorizontalExpand="True"
                  VerticalExpand="True">
-    <Control VerticalExpand="True">
-        <PanelContainer StyleClasses="PanelBackgroundBaseDark"></PanelContainer>
+    <PanelContainer StyleClasses="PanelDark" VerticalExpand="True">
         <BoxContainer Orientation="Vertical" Name="DeviceList" VerticalExpand="True" SeparationOverride="4">
         </BoxContainer>
-    </Control>
+    </PanelContainer>
 </ScrollContainer>
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
index a316b9e34a..d7c010e2e3 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
@@ -47,7 +47,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow
         FooterPanel.PanelOverride = footerStyleBox;
         MainPanel.PanelOverride = new StyleBoxFlat(Color.FromHex(PanelBgColor));
 
-        ButtonClear.AddStyleClass("ButtonColorRed");
+        ButtonClear.AddStyleClass("negative");
         ButtonLinkDefault.Disabled = true;
 
         _links = new LinksRender(ButtonContainerLeft, ButtonContainerRight);
diff --git a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
index 9828222447..0a55cf0db8 100644
--- a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
@@ -112,7 +112,7 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem
         {
             _configurator = configurator;
             _keyBindingName = keyBindingName;
-            _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+            _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
             AddChild(_label);
         }
 
diff --git a/Content.Client/Nuke/NukeMenu.xaml b/Content.Client/Nuke/NukeMenu.xaml
index bb7067565f..c6742a0997 100644
--- a/Content.Client/Nuke/NukeMenu.xaml
+++ b/Content.Client/Nuke/NukeMenu.xaml
@@ -39,7 +39,7 @@
                 <Button Name="ArmButton"
                         Text="{Loc 'nuke-user-interface-arm-button'}"
                         Access="Public"
-                        StyleClasses="Caution"/>
+                        StyleClasses="negative"/>
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml b/Content.Client/NukeOps/WarDeclaratorWindow.xaml
index 43381158a2..ad813bd7df 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml
@@ -9,7 +9,7 @@
                   Access="Public" />
         <Button Name="WarButton"
                 Text="{Loc 'war-declarator-ui-try-war-button'}"
-                StyleClasses="Caution"
+                StyleClasses="negative"
                 Access="Public"/>
         <BoxContainer Orientation="Vertical" HorizontalExpand="True">
             <Label Name="StatusLabel"
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
index e191e821c2..68487e98bd 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
@@ -58,38 +58,38 @@ public sealed partial class WarDeclaratorWindow : FancyWindow
                 WarButton.Disabled = true;
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-declared");
                 UpdateTimer();
-                StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateLow);
+                StatusLabel.SetOnlyStyleClass(StyleClass.Highlight);
                 break;
             case WarConditionStatus.YesWar:
                 WarButton.Text = Loc.GetString("war-declarator-ui-war-button");
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-possible");
                 UpdateTimer();
-                StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
+                StatusLabel.SetOnlyStyleClass(StyleClass.Positive);
                 break;
             case WarConditionStatus.NoWarSmallCrew:
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
                 InfoLabel.Text = Loc.GetString("war-declarator-conditions-small-crew");
-                StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
+                StatusLabel.SetOnlyStyleClass(StyleClass.Negative);
                 break;
             case WarConditionStatus.NoWarShuttleDeparted:
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
                 InfoLabel.Text = Loc.GetString("war-declarator-conditions-left-outpost");
-                StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
+                StatusLabel.SetOnlyStyleClass(StyleClass.Negative);
                 break;
             case WarConditionStatus.NoWarTimeout:
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
                 InfoLabel.Text = Loc.GetString("war-declarator-conditions-time-out");
-                StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
+                StatusLabel.SetOnlyStyleClass(StyleClass.Negative);
                 break;
             case WarConditionStatus.NoWarUnknown:
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
                 InfoLabel.Text = Loc.GetString("war-declarator-conditions-unknown");
-                StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
+                StatusLabel.SetOnlyStyleClass(StyleClass.Negative);
                 break;
             default:
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
                 InfoLabel.Text = Loc.GetString("war-declarator-conditions-unknown");
-                StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
+                StatusLabel.SetOnlyStyleClass(StyleClass.Negative);
                 break;
         }
     }
diff --git a/Content.Client/Options/UI/OptionsTabControlRow.xaml b/Content.Client/Options/UI/OptionsTabControlRow.xaml
index fafdee4df7..9bf8ae18d8 100644
--- a/Content.Client/Options/UI/OptionsTabControlRow.xaml
+++ b/Content.Client/Options/UI/OptionsTabControlRow.xaml
@@ -9,7 +9,7 @@
 
             <Button Name="ResetButton"
                     Text="{Loc 'ui-options-reset-all'}"
-                    StyleClasses="Caution" />
+                    StyleClasses="negative" />
             <Button Name="ApplyButton"
                     Text="{Loc 'ui-options-apply'}"
                     StyleClasses="OpenLeft" />
diff --git a/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs b/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs
index ad262f94a2..32680dfcc2 100644
--- a/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs
+++ b/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs
@@ -58,7 +58,7 @@ public sealed partial class OptionsTabControlRow : Control
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        ResetButton.StyleClasses.Add(StyleBase.ButtonOpenRight);
+        ResetButton.StyleClasses.Add(StyleClass.ButtonOpenRight);
         ApplyButton.OnPressed += ApplyButtonPressed;
         ResetButton.OnPressed += ResetButtonPressed;
         DefaultButton.OnPressed += DefaultButtonPressed;
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 59c9607b24..f92f66df31 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -130,8 +130,7 @@ namespace Content.Client.Options.UI.Tabs
                 KeybindsContainer.AddChild(new Label
                 {
                     Text = Loc.GetString(headerContents),
-                    FontColorOverride = StyleNano.NanoGold,
-                    StyleClasses = { StyleNano.StyleClassLabelKeyText }
+                    StyleClasses = { StyleClass.LabelKeyText }
                 });
             }
 
@@ -528,9 +527,9 @@ namespace Content.Client.Options.UI.Tabs
                     HorizontalAlignment = HAlignment.Left
                 };
 
-                BindButton1 = new BindButton(parent, this, StyleBase.ButtonOpenRight);
-                BindButton2 = new BindButton(parent, this, StyleBase.ButtonOpenLeft);
-                ResetButton = new Button { Text = Loc.GetString("ui-options-bind-reset"), StyleClasses = { StyleBase.ButtonCaution } };
+                BindButton1 = new BindButton(parent, this, StyleClass.ButtonOpenRight);
+                BindButton2 = new BindButton(parent, this, StyleClass.ButtonOpenLeft);
+                ResetButton = new Button { Text = Loc.GetString("ui-options-bind-reset"), StyleClasses = { StyleClass.Negative } };
 
                 var hBox = new BoxContainer
                 {
diff --git a/Content.Client/PAI/PAISystem.cs b/Content.Client/PAI/PAISystem.cs
deleted file mode 100644
index a28cf6a077..0000000000
--- a/Content.Client/PAI/PAISystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.PAI;
-
-namespace Content.Client.PAI
-{
-    public sealed class PAISystem : SharedPAISystem
-    {
-    }
-}
diff --git a/Content.Client/PDA/PdaSheetlet.cs b/Content.Client/PDA/PdaSheetlet.cs
new file mode 100644
index 0000000000..4791ae53c3
--- /dev/null
+++ b/Content.Client/PDA/PdaSheetlet.cs
@@ -0,0 +1,93 @@
+using Content.Client.PDA;
+using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Sheetlets;
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.PDA;
+
+[CommonSheetlet]
+public sealed class PdaSheetlet : Sheetlet<NanotrasenStylesheet>
+{
+    public override StyleRule[] GetRules(NanotrasenStylesheet sheet, object config)
+    {
+        IPanelConfig panelCfg = sheet;
+        IButtonConfig btnCfg = sheet;
+
+        // TODO: This should have its own set of images, instead of using button cfg directly.
+        var angleBorderRect =
+            sheet.GetTexture(panelCfg.GeometricPanelBorderPath).IntoPatch(StyleBox.Margin.All, 10);
+
+        return
+        [
+            //PDA - Backgrounds
+            E<PanelContainer>()
+                .Class("PdaContentBackground")
+                .Prop(PanelContainer.StylePropertyPanel, StyleBoxHelpers.SquareStyleBox(sheet))
+                .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252a")),
+
+            E<PanelContainer>()
+                .Class("PdaBackground")
+                .Prop(PanelContainer.StylePropertyPanel, StyleBoxHelpers.SquareStyleBox(sheet))
+                .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#000000")),
+
+            E<PanelContainer>()
+                .Class("PdaBackgroundRect")
+                .Prop(PanelContainer.StylePropertyPanel, StyleBoxHelpers.BaseStyleBox((sheet)))
+                .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#717059")),
+
+            E<PanelContainer>()
+                .Class("PdaBorderRect")
+                .Prop(PanelContainer.StylePropertyPanel, angleBorderRect),
+
+            //PDA - Buttons
+            E<PdaSettingsButton>()
+                .Pseudo(ContainerButton.StylePseudoClassNormal)
+                .Prop(PdaSettingsButton.StylePropertyBgColor, Color.FromHex(PdaSettingsButton.NormalBgColor))
+                .Prop(PdaSettingsButton.StylePropertyFgColor, Color.FromHex(PdaSettingsButton.EnabledFgColor)),
+
+            E<PdaSettingsButton>()
+                .Pseudo(ContainerButton.StylePseudoClassHover)
+                .Prop(PdaSettingsButton.StylePropertyBgColor, Color.FromHex(PdaSettingsButton.HoverColor))
+                .Prop(PdaSettingsButton.StylePropertyFgColor, Color.FromHex(PdaSettingsButton.EnabledFgColor)),
+
+            E<PdaSettingsButton>()
+                .Pseudo(ContainerButton.StylePseudoClassPressed)
+                .Prop(PdaSettingsButton.StylePropertyBgColor, Color.FromHex(PdaSettingsButton.PressedColor))
+                .Prop(PdaSettingsButton.StylePropertyFgColor, Color.FromHex(PdaSettingsButton.EnabledFgColor)),
+
+            E<PdaSettingsButton>()
+                .Pseudo(ContainerButton.StylePseudoClassDisabled)
+                .Prop(PdaSettingsButton.StylePropertyBgColor, Color.FromHex(PdaSettingsButton.NormalBgColor))
+                .Prop(PdaSettingsButton.StylePropertyFgColor, Color.FromHex(PdaSettingsButton.DisabledFgColor)),
+
+            E<PdaProgramItem>()
+                .Pseudo(ContainerButton.StylePseudoClassNormal)
+                .Prop(PdaProgramItem.StylePropertyBgColor, Color.FromHex(PdaProgramItem.NormalBgColor)),
+
+            E<PdaProgramItem>()
+                .Pseudo(ContainerButton.StylePseudoClassHover)
+                .Prop(PdaProgramItem.StylePropertyBgColor, Color.FromHex(PdaProgramItem.HoverColor)),
+
+            E<PdaProgramItem>()
+                .Pseudo(ContainerButton.StylePseudoClassPressed)
+                .Prop(PdaProgramItem.StylePropertyBgColor, Color.FromHex(PdaProgramItem.HoverColor)),
+
+            //PDA - Text
+            E<Label>()
+                .Class("PdaContentFooterText")
+                .Prop(Label.StylePropertyFont, sheet.BaseFont.GetFont(10))
+                .Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),
+
+            E<Label>()
+                .Class("PdaWindowFooterText")
+                .Prop(Label.StylePropertyFont, sheet.BaseFont.GetFont(10))
+                .Prop(Label.StylePropertyFontColor, Color.FromHex("#333d3b")),
+        ];
+    }
+}
+
diff --git a/Content.Client/PDA/Ringer/RingtoneMenu.xaml.cs b/Content.Client/PDA/Ringer/RingtoneMenu.xaml.cs
index 83024c22fb..13be031e20 100644
--- a/Content.Client/PDA/Ringer/RingtoneMenu.xaml.cs
+++ b/Content.Client/PDA/Ringer/RingtoneMenu.xaml.cs
@@ -43,12 +43,12 @@ namespace Content.Client.PDA.Ringer
                     if (!isValid)
                     {
                         input.Text = PreviousNoteInputs[index];
-                        input.AddStyleClass("Caution");
+                        input.AddStyleClass("highlight");
                     }
                     else
                     {
                         PreviousNoteInputs[index] = input.Text;
-                        input.RemoveStyleClass("Caution");
+                        input.RemoveStyleClass("highlight");
                     }
 
                     input.CursorPosition = input.Text.Length;
@@ -59,7 +59,7 @@ namespace Content.Client.PDA.Ringer
                     if (!IsNote(input.Text))
                     {
                         input.Text = PreviousNoteInputs[index];
-                        input.RemoveStyleClass("Caution");
+                        input.RemoveStyleClass("highlight");
                     }
                 };
 
@@ -68,7 +68,7 @@ namespace Content.Client.PDA.Ringer
                     if (!IsNote(input.Text))
                     {
                         input.Text = PreviousNoteInputs[index];
-                        input.RemoveStyleClass("Caution");
+                        input.RemoveStyleClass("highlight");
                     }
                     input.CursorPosition = input.Text.Length;
                 };
diff --git a/Content.Client/Paper/UI/PaperSheetlet.cs b/Content.Client/Paper/UI/PaperSheetlet.cs
new file mode 100644
index 0000000000..3ff645ac1f
--- /dev/null
+++ b/Content.Client/Paper/UI/PaperSheetlet.cs
@@ -0,0 +1,43 @@
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Paper.UI;
+
+[CommonSheetlet]
+public sealed class PaperSheetlet : Sheetlet<NanotrasenStylesheet>
+{
+    public override StyleRule[] GetRules(NanotrasenStylesheet sheet, object config)
+    {
+        var windowCfg = (IWindowConfig)sheet;
+
+        var paperBackground = ResCache.GetTexture("/Textures/Interface/Paper/paper_background_default.svg.96dpi.png")
+            .IntoPatch(StyleBox.Margin.All, 16);
+        var paperBox = new StyleBoxTexture
+            { Texture = sheet.GetTexture(windowCfg.TransparentWindowBackgroundBorderedPath) };
+        paperBox.SetPatchMargin(StyleBox.Margin.All, 2);
+
+        var borderedTransparentTex = ResCache.GetTexture("/Textures/Interface/Nano/transparent_window_background_bordered.png");
+        var borderedTransparentBackground = new StyleBoxTexture
+        {
+            Texture = borderedTransparentTex,
+        };
+        borderedTransparentBackground.SetPatchMargin(StyleBox.Margin.All, 2);
+
+        return
+        [
+            E<PanelContainer>().Identifier("PaperContainer").Panel(paperBox),
+            E<PanelContainer>()
+                .Identifier("PaperDefaultBorder")
+                .Prop(PanelContainer.StylePropertyPanel, paperBackground),
+            E<PanelContainer>()
+                .Identifier("PaperEditBackground")
+                .Prop(PanelContainer.StylePropertyPanel, borderedTransparentBackground),
+        ];
+    }
+}
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml b/Content.Client/Paper/UI/PaperWindow.xaml
index 5e882b29e6..e3d97abc9d 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml
+++ b/Content.Client/Paper/UI/PaperWindow.xaml
@@ -4,19 +4,19 @@
     SetSize="510 660"> <!-- Provide some reasonable sizes by default. Can be changed by the component -->
 
     <BoxContainer Name="ContentsRoot" Orientation="Vertical">
-        <PanelContainer StyleClasses="AngleRect" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="6">
+        <PanelContainer StyleClasses="BackgroundPanel" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="6">
             <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"/>
         </PanelContainer>
-        <PanelContainer Name="PaperBackground" StyleClasses="PaperDefaultBorder" VerticalExpand="True" HorizontalExpand="True">
+        <PanelContainer Name="PaperBackground" StyleIdentifier="PaperDefaultBorder" VerticalExpand="True" HorizontalExpand="True">
             <ScrollContainer Name="ScrollingContents" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False">
                 <PanelContainer Name="PaperContent" VerticalExpand="True" HorizontalExpand="True" MaxWidth="600">
                     <BoxContainer Orientation="Vertical" VerticalAlignment="Stretch">
                         <TextureButton Name="HeaderImage" HorizontalAlignment="Center" VerticalAlignment="Top" MouseFilter="Ignore"/>
                         <Control Name="TextAlignmentPadding" VerticalAlignment="Top"/>
-                        <RichTextLabel Name="BlankPaperIndicator" StyleClasses="LabelSecondaryColor" VerticalAlignment="Top" HorizontalAlignment="Center"/>
+                        <RichTextLabel Name="BlankPaperIndicator" StyleClasses="LabelWeak" VerticalAlignment="Top" HorizontalAlignment="Center"/>
                         <RichTextLabel StyleClasses="PaperWrittenText" Name="WrittenTextLabel" VerticalAlignment="Top"/>
-                        <BoxContainer Name="InputContainer" Orientation="Vertical" VerticalExpand="True" VerticalAlignment="Stretch">
-                            <PanelContainer StyleClasses="TransparentBorderedWindowPanel" MinHeight="100"
+                        <BoxContainer Name="InputContainer" StyleIdentifier="PaperContainer" Orientation="Vertical" VerticalExpand="True" VerticalAlignment="Stretch">
+                            <PanelContainer StyleIdentifier="PaperEditBackground" MinHeight="100"
                                 VerticalAlignment="Stretch" VerticalExpand="True" HorizontalExpand="True">
                                 <TextEdit Name="Input" StyleClasses="PaperLineEdit" Access="Public" />
                             </PanelContainer>
diff --git a/Content.Client/Paper/UI/StampWidget.xaml b/Content.Client/Paper/UI/StampWidget.xaml
index 7ba187ecb9..2e0183694c 100644
--- a/Content.Client/Paper/UI/StampWidget.xaml
+++ b/Content.Client/Paper/UI/StampWidget.xaml
@@ -1,10 +1,7 @@
 <paper:StampWidget xmlns="https://spacestation14.io"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:style="clr-namespace:Content.Client.Stylesheets"
-    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-    xmlns:paper="clr-namespace:Content.Client.Paper.UI" HorizontalAlignment="Center" Margin="6">
-
-    <paper:StampLabel Name="StampedByLabel" StyleClasses="LabelHeadingBigger"
-        FontColorOverride="{x:Static style:StyleNano.DangerousRedFore}"
-        Margin="12 6 12 6"/>
+                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                   xmlns:paper="clr-namespace:Content.Client.Paper.UI"
+                   HorizontalAlignment="Center"
+                   Margin="6">
+    <paper:StampLabel Name="StampedByLabel" StyleClasses="LabelHeadingBigger" Margin="12 6 12 6" />
 </paper:StampWidget>
diff --git a/Content.Client/Physics/JointVisualsOverlay.cs b/Content.Client/Physics/JointVisualsOverlay.cs
index 9cc2831d21..ddac71f4ea 100644
--- a/Content.Client/Physics/JointVisualsOverlay.cs
+++ b/Content.Client/Physics/JointVisualsOverlay.cs
@@ -36,7 +36,7 @@ public sealed class JointVisualsOverlay : Overlay
             if (xform.MapID != args.MapId)
                 continue;
 
-            var other = _entManager.GetEntity(visuals.Target);
+            var other = visuals.Target;
 
             if (!xformQuery.TryGetComponent(other, out var otherXform))
                 continue;
@@ -45,7 +45,7 @@ public sealed class JointVisualsOverlay : Overlay
                 continue;
 
             var texture = spriteSystem.Frame0(visuals.Sprite);
-            var width = texture.Width / (float) EyeManager.PixelsPerMeter;
+            var width = texture.Width / (float)EyeManager.PixelsPerMeter;
 
             var coordsA = xform.Coordinates;
             var coordsB = otherXform.Coordinates;
@@ -58,7 +58,7 @@ public sealed class JointVisualsOverlay : Overlay
 
             var posA = xformSystem.ToMapCoordinates(coordsA).Position;
             var posB = xformSystem.ToMapCoordinates(coordsB).Position;
-            var diff = (posB - posA);
+            var diff = posB - posA;
             var length = diff.Length();
 
             var midPoint = diff / 2f + posA;
diff --git a/Content.Client/Pinpointer/UI/NavMapControl.cs b/Content.Client/Pinpointer/UI/NavMapControl.cs
index b774b7d8b5..47b5534d12 100644
--- a/Content.Client/Pinpointer/UI/NavMapControl.cs
+++ b/Content.Client/Pinpointer/UI/NavMapControl.cs
@@ -128,11 +128,7 @@ public partial class NavMapControl : MapGridControl
 
         var topPanel = new PanelContainer()
         {
-            PanelOverride = new StyleBoxFlat()
-            {
-                BackgroundColor = StyleNano.ButtonColorContext.WithAlpha(1f),
-                BorderColor = StyleNano.PanelDark
-            },
+            StyleClasses = { StyleClass.PanelDark },
             VerticalExpand = false,
             HorizontalExpand = true,
             SetWidth = 650f,
diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
index c79fc8f9e7..cecd7e8479 100644
--- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml
+++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml
@@ -9,7 +9,7 @@
         <!-- Station name -->
         <controls:StripeBack>
             <PanelContainer>
-                <Label Name="StationName" Text="Unknown station" StyleClasses="LabelBig" Align="Center"/>
+                <Label Name="StationName" Text="{Loc 'station-map-unknown-station'}" StyleClasses="LabelBig" Align="Center"/>
             </PanelContainer>
         </controls:StripeBack>
 
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml b/Content.Client/Power/APC/UI/ApcMenu.xaml
index 6cb46a4360..4c14dcc0ad 100644
--- a/Content.Client/Power/APC/UI/ApcMenu.xaml
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml
@@ -18,15 +18,15 @@
                     <GridContainer Margin="10 0 0 0" Columns="2">
                         <!-- Power On/Off -->
                         <Label Text="{Loc 'apc-menu-breaker-label'}" HorizontalExpand="True"
-                                StyleClasses="StatusFieldTitle" MinWidth="120"/>
+                                StyleClasses="highlight" MinWidth="120"/>
                         <BoxContainer Orientation="Horizontal" MinWidth="90">
                             <Button Name="BreakerButton" Text="{Loc 'apc-menu-breaker-button'}" HorizontalExpand="True" ToggleMode="True"/>
                         </BoxContainer>
                         <!--Charging Status-->
-                        <Label Text="{Loc 'apc-menu-external-label'}" StyleClasses="StatusFieldTitle" MinWidth="120" />
+                        <Label Text="{Loc 'apc-menu-external-label'}" StyleClasses="highlight" MinWidth="120" />
                         <Label Name="ExternalPowerStateLabel" Text="{Loc 'apc-menu-power-state-good'}" />
                         <!--Battery Power-->
-                        <Label Text="{Loc 'apc-menu-power-label'}" StyleClasses="StatusFieldTitle" MinWidth="120" />
+                        <Label Text="{Loc 'apc-menu-power-label'}" StyleClasses="highlight" MinWidth="120" />
                         <Label Name="PowerLabel"/>
                     </GridContainer>
                 </BoxContainer>
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
index 65464abd54..14c00986ce 100644
--- a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.GameObjects;
 using Robust.Shared.IoC;
@@ -7,10 +7,6 @@ using System.Numerics;
 using Content.Client.Stylesheets;
 using Content.Shared.APC;
 using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
 
 namespace Content.Client.Power.APC.UI
@@ -44,7 +40,7 @@ namespace Content.Client.Power.APC.UI
 
             if (PowerLabel != null)
             {
-                PowerLabel.Text = castState.Power + " W";
+                PowerLabel.Text = Loc.GetString("apc-menu-power-state-label-text", ("power", castState.Power));
             }
 
             if (ExternalPowerStateLabel != null)
@@ -53,15 +49,15 @@ namespace Content.Client.Power.APC.UI
                 {
                     case ApcExternalPowerState.None:
                         ExternalPowerStateLabel.Text = Loc.GetString("apc-menu-power-state-none");
-                        ExternalPowerStateLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
+                        ExternalPowerStateLabel.SetOnlyStyleClass("negative");
                         break;
                     case ApcExternalPowerState.Low:
                         ExternalPowerStateLabel.Text = Loc.GetString("apc-menu-power-state-low");
-                        ExternalPowerStateLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateLow);
+                        ExternalPowerStateLabel.SetOnlyStyleClass("highlight");
                         break;
                     case ApcExternalPowerState.Good:
                         ExternalPowerStateLabel.Text = Loc.GetString("apc-menu-power-state-good");
-                        ExternalPowerStateLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
+                        ExternalPowerStateLabel.SetOnlyStyleClass("positive");
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();
diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
index 161482e090..807d08aa62 100644
--- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
+++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs
@@ -92,19 +92,19 @@ public sealed partial class GeneratorWindow : FancyWindow
         if (starting)
         {
             StatusLabel.Text = _loc.GetString("portable-generator-ui-status-starting");
-            StatusLabel.SetOnlyStyleClass("Caution");
+            StatusLabel.SetOnlyStyleClass("negative");
 
             StartProgress.Value = progress;
         }
         else if (on)
         {
             StatusLabel.Text = _loc.GetString("portable-generator-ui-status-running");
-            StatusLabel.SetOnlyStyleClass("Good");
+            StatusLabel.SetOnlyStyleClass("positive");
         }
         else
         {
             StatusLabel.Text = _loc.GetString("portable-generator-ui-status-stopped");
-            StatusLabel.SetOnlyStyleClass("Danger");
+            StatusLabel.SetOnlyStyleClass("highlight");
         }
 
         var canSwitch = _entityManager.TryGetComponent(_entity, out PowerSwitchableComponent? switchable);
@@ -131,7 +131,7 @@ public sealed partial class GeneratorWindow : FancyWindow
                 ("supply", netStats.Supply));
 
             var good = netStats.Load <= netStats.Supply;
-            NetworkStats.SetOnlyStyleClass(good ? "Good" : "Caution");
+            NetworkStats.SetOnlyStyleClass(good ? "positive" : "highlight");
         }
         else
         {
diff --git a/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml
index 982b75117a..632126ba07 100644
--- a/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml
+++ b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow
+<controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     MinSize="320 180"
@@ -18,7 +18,7 @@
                 <Label
                     Text="{Loc 'power-charge-window-power'}"
                     HorizontalExpand="True"
-                    StyleClasses="StatusFieldTitle" />
+                    StyleClasses="highlight" />
 
                 <BoxContainer
                     Orientation="Horizontal"
@@ -49,21 +49,21 @@
                 <!-- Status -->
                 <Label
                     Text="{Loc 'power-charge-window-status'}"
-                    StyleClasses="StatusFieldTitle" />
+                    StyleClasses="highlight" />
                 <Label Name="StatusLabel"
                     Text="{Loc 'power-charge-window-status-fully-charged'}" />
 
                 <!-- ETA -->
                 <Label
                     Text="{Loc 'power-charge-window-eta'}"
-                    StyleClasses="StatusFieldTitle" />
+                    StyleClasses="highlight" />
                 <Label Name="EtaLabel"
                     Text="N/A" />
 
                 <!-- Charge -->
                 <Label
                     Text="{Loc 'power-charge-window-charge'}"
-                    StyleClasses="StatusFieldTitle" />
+                    StyleClasses="highlight" />
 
                 <ProgressBar Name="ChargeBar"
                     MaxValue="255">
diff --git a/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs
index 6739e24c20..5423910b7a 100644
--- a/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs
+++ b/Content.Client/Power/PowerCharge/PowerChargeWindow.xaml.cs
@@ -1,4 +1,5 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.Stylesheets.Palette;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Power;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -41,7 +42,10 @@ public sealed partial class PowerChargeWindow : FancyWindow
             ("draw", state.PowerDraw),
             ("max", state.PowerDrawMax));
 
-        PowerLabel.SetOnlyStyleClass(MathHelper.CloseTo(state.PowerDraw, state.PowerDrawMax) ? "Good" : "Caution");
+        PowerLabel.FontColorOverride = MathHelper.CloseTo(state.PowerDraw, state.PowerDrawMax)
+            ? Palettes.Status.Good
+            : Palettes.Status.Warning;
+        // TODO: blend with status colors instead of setting hard values
 
         ChargeBar.Value = state.Charge;
         ChargeText.Text = (state.Charge / 255f).ToString("P0");
@@ -54,12 +58,12 @@ public sealed partial class PowerChargeWindow : FancyWindow
             _ => throw new ArgumentOutOfRangeException()
         });
 
-        StatusLabel.SetOnlyStyleClass(state.PowerStatus switch
+        StatusLabel.FontColorOverride = (state.PowerStatus switch
         {
-            PowerChargePowerStatus.Off => "Danger",
-            PowerChargePowerStatus.Discharging => "Caution",
-            PowerChargePowerStatus.Charging => "Caution",
-            PowerChargePowerStatus.FullyCharged => "Good",
+            PowerChargePowerStatus.Off => Palettes.Status.Critical,
+            PowerChargePowerStatus.Discharging => Palettes.Status.Warning,
+            PowerChargePowerStatus.Charging => Palettes.Status.Warning,
+            PowerChargePowerStatus.FullyCharged => Palettes.Status.Good,
             _ => throw new ArgumentOutOfRangeException()
         });
 
@@ -67,6 +71,6 @@ public sealed partial class PowerChargeWindow : FancyWindow
             ? Loc.GetString("power-charge-window-eta-value", ("left", TimeSpan.FromSeconds(state.EtaSeconds)))
             : Loc.GetString("power-charge-window-eta-none");
 
-        EtaLabel.SetOnlyStyleClass(state.EtaSeconds >= 0 ? "Caution" : "Disabled");
+        EtaLabel.SetOnlyStyleClass(state.EtaSeconds >= 0 ? "highlight" : "LabelWeak");
     }
 }
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml b/Content.Client/Power/PowerMonitoringWindow.xaml
index 9bab3ad1c9..494e3d16f6 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml
@@ -67,11 +67,11 @@
 
                 <!-- Power overview -->
                 <GridContainer Columns="2">
-                    <Label StyleClasses="StatusFieldTitle" Text="{Loc 'power-monitoring-window-total-sources'}"/>
+                    <Label StyleClasses="highlight" Text="{Loc 'power-monitoring-window-total-sources'}"/>
                     <Label Name="TotalSources" Text="?" Margin="10 0 0 0"/>
-                    <Label StyleClasses="StatusFieldTitle" Text="{Loc 'power-monitoring-window-total-battery-usage'}"/>
+                    <Label StyleClasses="highlight" Text="{Loc 'power-monitoring-window-total-battery-usage'}"/>
                     <Label Name="TotalBatteryUsage" Text="?" Margin="10 0 0 0"/>
-                    <Label StyleClasses="StatusFieldTitle" Text="{Loc 'power-monitoring-window-total-loads'}"/>
+                    <Label StyleClasses="highlight" Text="{Loc 'power-monitoring-window-total-loads'}"/>
                     <Label Name="TotalLoads" Text="?" Margin="10 0 0 0"/>
                 </GridContainer>
 
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
index 209c1cd32b..a9752fa4e2 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
@@ -85,10 +85,10 @@ public sealed partial class PowerMonitoringWindow
 
         // Update button style
         if (netEntity == _focusEntity)
-            button.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
+            button.AddStyleClass(StyleClass.Positive);
 
         else
-            button.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
+            button.RemoveStyleClass(StyleClass.Positive);
 
         // Update sprite
         if (entry.MetaData.Value.SpritePath != string.Empty && entry.MetaData.Value.SpriteState != string.Empty)
@@ -185,7 +185,7 @@ public sealed partial class PowerMonitoringWindow
         // Toggle off button?
         if (entry.NetEntity == _focusEntity)
         {
-            entry.Button.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
+            entry.Button.RemoveStyleClass(StyleClass.Positive);
             _focusEntity = null;
 
             // Request an update from the power monitoring system
@@ -195,7 +195,7 @@ public sealed partial class PowerMonitoringWindow
         }
 
         // Otherwise, toggle on
-        entry.Button.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
+        entry.Button.AddStyleClass(StyleClass.Positive);
 
         ActivateAutoScrollToFocus();
 
@@ -206,7 +206,7 @@ public sealed partial class PowerMonitoringWindow
             {
                 if (sibling.NetEntity == _focusEntity)
                 {
-                    sibling.Button.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
+                    sibling.Button.RemoveStyleClass(StyleClass.Positive);
                     break;
                 }
             }
diff --git a/Content.Client/Radiation/UI/GeigerItemControl.cs b/Content.Client/Radiation/UI/GeigerItemControl.cs
index af9e46fefa..5d673bc8f1 100644
--- a/Content.Client/Radiation/UI/GeigerItemControl.cs
+++ b/Content.Client/Radiation/UI/GeigerItemControl.cs
@@ -16,7 +16,7 @@ public sealed class GeigerItemControl : Control
     public GeigerItemControl(GeigerComponent component)
     {
         _component = component;
-        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+        _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
         AddChild(_label);
 
         Update();
diff --git a/Content.Client/Remotes/EntitySystems/DoorRemoteSystem.cs b/Content.Client/Remotes/Systems/DoorRemoteSystem.cs
similarity index 50%
rename from Content.Client/Remotes/EntitySystems/DoorRemoteSystem.cs
rename to Content.Client/Remotes/Systems/DoorRemoteSystem.cs
index d6a9057f08..be2e895cea 100644
--- a/Content.Client/Remotes/EntitySystems/DoorRemoteSystem.cs
+++ b/Content.Client/Remotes/Systems/DoorRemoteSystem.cs
@@ -1,9 +1,9 @@
-using Content.Client.Remote.UI;
 using Content.Client.Items;
-using Content.Shared.Remotes.EntitySystems;
+using Content.Client.Remotes.UI;
 using Content.Shared.Remotes.Components;
+using Content.Shared.Remotes.EntitySystems;
 
-namespace Content.Client.Remotes.EntitySystems;
+namespace Content.Client.Remotes.Systems;
 
 public sealed class DoorRemoteSystem : SharedDoorRemoteSystem
 {
@@ -12,5 +12,11 @@ public sealed class DoorRemoteSystem : SharedDoorRemoteSystem
         base.Initialize();
 
         Subs.ItemStatus<DoorRemoteComponent>(ent => new DoorRemoteStatusControl(ent));
+        SubscribeLocalEvent<DoorRemoteComponent, AfterAutoHandleStateEvent>(OnAutoHandleState);
+    }
+
+    private void OnAutoHandleState(Entity<DoorRemoteComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        ent.Comp.IsStatusControlUpdateRequired = true;
     }
 }
diff --git a/Content.Client/Remotes/UI/DoorRemoteBoundUserInterface.cs b/Content.Client/Remotes/UI/DoorRemoteBoundUserInterface.cs
new file mode 100644
index 0000000000..d2ed89c100
--- /dev/null
+++ b/Content.Client/Remotes/UI/DoorRemoteBoundUserInterface.cs
@@ -0,0 +1,63 @@
+using Content.Client.Stylesheets.Palette;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Remotes.Components;
+using Content.Shared.Remotes.EntitySystems;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Remotes.UI;
+
+public sealed class DoorRemoteBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
+{
+    private static readonly Color SelectedOptionColor = Palettes.Green.Element.WithAlpha(128);
+    private static readonly Color SelectedOptionHoverColor = Palettes.Green.HoveredElement.WithAlpha(128);
+
+    private SimpleRadialMenu? _menu;
+
+    protected override void Open()
+    {
+        base.Open();
+
+        if (!EntMan.TryGetComponent<DoorRemoteComponent>(Owner, out var remote))
+            return;
+
+        _menu = this.CreateWindow<SimpleRadialMenu>();
+        var models = CreateButtons(remote.Mode, remote.Options);
+        _menu.SetButtons(models);
+
+        _menu.OpenOverMouseScreenPosition();
+    }
+
+    private IEnumerable<RadialMenuOptionBase> CreateButtons(OperatingMode selectedMode, List<DoorRemoteModeInfo> modeOptions)
+    {
+        var options = new List<RadialMenuOptionBase>();
+        for (var i = 0; i < modeOptions.Count; i++)
+        {
+            var modeOption = modeOptions[i];
+
+            Color? optionCustomColor = null;
+            Color? optionHoverCustomColor = null;
+            if (modeOption.Mode == selectedMode)
+            {
+                optionCustomColor = SelectedOptionColor;
+                optionHoverCustomColor = SelectedOptionHoverColor;
+            }
+
+            var option = new RadialMenuActionOption<OperatingMode>(HandleRadialMenuClick, modeOption.Mode)
+            {
+                IconSpecifier = RadialMenuIconSpecifier.With(modeOption.Icon),
+                ToolTip = Loc.GetString(modeOption.Tooltip),
+                BackgroundColor = optionCustomColor,
+                HoverBackgroundColor = optionHoverCustomColor
+            };
+            options.Add(option);
+        }
+
+        return options;
+    }
+
+    private void HandleRadialMenuClick(OperatingMode mode)
+    {
+        var msg = new DoorRemoteModeChangeMessage { Mode = mode };
+        SendPredictedMessage(msg);
+    }
+}
diff --git a/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs b/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs
index 94589ecdaa..e96cce5b25 100644
--- a/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs
+++ b/Content.Client/Remotes/UI/DoorRemoteStatusControl.cs
@@ -1,39 +1,36 @@
 using Content.Client.Message;
 using Content.Client.Stylesheets;
 using Content.Shared.Remotes.Components;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface;
 using Robust.Shared.Timing;
 
-namespace Content.Client.Remote.UI;
+namespace Content.Client.Remotes.UI;
 
-public sealed class DoorRemoteStatusControl : Control
+public sealed class DoorRemoteStatusControl(Entity<DoorRemoteComponent> ent) : Control
 {
-    private readonly Entity<DoorRemoteComponent> _entity;
-    private readonly RichTextLabel _label;
-
-    // set to toggle bolts initially just so that it updates on first pickup of remote
-    private OperatingMode PrevOperatingMode = OperatingMode.placeholderForUiUpdates;
-
-    public DoorRemoteStatusControl(Entity<DoorRemoteComponent> entity)
-    {
-        _entity = entity;
-        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
-        AddChild(_label);
-    }
+    private RichTextLabel? _label;
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
 
-        // only updates the UI if any of the details are different than they previously were
-        if (PrevOperatingMode == _entity.Comp.Mode)
+        if (_label == null)
+        {
+            _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
+            AddChild(_label);
+        }
+        else if (!ent.Comp.IsStatusControlUpdateRequired)
             return;
 
-        PrevOperatingMode = _entity.Comp.Mode;
+        UpdateLabel(_label);
 
-        // Update current volume and injector state
-        var modeStringLocalized = Loc.GetString(_entity.Comp.Mode switch
+        ent.Comp.IsStatusControlUpdateRequired = false;
+    }
+
+    private void UpdateLabel(RichTextLabel label)
+    {
+        var modeStringLocalized = Loc.GetString(ent.Comp.Mode switch
         {
             OperatingMode.OpenClose => "door-remote-open-close-text",
             OperatingMode.ToggleBolts => "door-remote-toggle-bolt-text",
@@ -41,6 +38,6 @@ public sealed class DoorRemoteStatusControl : Control
             _ => "door-remote-invalid-text"
         });
 
-        _label.SetMarkup(Loc.GetString("door-remote-mode-label", ("modeString", modeStringLocalized)));
+        label.SetMarkup(Loc.GetString("door-remote-mode-label", ("modeString", modeStringLocalized)));
     }
 }
diff --git a/Content.Client/Replay/UI/Loading/ReplayLoadingFailedControl.xaml b/Content.Client/Replay/UI/Loading/ReplayLoadingFailedControl.xaml
index 8967b948e0..009360d9ad 100644
--- a/Content.Client/Replay/UI/Loading/ReplayLoadingFailedControl.xaml
+++ b/Content.Client/Replay/UI/Loading/ReplayLoadingFailedControl.xaml
@@ -2,12 +2,12 @@
          xmlns:pllax="clr-namespace:Content.Client.Parallax">
     <pllax:ParallaxControl SpeedX="20"/>
     <Control HorizontalAlignment="Center" VerticalAlignment="Center">
-        <PanelContainer StyleClasses="AngleRect" />
+        <PanelContainer StyleClasses="BackgroundPanel" />
         <BoxContainer Orientation="Vertical" SetSize="800 600" Margin="2">
             <ScrollContainer Name="what" VerticalExpand="True" HScrollEnabled="False" Margin="0 0 0 2" ReturnMeasure="True">
                 <RichTextLabel Name="ReasonLabel" VerticalAlignment="Top" />
             </ScrollContainer>
-            <Button Name="RetryButton" StyleClasses="Caution" Text="{Loc 'replay-loading-retry'}" Visible="False" />
+            <Button Name="RetryButton" StyleClasses="negative" Text="{Loc 'replay-loading-retry'}" Visible="False" />
             <Button Name="CancelButton" Text="{Loc 'replay-loading-cancel'}" Visible="False" />
         </BoxContainer>
     </Control>
diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
index 24583d2776..f9b7b245b2 100644
--- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
+++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
@@ -63,7 +63,7 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow
         };
 
         // cant put multiple styles in xaml for some reason
-        DestroyButton.StyleClasses.Add(StyleBase.ButtonCaution);
+        DestroyButton.StyleClasses.Add(StyleClass.Negative);
     }
 
     public void SetEntity(EntityUid uid)
diff --git a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
index 7108e4cca8..f0a1678b75 100644
--- a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
+++ b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
@@ -34,7 +34,7 @@ namespace Content.Client.RoundEnd
             roundEndTabs.AddChild(MakeRoundEndSummaryTab(gm, roundEnd, roundTimeSpan, roundId));
             roundEndTabs.AddChild(MakePlayerManifestTab(info));
 
-            Contents.AddChild(roundEndTabs);
+            ContentsContainer.AddChild(roundEndTabs);
 
             OpenCenteredRight();
             MoveToFront();
diff --git a/Content.Client/Salvage/UI/OfferingWindowOption.xaml.cs b/Content.Client/Salvage/UI/OfferingWindowOption.xaml.cs
index 7855577e69..004387eeb5 100644
--- a/Content.Client/Salvage/UI/OfferingWindowOption.xaml.cs
+++ b/Content.Client/Salvage/UI/OfferingWindowOption.xaml.cs
@@ -74,12 +74,12 @@ public sealed partial class OfferingWindowOption : PanelContainer
 
             if (_claimed)
             {
-                ClaimButton.AddStyleClass(StyleBase.ButtonCaution);
+                ClaimButton.AddStyleClass(StyleClass.Negative);
                 ClaimButton.Text = Loc.GetString("offering-window-claimed");
             }
             else
             {
-                ClaimButton.RemoveStyleClass(StyleBase.ButtonCaution);
+                ClaimButton.RemoveStyleClass(StyleClass.Negative);
                 ClaimButton.Text = Loc.GetString("offering-window-claim");
             }
         }
diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
index 6eb2944ea9..34ff5b45c9 100644
--- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
+++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
@@ -90,9 +90,9 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
             offering.AddContent(new Label
             {
                 Text = difficultyProto.RecommendedPlayers.ToString(),
-                FontColorOverride = StyleNano.NanoGold,
                 HorizontalAlignment = Control.HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
+                StyleClasses = { StyleClass.LabelKeyText },
             });
 
             // Details
@@ -108,9 +108,9 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
                 Text = string.IsNullOrWhiteSpace(Loc.GetString(_protoManager.Index<SalvageFactionPrototype>(faction).Description))
                         ? LogAndReturnDefaultFactionDescription(faction)
                         : Loc.GetString(_protoManager.Index<SalvageFactionPrototype>(faction).Description),
-                FontColorOverride = StyleNano.NanoGold,
                 HorizontalAlignment = Control.HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
+                StyleClasses = { StyleClass.LabelKeyText },
             });
 
             string LogAndReturnDefaultFactionDescription(string faction)
@@ -129,9 +129,9 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
             offering.AddContent(new Label
             {
                 Text = mission.Duration.ToString(),
-                FontColorOverride = StyleNano.NanoGold,
                 HorizontalAlignment = Control.HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
+                StyleClasses = { StyleClass.LabelKeyText },
             });
 
             // Biome
@@ -147,9 +147,9 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
                 Text = string.IsNullOrWhiteSpace(Loc.GetString(_protoManager.Index<SalvageBiomeModPrototype>(biome).Description))
                         ? LogAndReturnDefaultBiomDescription(biome)
                         : Loc.GetString(_protoManager.Index<SalvageBiomeModPrototype>(biome).Description),
-                FontColorOverride = StyleNano.NanoGold,
                 HorizontalAlignment = Control.HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
+                StyleClasses = { StyleClass.LabelKeyText },
             });
 
             string LogAndReturnDefaultBiomDescription(string biome)
@@ -169,9 +169,9 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
             offering.AddContent(new Label
             {
                 Text = string.Join("\n", mods.Select(o => "- " + o)).TrimEnd(),
-                FontColorOverride = StyleNano.NanoGold,
                 HorizontalAlignment = Control.HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
+                StyleClasses = { StyleClass.LabelKeyText },
             });
 
             offering.ClaimPressed += args =>
diff --git a/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs b/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs
index e833e7d7a9..830bc3ccc5 100644
--- a/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs
+++ b/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs
@@ -133,13 +133,13 @@ public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindo
 
         foreach (var sensor in _sensorData.Values)
         {
-            var labelName = new Label { Text = sensor.Name, StyleClasses = { StyleBase.StyleClassLabelHeading } };
+            var labelName = new Label { Text = sensor.Name, StyleClasses = { StyleClass.LabelHeading } };
             var labelAddress = new Label
             {
                 Text = sensor.Address,
                 Margin = new Thickness(4, 0),
                 VerticalAlignment = VAlignment.Bottom,
-                StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
+                StyleClasses = { StyleClass.LabelWeak }
             };
 
             Asdf.AddChild(new BoxContainer
@@ -163,13 +163,13 @@ public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindo
                     Orientation = BoxContainer.LayoutOrientation.Horizontal,
                     Children =
                     {
-                        new Label { Text = stream.Name, StyleClasses = { "monospace" }, HorizontalExpand = true },
+                        new Label { Text = stream.Name, StyleClasses = { "Monospace" }, HorizontalExpand = true },
                         new Label { Text = FormatValue(stream.Unit, lastSample.Value) }
                     }
                 });
 
                 Asdf.AddChild(new GraphView(stream.Samples, startTime, curTime, maxValue * 1.1f, this) { MinHeight = 150 });
-                Asdf.AddChild(new PanelContainer { StyleClasses = { StyleBase.ClassLowDivider } });
+                Asdf.AddChild(new PanelContainer { StyleClasses = { StyleClass.LowDivider } });
             }
         }
     }
diff --git a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
index 6ed20de6bd..dab11a7b62 100644
--- a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
@@ -4,13 +4,13 @@
                            MinSize="200 200">
     <BoxContainer Orientation="Vertical" HorizontalExpand="True">
         <GridContainer Margin="4 0 0 0" Columns="2">
-            <Label Name="ShowIFFLabel" Text="{Loc 'iff-console-show-iff-label'}" HorizontalExpand="True" StyleClasses="StatusFieldTitle" />
+            <Label Name="ShowIFFLabel" Text="{Loc 'iff-console-show-iff-label'}" HorizontalExpand="True" StyleClasses="highlight" />
             <BoxContainer Orientation="Horizontal" MinWidth="120">
                 <Button Name="ShowIFFOnButton" Text="{Loc 'iff-console-on'}" StyleClasses="OpenRight" />
                 <Button Name="ShowIFFOffButton" Text="{Loc 'iff-console-off'}" StyleClasses="OpenLeft" />
             </BoxContainer>
 
-            <Label Name="ShowVesselLabel" Text="{Loc 'iff-console-show-vessel-label'}" HorizontalExpand="True" StyleClasses="StatusFieldTitle" />
+            <Label Name="ShowVesselLabel" Text="{Loc 'iff-console-show-vessel-label'}" HorizontalExpand="True" StyleClasses="highlight" />
             <BoxContainer Orientation="Horizontal" MinWidth="120">
                 <Button Name="ShowVesselOnButton" Text="{Loc 'iff-console-on'}" StyleClasses="OpenRight" />
                 <Button Name="ShowVesselOffButton" Text="{Loc 'iff-console-off'}" StyleClasses="OpenLeft" />
diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
index b9e07adef0..aea590e334 100644
--- a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
+++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
@@ -102,14 +102,14 @@ public sealed partial class BorgMenu : FancyWindow
             BrainView.Visible = true;
             BrainView.SetEntity(brain);
             BrainButton.Disabled = false;
-            BrainButton.AddStyleClass(StyleBase.ButtonOpenLeft);
+            BrainButton.AddStyleClass(StyleClass.ButtonOpenLeft);
         }
         else
         {
             BrainButton.Text = Loc.GetString("borg-ui-no-brain");
             BrainButton.Disabled = true;
             BrainView.Visible = false;
-            BrainButton.RemoveStyleClass(StyleBase.ButtonOpenLeft);
+            BrainButton.RemoveStyleClass(StyleClass.ButtonOpenLeft);
         }
     }
 
diff --git a/Content.Client/Silicons/Borgs/BorgModuleControl.xaml b/Content.Client/Silicons/Borgs/BorgModuleControl.xaml
index 7d89cc54b9..2f6e25f983 100644
--- a/Content.Client/Silicons/Borgs/BorgModuleControl.xaml
+++ b/Content.Client/Silicons/Borgs/BorgModuleControl.xaml
@@ -1,6 +1,6 @@
 <PanelContainer xmlns="https://spacestation14.io"
                 HorizontalExpand="True"
-                StyleClasses="PanelBackgroundLight"
+                StyleClasses="PanelLight"
                 Margin="5 5 5 0">
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5 5 0 5">
         <SpriteView Name="ModuleView" Margin="0 0 5 0"/>
diff --git a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
index b54da765b0..86ed7a8b77 100644
--- a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
+++ b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs
@@ -58,25 +58,6 @@ public sealed class BorgSwitchableTypeSystem : SharedBorgSwitchableTypeSystem
             }
         }
 
-        if (prototype.SpriteBodyMovementState is { } movementState)
-        {
-            var spriteMovement = EnsureComp<SpriteMovementComponent>(entity);
-            spriteMovement.NoMovementLayers.Clear();
-            spriteMovement.NoMovementLayers["movement"] = new PrototypeLayerData
-            {
-                State = prototype.SpriteBodyState,
-            };
-            spriteMovement.MovementLayers.Clear();
-            spriteMovement.MovementLayers["movement"] = new PrototypeLayerData
-            {
-                State = movementState,
-            };
-        }
-        else
-        {
-            RemComp<SpriteMovementComponent>(entity);
-        }
-
         base.UpdateEntityAppearance(entity, prototype);
     }
 }
diff --git a/Content.Client/Silicons/Bots/HugBotSystem.cs b/Content.Client/Silicons/Bots/HugBotSystem.cs
new file mode 100644
index 0000000000..b40fe51974
--- /dev/null
+++ b/Content.Client/Silicons/Bots/HugBotSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Silicons.Bots;
+
+namespace Content.Client.Silicons.Bots;
+
+public sealed partial class HugBotSystem : SharedHugBotSystem;
diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml
index d8abaf6e99..d16aa56664 100644
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml
@@ -10,7 +10,7 @@
             <customControls:HSeparator Margin="0 5 0 5"/>
             <RichTextLabel Name="LawLabel"/>
             <BoxContainer Name="LawAnnouncementButtons" Orientation="Horizontal" HorizontalExpand="True" Margin="0 5 0 0">
-                <Label Text="{Loc laws-ui-state-law}" StyleClasses="StatusFieldTitle"/>
+                <Label Text="{Loc laws-ui-state-law}" StyleClasses="highlight"/>
                 <Control Margin="5 0 0 0" />
                 <!-- Buttons are added via C# code-->
             </BoxContainer>
diff --git a/Content.Client/SprayPainter/SprayPainterSystem.cs b/Content.Client/SprayPainter/SprayPainterSystem.cs
index 788e97bef1..896f22012a 100644
--- a/Content.Client/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Client/SprayPainter/SprayPainterSystem.cs
@@ -97,7 +97,7 @@ public sealed class SprayPainterSystem : SharedSprayPainterSystem
         public StatusControl(Entity<SprayPainterComponent> ent)
         {
             _entity = ent;
-            _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+            _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
             AddChild(_label);
         }
 
diff --git a/Content.Client/Stack/StackStatusControl.cs b/Content.Client/Stack/StackStatusControl.cs
index 8006226832..1031b9ec9d 100644
--- a/Content.Client/Stack/StackStatusControl.cs
+++ b/Content.Client/Stack/StackStatusControl.cs
@@ -7,6 +7,9 @@ using Robust.Shared.Timing;
 
 namespace Content.Client.Stack;
 
+/// <summary>
+/// Used by hands in player UI to display the stack count.
+/// </summary>
 public sealed class StackStatusControl : Control
 {
     private readonly StackComponent _parent;
@@ -15,7 +18,7 @@ public sealed class StackStatusControl : Control
     public StackStatusControl(StackComponent parent)
     {
         _parent = parent;
-        _label = new RichTextLabel {StyleClasses = {StyleNano.StyleClassItemStatus}};
+        _label = new RichTextLabel {StyleClasses = {StyleClass.ItemStatus}};
         _label.SetMarkup(Loc.GetString("comp-stack-status", ("count", _parent.Count)));
         AddChild(_label);
     }
diff --git a/Content.Client/Stack/StackSystem.cs b/Content.Client/Stack/StackSystem.cs
index 182daa73a5..9396c76df5 100644
--- a/Content.Client/Stack/StackSystem.cs
+++ b/Content.Client/Stack/StackSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Client.Items;
 using Content.Client.Storage.Systems;
 using Content.Shared.Stacks;
@@ -7,6 +6,7 @@ using Robust.Client.GameObjects;
 
 namespace Content.Client.Stack
 {
+    /// <inheritdoc />
     [UsedImplicitly]
     public sealed class StackSystem : SharedStackSystem
     {
@@ -16,33 +16,21 @@ namespace Content.Client.Stack
         public override void Initialize()
         {
             base.Initialize();
+
             SubscribeLocalEvent<StackComponent, AppearanceChangeEvent>(OnAppearanceChange);
             Subs.ItemStatus<StackComponent>(ent => new StackStatusControl(ent));
         }
 
-        public override void SetCount(EntityUid uid, int amount, StackComponent? component = null)
+        #region Appearance
+
+        private void OnAppearanceChange(Entity<StackComponent> ent, ref AppearanceChangeEvent args)
         {
-            if (!Resolve(uid, ref component))
-                return;
+            var (uid, comp) = ent;
 
-            base.SetCount(uid, amount, component);
-
-            // TODO PREDICT ENTITY DELETION: This should really just be a normal entity deletion call.
-            if (component.Count <= 0)
-            {
-                Xform.DetachEntity(uid, Transform(uid));
-                return;
-            }
-
-            component.UiUpdateNeeded = true;
-        }
-
-        private void OnAppearanceChange(EntityUid uid, StackComponent comp, ref AppearanceChangeEvent args)
-        {
             if (args.Sprite == null || comp.LayerStates.Count < 1)
                 return;
 
-            // Skip processing if no actual
+            // Skip processing if no elements in the stack
             if (!_appearanceSystem.TryGetData<int>(uid, StackVisuals.Actual, out var actual, args.Component))
                 return;
 
@@ -56,9 +44,24 @@ namespace Content.Client.Stack
                 ApplyLayerFunction((uid, comp), ref actual, ref maxCount);
 
             if (comp.IsComposite)
-                _counterSystem.ProcessCompositeSprite(uid, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite);
+            {
+                _counterSystem.ProcessCompositeSprite(uid,
+                                                    actual,
+                                                    maxCount,
+                                                    comp.LayerStates,
+                                                    hidden,
+                                                    sprite: args.Sprite);
+            }
             else
-                _counterSystem.ProcessOpaqueSprite(uid, comp.BaseLayer, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite);
+            {
+                _counterSystem.ProcessOpaqueSprite(uid,
+                                                comp.BaseLayer,
+                                                actual,
+                                                maxCount,
+                                                comp.LayerStates,
+                                                hidden,
+                                                sprite: args.Sprite);
+            }
         }
 
         /// <summary>
@@ -67,7 +70,7 @@ namespace Content.Client.Stack
         /// <param name="ent">The entity considered.</param>
         /// <param name="actual">The actual number of items in the stack. Altered depending on the function to run.</param>
         /// <param name="maxCount">The maximum number of items in the stack. Altered depending on the function to run.</param>
-        /// <returns>Whether or not a function was applied.</returns>
+        /// <returns>True if a function was applied.</returns>
         private bool ApplyLayerFunction(Entity<StackComponent> ent, ref int actual, ref int maxCount)
         {
             switch (ent.Comp.LayerFunction)
@@ -78,8 +81,10 @@ namespace Content.Client.Stack
                         ApplyThreshold(threshold, ref actual, ref maxCount);
                         return true;
                     }
+
                     break;
             }
+
             // No function applied.
             return false;
         }
@@ -105,7 +110,10 @@ namespace Content.Client.Stack
                 else
                     break;
             }
+
             actual = newActual;
         }
+
+        #endregion
     }
 }
diff --git a/Content.Client/StationRecords/GeneralRecord.xaml.cs b/Content.Client/StationRecords/GeneralRecord.xaml.cs
index e84c2dc098..b69c6fb8bb 100644
--- a/Content.Client/StationRecords/GeneralRecord.xaml.cs
+++ b/Content.Client/StationRecords/GeneralRecord.xaml.cs
@@ -1,8 +1,9 @@
 using Content.Shared.StationRecords;
+using Content.Shared.Humanoid.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.StationRecords;
 
@@ -10,14 +11,15 @@ namespace Content.Client.StationRecords;
 public sealed partial class GeneralRecord : Control
 {
     public Action<uint>? OnDeletePressed;
-    public GeneralRecord(GeneralStationRecord record, bool canDelete, uint? id)
+    public GeneralRecord(GeneralStationRecord record, bool canDelete, uint? id, IPrototypeManager prototypeManager)
     {
         RobustXamlLoader.Load(this);
         RecordName.Text = record.Name;
         Age.Text = Loc.GetString("general-station-record-console-record-age", ("age", record.Age.ToString()));
         Title.Text = Loc.GetString("general-station-record-console-record-title",
             ("job", Loc.GetString(record.JobTitle)));
-        Species.Text = Loc.GetString("general-station-record-console-record-species", ("species", record.Species));
+        var species = Loc.GetString(prototypeManager.Index<SpeciesPrototype>(record.Species).Name);
+        Species.Text = Loc.GetString("general-station-record-console-record-species", ("species", species));
         Gender.Text = Loc.GetString("general-station-record-console-record-gender",
             ("gender", record.Gender.ToString()));
         Fingerprint.Text = Loc.GetString("general-station-record-console-record-fingerprint",
@@ -25,7 +27,7 @@ public sealed partial class GeneralRecord : Control
         Dna.Text = Loc.GetString("general-station-record-console-record-dna",
             ("dna", record.DNA ?? Loc.GetString("generic-not-available-shorthand")));
 
-        if (canDelete && id != null )
+        if (canDelete && id != null)
         {
             DeleteButton.Visible = true;
             DeleteButton.OnPressed += _ => OnDeletePressed?.Invoke(id.Value);
diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
index 272e6c3b25..951928325d 100644
--- a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
+++ b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
@@ -2,12 +2,15 @@ using Content.Shared.StationRecords;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.StationRecords;
 
 [GenerateTypedNameReferences]
 public sealed partial class GeneralStationRecordConsoleWindow : DefaultWindow
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
     public Action<uint?>? OnKeySelected;
 
     public Action<StationRecordFilterType, string>? OnFiltersChanged;
@@ -20,6 +23,7 @@ public sealed partial class GeneralStationRecordConsoleWindow : DefaultWindow
     public GeneralStationRecordConsoleWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
         _currentFilterType = StationRecordFilterType.Name;
 
@@ -44,7 +48,7 @@ public sealed partial class GeneralStationRecordConsoleWindow : DefaultWindow
 
         StationRecordsFilterType.OnItemSelected += eventArgs =>
         {
-            var type = (StationRecordFilterType) eventArgs.Id;
+            var type = (StationRecordFilterType)eventArgs.Id;
 
             if (_currentFilterType != type)
             {
@@ -139,7 +143,7 @@ public sealed partial class GeneralStationRecordConsoleWindow : DefaultWindow
     private void PopulateRecordContainer(GeneralStationRecord record, bool enableDelete, uint? id)
     {
         RecordContainer.RemoveAllChildren();
-        var newRecord = new GeneralRecord(record, enableDelete, id);
+        var newRecord = new GeneralRecord(record, enableDelete, id, _prototypeManager);
         newRecord.OnDeletePressed = OnDeleted;
 
         RecordContainer.AddChild(newRecord);
diff --git a/Content.Client/Strip/StrippingMenu.cs b/Content.Client/Strip/StrippingMenu.cs
index 124356e011..e3fa827736 100644
--- a/Content.Client/Strip/StrippingMenu.cs
+++ b/Content.Client/Strip/StrippingMenu.cs
@@ -17,7 +17,7 @@ namespace Content.Client.Strip
         public StrippingMenu()
         {
             var box = new BoxContainer() { Orientation = LayoutOrientation.Vertical, Margin = new Thickness(0, 8) };
-            Contents.AddChild(box);
+            ContentsContainer.AddChild(box);
             box.AddChild(SnareContainer);
             box.AddChild(HandsContainer);
             box.AddChild(InventoryContainer);
diff --git a/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs b/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs
new file mode 100644
index 0000000000..0b3e4aef97
--- /dev/null
+++ b/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs
@@ -0,0 +1,66 @@
+using Content.Client.Stylesheets.Fonts;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Reflection;
+using Robust.Shared.Sandboxing;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets;
+
+public abstract partial class BaseStylesheet : IStyleResources
+{
+    [Dependency] protected readonly ISandboxHelper SandboxHelper = default!;
+    [Dependency] protected readonly IReflectionManager ReflectionManager = default!;
+    [Dependency] protected internal readonly IResourceCache ResCache = default!;
+
+    public Stylesheet Stylesheet { get; init; }
+
+    public abstract NotoFontFamilyStack BaseFont { get; }
+
+    /// <summary>
+    ///     Get the style rules for the given font stack, with the provided sizes.
+    ///     Does not set the 'default' font, but does create rules for every combination of font kind and font size.
+    ///     This is intended for font sizes you think will be common/generally useful, for less common usecases prefer specifying the font explicitly.
+    /// </summary>
+    /// <param name="prefix">The prefix for the style classes, if any.</param>
+    /// <param name="stack">Font stack to use</param>
+    /// <param name="sizes">A set of styleclasses and the associated size of font to use.</param>
+    /// <returns>A rules list containing all combinations.</returns>
+    /// <remarks>Use <see cref="M:Content.Client.Stylesheets.BaseStylesheet.GetFontClass(Content.Client.Stylesheets.Redux.Fonts.FontStack.FontKind,System.String)"/> to get the appropriate styleclass for a font choice.</remarks>
+    // god xmldoc refs are long ^^^
+    // lmao
+    protected StyleRule[] GetRulesForFont(string? prefix, NotoFontFamilyStack stack, List<(string?, int)> sizes) // TODO: NotoFontFamilyStack is temporary
+    {
+        var rules = new List<StyleRule>();
+
+        foreach (var (name, size) in sizes)
+        {
+            foreach (var kind in stack.AvailableKinds)
+            {
+                var builder = E().Class(GetFontClass(kind, prefix));
+
+                if (name is not null)
+                    builder.Class(name);
+
+                builder.Prop(Label.StylePropertyFont, stack.GetFont(size, kind));
+
+                rules.Add(builder);
+            }
+        }
+
+        return rules.ToArray();
+    }
+
+    /// <summary>
+    ///     Returns the appropriate styleclass for the given font configuration.
+    /// </summary>
+    /// <param name="kind"></param>
+    /// <param name="prefix"></param>
+    /// <returns></returns>
+    public static string GetFontClass(FontKind kind, string? prefix = null)
+    {
+        var kindStr = kind.ToString().ToLowerInvariant();
+        return prefix is null ? $"font-{kindStr}" : $"{prefix}-{kindStr}";
+    }
+}
diff --git a/Content.Client/Stylesheets/BaseStylesheet.Resources.cs b/Content.Client/Stylesheets/BaseStylesheet.Resources.cs
new file mode 100644
index 0000000000..96e260a17a
--- /dev/null
+++ b/Content.Client/Stylesheets/BaseStylesheet.Resources.cs
@@ -0,0 +1,108 @@
+using System.Diagnostics.CodeAnalysis;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets;
+
+public abstract partial class BaseStylesheet
+{
+    /// <summary>
+    ///     The file roots of the stylesheet, dictates where assets get read from for the given type of resource.
+    ///     Roots will be checked in order for assets, avoid having a significant number of them.
+    /// </summary>
+    /// <remarks>
+    ///     Must be a constant, changes to this after construction will not be reflected.
+    /// </remarks>
+    public abstract Dictionary<Type, ResPath[]> Roots { get; }
+
+    /// <summary>
+    ///     Attempts to locate a resource within the stylesheet's roots.
+    /// </summary>
+    /// <param name="target">The relative path of the target resource.</param>
+    /// <param name="resource">The discovered/cached resource, if any.</param>
+    /// <typeparam name="T">Type of the resource to read.</typeparam>
+    /// <returns>Whether <paramref name="resource"/> is null.</returns>
+    public bool TryGetResource<T>(ResPath target, [NotNullWhen(true)] out T? resource)
+        where T : BaseResource, new()
+    {
+        DebugTools.Assert(target.IsRelative,
+            "Target path must be relative. Use ResCache directly if you need an absolute file location.");
+
+        foreach (var root in Roots[typeof(T)])
+        {
+            if (ResCache.TryGetResource(root / target, out resource))
+                return true;
+        }
+
+        resource = null;
+        return false;
+    }
+
+    /// <summary>
+    ///     Retrieves a resource, or throws.
+    /// </summary>
+    /// <param name="target">The relative path of the target resource.</param>
+    /// <typeparam name="T">Type of the resource to read.</typeparam>
+    /// <returns>The retrieved resource</returns>
+    /// <exception cref="MissingStyleResourceException">Thrown if the resource does not exist within the stylesheet's roots.</exception>
+    public T GetResource<T>(ResPath target)
+        where T : BaseResource, new()
+    {
+        if (TryGetResource(target, out T? res))
+            return res;
+
+        throw new MissingStyleResourceException(this, target.ToString());
+    }
+
+    /// <summary>
+    ///     Retrieves a resource, or falls back to the specified root. The resource should be present at the fallback
+    ///     root, or else it throws
+    /// </summary>
+    /// <remarks>
+    ///     This should be used to allow common sheetlets to be generic over multiple stylesheets without forcing other
+    ///     styles to have the resource present, if your sheetlet is stylesheet-specific you should not use this.
+    /// </remarks>
+    /// <param name="target">The relative path of the target resource.</param>
+    /// <param name="fallbackRoot">The root that this resource will always exist at</param>
+    /// <typeparam name="T">Type of the resource to read.</typeparam>
+    /// <returns>The retrieved resource</returns>
+    /// <exception cref="ExpectedResourceException">Thrown if the resource does not exist in the fallback root.</exception>
+    public T GetResourceOr<T>(ResPath target, ResPath fallbackRoot)
+        where T : BaseResource, new()
+    {
+        DebugTools.Assert(fallbackRoot.IsRooted,
+            "Fallback root must be absolute. Roots can be retrieved from the stylesheets.");
+
+        if (!ResCache.TryGetResource(fallbackRoot / target, out T? fallback))
+            throw new ExpectedResourceException(this, target.ToString());
+
+        return TryGetResource(target, out T? res) ? res : fallback;
+    }
+}
+
+/// <summary>
+///     Exception thrown when the never-fail helpers in <see cref="PalettedStylesheet"/> fail to locate a resource.
+/// </summary>
+/// <param name="sheet">The stylesheet </param>
+/// <param name="target"></param>
+public sealed class MissingStyleResourceException(BaseStylesheet sheet, string target) : Exception
+{
+    public override string Message =>
+        $"Failed to find any resource at \"{target}\" for {sheet}. The roots are: {sheet.Roots}";
+
+    public override string? Source => sheet.ToString();
+}
+
+/// <summary>
+///     Exception thrown when the never-fail helpers in <see cref="PalettedStylesheet"/> expect a resource at a location
+///     but do not find it.
+/// </summary>
+/// <param name="sheet">The stylesheet</param>
+/// <param name="target"></param>
+public sealed class ExpectedResourceException(BaseStylesheet sheet, string target) : Exception
+{
+    public override string Message =>
+        $"Failed to find any resource at \"{target}\" for {sheet}, when such a resource was expected.";
+
+    public override string? Source => sheet.ToString();
+}
diff --git a/Content.Client/Stylesheets/BaseStylesheet.Sheetlets.cs b/Content.Client/Stylesheets/BaseStylesheet.Sheetlets.cs
new file mode 100644
index 0000000000..0e219fdbd7
--- /dev/null
+++ b/Content.Client/Stylesheets/BaseStylesheet.Sheetlets.cs
@@ -0,0 +1,49 @@
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Stylesheets;
+
+public abstract partial class BaseStylesheet
+{
+    public StyleRule[] GetSheetletRules<TSheetTy>(Type sheetletTy, StylesheetManager man)
+    {
+        Sheetlet<TSheetTy>? sheetlet = null;
+        try
+        {
+            if (sheetletTy.ContainsGenericParameters)
+            {
+                if (SandboxHelper.CreateInstance(sheetletTy.MakeGenericType(typeof(TSheetTy))) is Sheetlet<TSheetTy>
+                    sheetlet1)
+                    sheetlet = sheetlet1;
+            }
+            else if (SandboxHelper.CreateInstance(sheetletTy) is Sheetlet<TSheetTy> sheetlet2)
+            {
+                sheetlet = sheetlet2;
+            }
+        }
+        // thrown when `sheetletTy.MakeGenericType` is given a type that does not satisfy the type constraints of
+        // `sheetletTy`
+        catch (ArgumentException) { }
+
+        if (sheetlet is not null)
+        {
+            man.UnusedSheetlets.Remove(sheetletTy);
+            return sheetlet.GetRules((TSheetTy)(object)this, _config);
+        }
+        else
+            return [];
+    }
+
+    public StyleRule[] GetAllSheetletRules<TSheetTy, TAttrib>(StylesheetManager man)
+        where TAttrib : Attribute
+    {
+        var tys = ReflectionManager.FindTypesWithAttribute<TAttrib>();
+        var rules = new List<StyleRule>();
+
+        foreach (var ty in tys)
+        {
+            rules.AddRange(GetSheetletRules<TSheetTy>(ty, man));
+        }
+
+        return rules.ToArray();
+    }
+}
diff --git a/Content.Client/Stylesheets/BaseStylesheet.Textures.cs b/Content.Client/Stylesheets/BaseStylesheet.Textures.cs
new file mode 100644
index 0000000000..a951d88373
--- /dev/null
+++ b/Content.Client/Stylesheets/BaseStylesheet.Textures.cs
@@ -0,0 +1,59 @@
+using System.Diagnostics.CodeAnalysis;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets;
+
+public abstract partial class BaseStylesheet
+{
+    #region Texture helpers
+
+    /// <summary>
+    ///     Attempts to locate a texture within the stylesheet's roots.
+    /// </summary>
+    /// <param name="target">The relative path of the target resource.</param>
+    /// <param name="texture">The retrieved texture, if any.</param>
+    /// <returns>Whether <paramref name="texture"/> is null.</returns>
+    public bool TryGetTexture(ResPath target, [NotNullWhen(true)] out Texture? texture)
+    {
+        if (TryGetResource(target, out TextureResource? resource))
+        {
+            texture = resource.Texture;
+            return true;
+        }
+
+        texture = null;
+        return false;
+    }
+
+    /// <summary>
+    ///     Retrieves a texture, or throws.
+    /// </summary>
+    /// <param name="target">The relative path of the target texture.</param>
+    /// <returns>The retrieved texture</returns>
+    /// <exception cref="MissingStyleResourceException">Thrown if the texture does not exist within the stylesheet's roots.</exception>
+    public Texture GetTexture(ResPath target)
+    {
+        return GetResource<TextureResource>(target).Texture;
+    }
+
+    /// <summary>
+    ///     Retrieves a texture, or falls back to the specified root. The resource should be present at the fallback
+    ///     root, or else it throws
+    /// </summary>
+    /// <remarks>
+    ///     This should be used to allow common sheetlets to be generic over multiple stylesheets without forcing other
+    ///     styles to have the resource present, if your sheetlet is stylesheet-specific you should not use this.
+    /// </remarks>
+    /// <param name="target">The relative path of the target texture.</param>
+    /// <param name="fallbackRoot">The root that this resource will always exist at</param>
+    /// <returns>The retrieved texture</returns>
+    /// <exception cref="ExpectedResourceException">Thrown if the texture does not exist in the fallback root.</exception>
+    public Texture GetTextureOr(ResPath target, ResPath fallbackRoot)
+    {
+        return GetResourceOr<TextureResource>(target, fallbackRoot).Texture;
+    }
+
+    #endregion
+}
diff --git a/Content.Client/Stylesheets/BaseStylesheet.cs b/Content.Client/Stylesheets/BaseStylesheet.cs
new file mode 100644
index 0000000000..6c12dfd7e3
--- /dev/null
+++ b/Content.Client/Stylesheets/BaseStylesheet.cs
@@ -0,0 +1,33 @@
+namespace Content.Client.Stylesheets;
+
+public abstract partial class BaseStylesheet
+{
+    /// <summary>
+    ///     The type used to describe a configuration for this stylesheet.
+    ///     This will be constructed and passed into the constructor, and may be used for other things as well.
+    /// </summary>
+    /// <remarks>
+    ///     Must be a constant, changes to this after construction will not be reflected.
+    ///     TODO: this type is currently unused. It can be used to, for example, use user-defined fonts or colors.
+    /// </remarks>
+    public virtual Type StylesheetConfigType => typeof(NoConfig);
+
+    /// <remarks>
+    ///     ex. "Nanotrasen", "System", "Syndicate"
+    /// </remarks>
+    public abstract string StylesheetName { get; }
+
+    public record NoConfig();
+
+    private object _config;
+
+    /// <remarks>
+    ///     This constructor will not access any virtual or abstract properties, so you can set them from your config.
+    /// </remarks>
+    protected BaseStylesheet(object config)
+    {
+        IoCManager.InjectDependencies(this);
+        _config = config;
+        Stylesheet = default!;
+    }
+}
diff --git a/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs b/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs
new file mode 100644
index 0000000000..1a191992b1
--- /dev/null
+++ b/Content.Client/Stylesheets/Colorspace/ColorExtensions.cs
@@ -0,0 +1,63 @@
+using System.Numerics;
+using JetBrains.Annotations;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.Colorspace;
+
+[PublicAPI]
+public static class ColorExtensions
+{
+    /// <summary>
+    ///     Adjusts the lightness of a color using the Oklab color space.
+    /// </summary>
+    public static Color WithLightness(this Color c, float lightness)
+    {
+        DebugTools.Assert(lightness is >= 0.0f and <= 1.0f);
+
+        var oklab = Color.ToLab(c);
+        oklab.X = lightness;
+
+        return Color.FromLab(oklab);
+    }
+
+    /// <summary>
+    ///     Nudges the lightness (in OKLAB space) of <see cref="c" /> by <see cref="lightnessShift"/> / 100 units
+    /// </summary>
+    public static Color NudgeLightness(this Color c, float lightnessShift)
+    {
+        var oklab = Color.ToLab(c);
+        oklab.X = Math.Clamp(oklab.X + lightnessShift, 0, 1);
+
+        return Color.FromLab(oklab);
+    }
+
+    /// <summary>
+    ///     Nudges the chroma (in OKLCH space) of <see cref="c"/> by <see cref="chromaShift"/> / 100 units
+    /// </summary>
+    /// <remarks>
+    ///     Referenced from https://github.com/jonathantneal/convert-colors/blob/master/src/lab-lch.js
+    /// </remarks>
+    public static Color NudgeChroma(this Color c, float chromaShift)
+    {
+        var oklab = Color.ToLab(c);
+        var oklch = Color.ToLch(oklab);
+
+        oklch.Y = Math.Clamp(oklch.Y + chromaShift, 0, 1);
+
+        return Color.FromLab(Color.FromLch(oklch));
+    }
+
+    /// <summary>
+    ///     Blends two colors in the Oklab color space.
+    /// </summary>
+    public static Color OkBlend(this Color from, Color to, float factor)
+    {
+        DebugTools.Assert(factor is >= 0.0f and <= 1.0f);
+
+        var okFrom = Color.ToLab(from);
+        var okTo = Color.ToLab(to);
+
+        var blended = Vector4.Lerp(okFrom, okTo, factor);
+        return Color.FromLab(blended);
+    }
+}
diff --git a/Content.Client/Stylesheets/CommonSheetletAttribute.cs b/Content.Client/Stylesheets/CommonSheetletAttribute.cs
new file mode 100644
index 0000000000..1fdf78a502
--- /dev/null
+++ b/Content.Client/Stylesheets/CommonSheetletAttribute.cs
@@ -0,0 +1,13 @@
+using JetBrains.Annotations;
+
+namespace Content.Client.Stylesheets;
+
+/// <summary>
+///     Attribute used to mark a sheetlet class. Stylesheets can use this attribute to locate and load sheetlets.
+/// </summary>
+[PublicAPI]
+[MeansImplicitUse]
+public sealed class CommonSheetletAttribute : Attribute
+{
+
+}
diff --git a/Content.Client/Stylesheets/CommonStylesheet.cs b/Content.Client/Stylesheets/CommonStylesheet.cs
new file mode 100644
index 0000000000..d7634e68eb
--- /dev/null
+++ b/Content.Client/Stylesheets/CommonStylesheet.cs
@@ -0,0 +1,71 @@
+using Content.Client.Stylesheets.Palette;
+using Content.Client.Stylesheets.SheetletConfigs;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets;
+
+public abstract class CommonStylesheet : PalettedStylesheet, IButtonConfig, IWindowConfig, IIconConfig, ITabContainerConfig,
+    ISliderConfig, IRadialMenuConfig, IPlaceholderConfig, ITooltipConfig, IPanelConfig, INanoHeadingConfig,
+    ILineEditConfig, IStripebackConfig, ICheckboxConfig
+{
+    /// <remarks>
+    ///     This constructor will not access any virtual or abstract properties, so you can set them from your config.
+    /// </remarks>
+    protected CommonStylesheet(object config) : base(config) { }
+
+    ResPath ICheckboxConfig.CheckboxUncheckedPath => new("checkbox_unchecked.svg.96dpi.png");
+    ResPath ICheckboxConfig.CheckboxCheckedPath => new("checkbox_checked.svg.96dpi.png");
+
+    ResPath IStripebackConfig.StripebackPath => new("stripeback.svg.96dpi.png");
+
+    ResPath INanoHeadingConfig.NanoHeadingPath => new("nanoheading.svg.96dpi.png");
+
+    ResPath ILineEditConfig.LineEditPath => new("lineedit.png");
+
+    ResPath IPanelConfig.GeometricPanelBorderPath => new("geometric_panel_border.svg.96dpi.png");
+    ResPath IPanelConfig.BlackPanelDarkThinBorderPath => new("black_panel_dark_thin_border.png");
+
+    ResPath ITooltipConfig.TooltipBoxPath => new("tooltip.png");
+    ResPath ITooltipConfig.WhisperBoxPath => new("whisper.png");
+
+    ResPath IPlaceholderConfig.PlaceholderPath => new("placeholder.png");
+
+    ResPath IRadialMenuConfig.ButtonNormalPath => new("Radial/button_normal.png");
+    ResPath IRadialMenuConfig.ButtonHoverPath => new("Radial/button_hover.png");
+    ResPath IRadialMenuConfig.CloseNormalPath => new("Radial/close_normal.png");
+    ResPath IRadialMenuConfig.CloseHoverPath => new("Radial/close_hover.png");
+    ResPath IRadialMenuConfig.BackNormalPath => new("Radial/back_normal.png");
+    ResPath IRadialMenuConfig.BackHoverPath => new("Radial/back_hover.png");
+
+    ResPath ISliderConfig.SliderFillPath => new("slider_fill.svg.96dpi.png");
+
+    ResPath ISliderConfig.SliderOutlinePath => new("slider_outline.svg.96dpi.png");
+
+    ResPath ISliderConfig.SliderGrabber => new("slider_grabber.svg.96dpi.png");
+
+
+    ResPath ITabContainerConfig.TabContainerPanelPath => new("tabcontainer_panel.png");
+
+    ResPath IIconConfig.HelpIconPath => new("help.png");
+    ResPath IIconConfig.CrossIconPath => new("cross.svg.png");
+    ResPath IIconConfig.RefreshIconPath => new("circular_arrow.svg.96dpi.png");
+    ResPath IIconConfig.InvertedTriangleIconPath => new("inverted_triangle.svg.png");
+
+    ResPath IWindowConfig.WindowHeaderTexturePath => new("window_header.png");
+    ResPath IWindowConfig.WindowHeaderAlertTexturePath => new("window_header_alert.png");
+    ResPath IWindowConfig.WindowBackgroundPath => new("window_background.png");
+    ResPath IWindowConfig.WindowBackgroundBorderedPath => new("window_background_bordered.png");
+    ResPath IWindowConfig.TransparentWindowBackgroundBorderedPath => new("transparent_window_background_bordered.png");
+
+    ResPath IButtonConfig.BaseButtonPath => new("button.svg.96dpi.png");
+    ResPath IButtonConfig.OpenLeftButtonPath => new("button.svg.96dpi.png");
+    ResPath IButtonConfig.OpenRightButtonPath => new("button.svg.96dpi.png");
+    ResPath IButtonConfig.OpenBothButtonPath => new("button.svg.96dpi.png");
+    ResPath IButtonConfig.SmallButtonPath => new("button_small.svg.96dpi.png");
+    ResPath IButtonConfig.RoundedButtonPath => new("rounded_button.svg.96dpi.png");
+    ResPath IButtonConfig.RoundedButtonBorderedPath => new("rounded_button_bordered.svg.96dpi.png");
+
+    ColorPalette IButtonConfig.ButtonPalette => PrimaryPalette with { PressedElement = PositivePalette.PressedElement };
+    ColorPalette IButtonConfig.PositiveButtonPalette => PositivePalette;
+    ColorPalette IButtonConfig.NegativeButtonPalette => NegativePalette;
+}
diff --git a/Content.Client/Stylesheets/Fonts/FontKind.cs b/Content.Client/Stylesheets/Fonts/FontKind.cs
new file mode 100644
index 0000000000..fef2b6bc46
--- /dev/null
+++ b/Content.Client/Stylesheets/Fonts/FontKind.cs
@@ -0,0 +1,57 @@
+namespace Content.Client.Stylesheets.Fonts;
+
+/// <summary>
+///     The available kinds of font.
+/// </summary>
+public enum FontKind
+{
+    Regular,
+    Bold,
+    Italic,
+    BoldItalic,
+}
+
+public static class FontKindExtensions
+{
+    internal static string AsFileName(this FontKind kind)
+    {
+        return kind switch
+        {
+            FontKind.Regular => "Regular",
+            FontKind.Bold => "Bold",
+            FontKind.Italic => "Italic",
+            FontKind.BoldItalic => "BoldItalic",
+            _ => throw new ArgumentOutOfRangeException(nameof(kind), kind, null),
+        };
+    }
+
+    internal static bool IsBold(this FontKind kind)
+    {
+        return kind is FontKind.Bold or FontKind.BoldItalic;
+    }
+
+    internal static bool IsItalic(this FontKind kind)
+    {
+        return kind is FontKind.Italic or FontKind.BoldItalic;
+    }
+
+    internal static FontKind SimplifyCompound(this FontKind kind)
+    {
+        return kind switch
+        {
+            FontKind.BoldItalic => FontKind.Bold,
+            _ => kind,
+        };
+    }
+
+
+    internal static FontKind RegularOr(this FontKind kind, FontKind other)
+    {
+        return kind switch
+        {
+            FontKind.Regular => FontKind.Regular,
+            _ => other,
+        };
+    }
+}
+
diff --git a/Content.Client/Stylesheets/Fonts/NotoFontFamilyStack.cs b/Content.Client/Stylesheets/Fonts/NotoFontFamilyStack.cs
new file mode 100644
index 0000000000..9239e5d1a1
--- /dev/null
+++ b/Content.Client/Stylesheets/Fonts/NotoFontFamilyStack.cs
@@ -0,0 +1,90 @@
+using Content.Client.Resources;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+
+namespace Content.Client.Stylesheets.Fonts;
+
+/// <summary>
+///     This class should have a base type. The whole font system is currently kind of bad and completely temporary.
+///     This class is just here because it does sort of work.
+///     TODO: fix (once engine support is added for font properties?)
+/// </summary>
+/// <param name="resCache"></param>
+/// <param name="variant"></param>
+[PublicAPI]
+public sealed class NotoFontFamilyStack(IResourceCache resCache, string variant = "")
+{
+    /// <summary>
+    ///     The primary font path, with string substitution markers.
+    /// </summary>
+    /// <remarks>
+    ///     If using the default GetFontPaths function, the substitutions are as follows:
+    ///     0 is the font kind.
+    ///     1 is the font kind with BoldItalic replaced with Bold when it occurs.
+    /// </remarks>
+    private string _fontPrimary = $"/Fonts/NotoSans{variant}/NotoSans{variant}-{{0}}.ttf";
+
+    /// <summary>
+    ///     The symbols font path, with string substitution markers.
+    /// </summary>
+    /// <remarks>
+    ///     If using the default GetFontPaths function, the substitutions are as follows:
+    ///     0 is the font kind.
+    ///     1 is the font kind with BoldItalic replaced with Bold when it occurs.
+    /// </remarks>
+    private string _fontSymbols = "/Fonts/NotoSans/NotoSansSymbols-{2}.ttf";
+
+    /// <summary>
+    ///     The fallback font path, exactly. (no string substitutions.)
+    /// </summary>
+    private string[] _extras = new[] { "/Fonts/NotoSans/NotoSansSymbols2-Regular.ttf" };
+
+    public HashSet<FontKind> AvailableKinds = [FontKind.Regular, FontKind.Bold, FontKind.Italic, FontKind.BoldItalic];
+
+    /// <summary>
+    ///     This should return the paths of every font in this stack given the abstract members.
+    /// </summary>
+    /// <param name="kind">Which font kind to use.</param>
+    /// <returns>An array of </returns>
+    private string[] GetFontPaths(FontKind kind)
+    {
+        if (!AvailableKinds.Contains(kind))
+        {
+            if (kind == FontKind.BoldItalic && AvailableKinds.Contains(FontKind.Bold))
+            {
+                kind = FontKind.Bold;
+            }
+            else
+            {
+                kind = FontKind.Regular;
+            }
+        }
+
+        var simpleKindStr = kind.SimplifyCompound().AsFileName();
+        var boldOrRegularStr = kind.RegularOr(FontKind.Bold).AsFileName();
+
+        var kindStr = kind.AsFileName();
+        var fontList = new List<string>()
+        {
+            string.Format(_fontPrimary, kindStr, simpleKindStr, boldOrRegularStr),
+            string.Format(_fontSymbols, kindStr, simpleKindStr, boldOrRegularStr),
+        };
+        fontList.AddRange(_extras);
+        return fontList.ToArray();
+    }
+
+    /// <summary>
+    ///     Retrieves an in-style font, of the provided size and kind.
+    /// </summary>
+    /// <param name="size">Size of the font to provide.</param>
+    /// <param name="kind">Optional font kind. Defaults to Regular.</param>
+    /// <returns>A Font resource.</returns>
+    public Font GetFont(int size, FontKind kind = FontKind.Regular)
+    {
+        //ALDebugTools.AssertContains(AvailableKinds, kind);
+        var paths = GetFontPaths(kind);
+
+        return resCache.GetFont(paths, size);
+    }
+}
diff --git a/Content.Client/Stylesheets/ISheetletConfig.cs b/Content.Client/Stylesheets/ISheetletConfig.cs
new file mode 100644
index 0000000000..277006c6f8
--- /dev/null
+++ b/Content.Client/Stylesheets/ISheetletConfig.cs
@@ -0,0 +1,6 @@
+namespace Content.Client.Stylesheets;
+
+public interface ISheetletConfig : IStyleResources
+{
+    // For access.
+}
diff --git a/Content.Client/Stylesheets/IStyleResources.cs b/Content.Client/Stylesheets/IStyleResources.cs
new file mode 100644
index 0000000000..ed842ace81
--- /dev/null
+++ b/Content.Client/Stylesheets/IStyleResources.cs
@@ -0,0 +1,84 @@
+using System.Diagnostics.CodeAnalysis;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets;
+
+public interface IStyleResources
+{
+    /// <summary>
+    ///     The file roots of the stylesheet, dictates where assets get read from for the given type of resource.
+    ///     Roots will be checked in order for assets, avoid having a significant number of them.
+    /// </summary>
+    /// <remarks>
+    ///     Must be a constant, changes to this after construction will not be reflected.
+    /// </remarks>
+    Dictionary<Type, ResPath[]> Roots { get; }
+
+    /// <summary>
+    ///     Attempts to locate a resource within the stylesheet's roots.
+    /// </summary>
+    /// <param name="target">The relative path of the target resource.</param>
+    /// <param name="resource">The discovered/cached resource, if any.</param>
+    /// <typeparam name="T">Type of the resource to read.</typeparam>
+    /// <returns>Whether <paramref name="resource"/> is null.</returns>
+    bool TryGetResource<T>(ResPath target, [NotNullWhen(true)] out T? resource)
+        where T : BaseResource, new();
+
+    /// <summary>
+    ///     Retrieves a resource, or throws.
+    /// </summary>
+    /// <param name="target">The relative path of the target resource.</param>
+    /// <typeparam name="T">Type of the resource to read.</typeparam>
+    /// <returns>The retrieved resource</returns>
+    /// <exception cref="MissingStyleResourceException">Thrown if the resource does not exist within the stylesheet's roots.</exception>
+    T GetResource<T>(ResPath target)
+        where T : BaseResource, new();
+
+    /// <summary>
+    ///     Retrieves a resource, or falls back to the specified root. The resource should be present at the fallback
+    ///     root, or else it throws
+    /// </summary>
+    /// <remarks>
+    ///     This should be used to allow common sheetlets to be generic over multiple stylesheets without forcing other
+    ///     styles to have the resource present, if your sheetlet is stylesheet-specific you should not use this.
+    /// </remarks>
+    /// <param name="target">The relative path of the target resource.</param>
+    /// <param name="fallbackRoot">The root that this resource will always exist at</param>
+    /// <typeparam name="T">Type of the resource to read.</typeparam>
+    /// <returns>The retrieved resource</returns>
+    /// <exception cref="ExpectedResourceException">Thrown if the resource does not exist in the fallback root.</exception>
+    T GetResourceOr<T>(ResPath target, ResPath fallbackRoot)
+        where T : BaseResource, new();
+
+    /// <summary>
+    ///     Attempts to locate a texture within the stylesheet's roots.
+    /// </summary>
+    /// <param name="target">The relative path of the target resource.</param>
+    /// <param name="texture">The retrieved texture, if any.</param>
+    /// <returns>Whether <paramref name="texture"/> is null.</returns>
+    bool TryGetTexture(ResPath target, [NotNullWhen(true)] out Texture? texture);
+
+    /// <summary>
+    ///     Retrieves a texture, or throws.
+    /// </summary>
+    /// <param name="target">The relative path of the target texture.</param>
+    /// <returns>The retrieved texture</returns>
+    /// <exception cref="MissingStyleResourceException">Thrown if the texture does not exist within the stylesheet's roots.</exception>
+    Texture GetTexture(ResPath target);
+
+    /// <summary>
+    ///     Retrieves a texture, or falls back to the specified root. The resource should be present at the fallback
+    ///     root, or else it throws
+    /// </summary>
+    /// <remarks>
+    ///     This should be used to allow common sheetlets to be generic over multiple stylesheets without forcing other
+    ///     styles to have the resource present, if your sheetlet is stylesheet-specific you should not use this.
+    /// </remarks>
+    /// <param name="target">The relative path of the target texture.</param>
+    /// <param name="fallbackRoot">The root that this resource will always exist at</param>
+    /// <returns>The retrieved texture</returns>
+    /// <exception cref="ExpectedResourceException">Thrown if the texture does not exist in the fallback root.</exception>
+    Texture GetTextureOr(ResPath target, ResPath fallbackRoot);
+}
diff --git a/Content.Client/Stylesheets/IStylesheetManager.cs b/Content.Client/Stylesheets/IStylesheetManager.cs
index 134c7fd3be..2fa795a9de 100644
--- a/Content.Client/Stylesheets/IStylesheetManager.cs
+++ b/Content.Client/Stylesheets/IStylesheetManager.cs
@@ -1,12 +1,32 @@
+using System.Diagnostics.CodeAnalysis;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Stylesheets
-{
-    public interface IStylesheetManager
-    {
-        Stylesheet SheetNano { get; }
-        Stylesheet SheetSpace { get; }
+namespace Content.Client.Stylesheets;
 
-        void Initialize();
-    }
+public interface IStylesheetManager
+{
+    /// Nanotrasen styles: the default style! Use this for most UIs
+    Stylesheet SheetNanotrasen { get; }
+
+    ///
+    /// System styles: use this for any admin / debug menus, and any odds and ends (like the changelog for some reason)
+    ///
+    Stylesheet SheetSystem { get; }
+
+
+    [Obsolete("Update to use SheetNanotrasen instead")]
+    Stylesheet SheetNano { get; }
+
+    [Obsolete("Update to use SheetSystem instead")]
+    Stylesheet SheetSpace { get; }
+
+    /// get a stylesheet by name
+    public bool TryGetStylesheet(string name, [MaybeNullWhen(false)]  out Stylesheet stylesheet);
+
+    void Initialize();
+
+    ///
+    /// Sheetlets marked with CommonSheetlet that have not satisfied the type constraints of any stylesheet
+    ///
+    public HashSet<Type> UnusedSheetlets { get; }
 }
diff --git a/Content.Client/Stylesheets/NTSheetlets/NanoHeadingSheetlet.cs b/Content.Client/Stylesheets/NTSheetlets/NanoHeadingSheetlet.cs
new file mode 100644
index 0000000000..fb6d37ac0d
--- /dev/null
+++ b/Content.Client/Stylesheets/NTSheetlets/NanoHeadingSheetlet.cs
@@ -0,0 +1,36 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.NTSheetlets;
+
+/// Not NTHeading because NanoHeading is the name of the element
+[CommonSheetlet]
+public sealed class NanoHeadingSheetlet : Sheetlet<NanotrasenStylesheet>
+{
+    public override StyleRule[] GetRules(NanotrasenStylesheet sheet, object config)
+    {
+        INanoHeadingConfig nanoHeadingCfg = sheet;
+
+        var nanoHeadingTex = sheet.GetTexture(nanoHeadingCfg.NanoHeadingPath);
+        var nanoHeadingBox = new StyleBoxTexture
+        {
+            Texture = nanoHeadingTex,
+            PatchMarginRight = 10,
+            PatchMarginTop = 10,
+            ContentMarginTopOverride = 2,
+            ContentMarginLeftOverride = 10,
+            PaddingTop = 4,
+        };
+        nanoHeadingBox.SetPatchMargin(StyleBox.Margin.Left | StyleBox.Margin.Bottom, 2);
+
+        return
+        [
+            E<NanoHeading>().ParentOf(E<PanelContainer>()).Panel(nanoHeadingBox),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Palette/ColorPalette.cs b/Content.Client/Stylesheets/Palette/ColorPalette.cs
new file mode 100644
index 0000000000..89405e6cb4
--- /dev/null
+++ b/Content.Client/Stylesheets/Palette/ColorPalette.cs
@@ -0,0 +1,81 @@
+using Content.Client.Stylesheets.Colorspace;
+
+// ReSharper disable MemberCanBePrivate.Global
+
+namespace Content.Client.Stylesheets.Palette;
+
+/// <remarks>
+///     Don't be afraid to add a lot of fields here! This class is made for readability.
+/// </remarks>
+public record ColorPalette(
+    Color Base,
+
+    float LightnessShift,
+    float ChromaShift,
+
+    Color Element,
+    Color HoveredElement,
+    Color PressedElement,
+    Color DisabledElement,
+
+    Color Background,
+    Color BackgroundLight,
+    Color BackgroundDark,
+
+    Color Text,
+    Color TextDark
+)
+{
+    /// <summary>
+    /// Helper method for generating a ColorPalette from a specified base hex string, with the
+    /// option to override specific parts of the palette
+    /// </summary>
+    public static ColorPalette FromHexBase(
+        string hex,
+        float lightnessShift = 0.06f,
+        float chromaShift = 0.00f,
+        Color? element = null,
+        Color? background = null,
+        Color? text = null
+    )
+    {
+        var @base = Color.FromHex(hex);
+
+        element ??= Shift(@base, lightnessShift, chromaShift, -1); //                        Shift(@base, -1)
+        var hoveredElement = Shift(element.Value, lightnessShift, chromaShift, 1); //        Shift(@base,  0)
+        var pressedElement = Shift(element.Value, lightnessShift, chromaShift, -1); //       Shift(@base, -2)
+        var disabledElement = Shift(element.Value, lightnessShift, chromaShift, -2) //       Shift(@base, -3)
+            .NudgeChroma(-chromaShift * 2);
+
+        background ??= Shift(@base, lightnessShift, chromaShift, -3); //                     Shift(@base, -3)
+        var backgroundLight = Shift(background.Value, lightnessShift, chromaShift, 1); //    Shift(@base, -2)
+        var backgroundDark = Shift(background.Value, lightnessShift, chromaShift, -1); //    Shift(@base, -4)
+
+        text ??= @base; //                                                                   Shift(@base,  0)
+        var textDark = Shift(text.Value, lightnessShift, chromaShift, -1); //                Shift(@base, -1)
+
+        return new ColorPalette(
+            Base: @base,
+
+            LightnessShift: lightnessShift,
+            ChromaShift: chromaShift,
+
+            Element: element.Value,
+            HoveredElement: hoveredElement,
+            PressedElement: pressedElement,
+            DisabledElement: disabledElement,
+
+            Background: background.Value,
+            BackgroundLight: backgroundLight,
+            BackgroundDark: backgroundDark,
+
+            Text: text.Value,
+            TextDark: textDark
+        );
+    }
+
+    private static Color Shift(Color from, float lightnessShift, float chromaShift, float factor)
+    {
+        return from.NudgeLightness(lightnessShift * factor).NudgeChroma(chromaShift * factor);
+    }
+}
diff --git a/Content.Client/Stylesheets/Palette/Palettes.cs b/Content.Client/Stylesheets/Palette/Palettes.cs
new file mode 100644
index 0000000000..aab61ac69a
--- /dev/null
+++ b/Content.Client/Stylesheets/Palette/Palettes.cs
@@ -0,0 +1,30 @@
+namespace Content.Client.Stylesheets.Palette;
+
+/// <summary>
+///     Stores all style palettes in one accessible location
+/// </summary>
+/// <remarks>
+///     Technically not limited to only colors, can store like, standard padding amounts, and font sizes, maybe?
+/// </remarks>
+public static class Palettes
+{
+    // muted tones
+    public static readonly ColorPalette Navy = ColorPalette.FromHexBase("#4f5376", lightnessShift: 0.05f, chromaShift: 0.0045f);
+    public static readonly ColorPalette Cyan = ColorPalette.FromHexBase("#42586a", lightnessShift: 0.05f, chromaShift: 0.0045f);
+    public static readonly ColorPalette Slate = ColorPalette.FromHexBase("#545562");
+    public static readonly ColorPalette Neutral = ColorPalette.FromHexBase("#555555");
+
+    // status tones
+    public static readonly ColorPalette Red = ColorPalette.FromHexBase("#b62124", chromaShift: 0.02f);
+    public static readonly ColorPalette Amber = ColorPalette.FromHexBase("#c18e36");
+    public static readonly ColorPalette Green = ColorPalette.FromHexBase("#3c854a");
+    public static readonly StatusPalette Status = new([Red.Base, Amber.Base, Green.Base]);
+
+    // highlight tones
+    public static readonly ColorPalette Gold = ColorPalette.FromHexBase("#a88b5e");
+    public static readonly ColorPalette Maroon = ColorPalette.FromHexBase("#9b2236");
+
+    // Intended to be used with `ModulateSelf` to darken / lighten something
+    public static readonly ColorPalette AlphaModulate = ColorPalette.FromHexBase("#ffffff");
+
+}
diff --git a/Content.Client/Stylesheets/Palette/StatusPalette.cs b/Content.Client/Stylesheets/Palette/StatusPalette.cs
new file mode 100644
index 0000000000..f2b19cf8c2
--- /dev/null
+++ b/Content.Client/Stylesheets/Palette/StatusPalette.cs
@@ -0,0 +1,57 @@
+using Content.Client.Stylesheets.Colorspace;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.Palette;
+
+public sealed class StatusPalette
+{
+    /// The status colors to blend between, these are equally spaced from 0 to 1 with 0 being StatusColors[0], and 1 being
+    /// StatusColors.Last()
+    ///
+    /// Traditionally, something like { Red, Yellow, Green }
+    public readonly Color[] StatusColors;
+
+    /// <code>StatusPalette.GetStatusColor(1.0f)</code>
+    public readonly Color Good;
+    /// <code>StatusPalette.GetStatusColor(0.75f)</code>
+    public readonly Color Okay;
+    /// <code>StatusPalette.GetStatusColor(0.5f)</code>
+    public readonly Color Warning;
+    /// <code>StatusPalette.GetStatusColor(0.25f)</code>
+    public readonly Color Bad;
+    /// <code>StatusPalette.GetStatusColor(0.0f)</code>
+    public readonly Color Critical;
+
+    public StatusPalette(Color[] statusColors)
+    {
+        StatusColors = statusColors;
+        Good = GetStatusColor(1.0f);
+        Okay = GetStatusColor(0.75f);
+        Warning = GetStatusColor(0.5f);
+        Bad = GetStatusColor(0.25f);
+        Critical = GetStatusColor(0.0f);
+    }
+
+    /// <param name="factor">The severity of this status from 0 to 1. Traditionally, 1 will be green and 0 red</param>
+    /// <returns>The color for this status, linearly Oklab blended between equal intervals of the colors in StatusColor</returns>
+    public Color GetStatusColor(float factor)
+    {
+        DebugTools.Assert(factor >= 0.0 && factor <= 1.0);
+        DebugTools.Assert(StatusColors.Length >= 1);
+
+        if (StatusColors.Length == 1)
+            return StatusColors[0];
+
+        var intervals = StatusColors.Length - 1;
+
+        var fromIdx = (int) Math.Floor(factor * intervals);
+        if (factor is 1.0f or 0.0f)
+            return StatusColors[fromIdx];
+
+        var from = StatusColors[fromIdx];
+        var to = StatusColors[fromIdx + 1];
+        var f = (factor - (float) fromIdx / intervals) * intervals;
+
+        return from.OkBlend(to, f);
+    }
+}
diff --git a/Content.Client/Stylesheets/PalettedStylesheet.Palettes.cs b/Content.Client/Stylesheets/PalettedStylesheet.Palettes.cs
new file mode 100644
index 0000000000..e8fe7174f4
--- /dev/null
+++ b/Content.Client/Stylesheets/PalettedStylesheet.Palettes.cs
@@ -0,0 +1,12 @@
+using Content.Client.Stylesheets.Palette;
+
+namespace Content.Client.Stylesheets;
+
+public abstract partial class PalettedStylesheet
+{
+    public abstract ColorPalette PrimaryPalette { get; }
+    public abstract ColorPalette SecondaryPalette { get; }
+    public abstract ColorPalette PositivePalette { get; }
+    public abstract ColorPalette NegativePalette { get; }
+    public abstract ColorPalette HighlightPalette { get; }
+}
diff --git a/Content.Client/Stylesheets/PalettedStylesheet.cs b/Content.Client/Stylesheets/PalettedStylesheet.cs
new file mode 100644
index 0000000000..682a50c228
--- /dev/null
+++ b/Content.Client/Stylesheets/PalettedStylesheet.cs
@@ -0,0 +1,14 @@
+using JetBrains.Annotations;
+
+namespace Content.Client.Stylesheets;
+
+/// <summary>
+///     The base class for all stylesheets, providing core functionality and helpers.
+/// </summary>
+[PublicAPI]
+public abstract partial class PalettedStylesheet : BaseStylesheet
+{
+    protected PalettedStylesheet(object config) : base(config)
+    {
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlet.cs b/Content.Client/Stylesheets/Sheetlet.cs
new file mode 100644
index 0000000000..7f55b5a7c3
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlet.cs
@@ -0,0 +1,16 @@
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Stylesheets;
+
+public abstract class Sheetlet<T>
+{
+    [Dependency] protected readonly IResourceCache ResCache = default!;
+
+    protected Sheetlet()
+    {
+        IoCManager.InjectDependencies(this);
+    }
+
+    public abstract StyleRule[] GetRules(T sheet, object config);
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/IButtonConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/IButtonConfig.cs
new file mode 100644
index 0000000000..3dc8f07ef8
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/IButtonConfig.cs
@@ -0,0 +1,19 @@
+using Content.Client.Stylesheets.Palette;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface IButtonConfig : ISheetletConfig
+{
+    public ResPath BaseButtonPath { get; }
+    public ResPath OpenLeftButtonPath { get; }
+    public ResPath OpenRightButtonPath { get; }
+    public ResPath OpenBothButtonPath { get; }
+    public ResPath SmallButtonPath { get; }
+    public ResPath RoundedButtonPath { get; }
+    public ResPath RoundedButtonBorderedPath { get; }
+
+    public ColorPalette ButtonPalette { get; }
+    public ColorPalette PositiveButtonPalette { get; }
+    public ColorPalette NegativeButtonPalette { get; }
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/ICheckboxConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/ICheckboxConfig.cs
new file mode 100644
index 0000000000..1f3e54c0ad
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/ICheckboxConfig.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface ICheckboxConfig
+{
+    public ResPath CheckboxUncheckedPath { get; }
+    public ResPath CheckboxCheckedPath { get; }
+}
+
diff --git a/Content.Client/Stylesheets/SheetletConfigs/IIconConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/IIconConfig.cs
new file mode 100644
index 0000000000..837e5f88d4
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/IIconConfig.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface IIconConfig : ISheetletConfig
+{
+    public ResPath HelpIconPath { get; }
+    public ResPath CrossIconPath { get; }
+    public ResPath RefreshIconPath { get; }
+    public ResPath InvertedTriangleIconPath { get; }
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/ILineEditConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/ILineEditConfig.cs
new file mode 100644
index 0000000000..10540911e0
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/ILineEditConfig.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface ILineEditConfig : ISheetletConfig
+{
+    public ResPath LineEditPath { get; }
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/INanoHeadingConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/INanoHeadingConfig.cs
new file mode 100644
index 0000000000..4804c1ad97
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/INanoHeadingConfig.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface INanoHeadingConfig : ISheetletConfig
+{
+    public ResPath NanoHeadingPath { get;  }
+}
+
diff --git a/Content.Client/Stylesheets/SheetletConfigs/IPanelConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/IPanelConfig.cs
new file mode 100644
index 0000000000..6e12a75ed2
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/IPanelConfig.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface IPanelConfig : ISheetletConfig
+{
+    public ResPath GeometricPanelBorderPath { get; }
+    public ResPath BlackPanelDarkThinBorderPath { get; }
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/IPlaceholderConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/IPlaceholderConfig.cs
new file mode 100644
index 0000000000..81dd6e3dac
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/IPlaceholderConfig.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface IPlaceholderConfig : ISheetletConfig
+{
+    public ResPath PlaceholderPath { get; }
+}
+
diff --git a/Content.Client/Stylesheets/SheetletConfigs/IRadialMenuConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/IRadialMenuConfig.cs
new file mode 100644
index 0000000000..6cd142daf6
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/IRadialMenuConfig.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface IRadialMenuConfig : ISheetletConfig
+{
+    public ResPath ButtonNormalPath { get; }
+    public ResPath ButtonHoverPath { get; }
+    public ResPath CloseNormalPath { get; }
+    public ResPath CloseHoverPath { get; }
+    public ResPath BackNormalPath { get; }
+    public ResPath BackHoverPath { get; }
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/ISliderConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/ISliderConfig.cs
new file mode 100644
index 0000000000..037fb4ee20
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/ISliderConfig.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface ISliderConfig : ISheetletConfig
+{
+    public ResPath SliderFillPath { get; }
+    public ResPath SliderOutlinePath { get; }
+    public ResPath SliderGrabber { get; }
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/IStripebackConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/IStripebackConfig.cs
new file mode 100644
index 0000000000..90b3daf5ae
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/IStripebackConfig.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface IStripebackConfig : ISheetletConfig
+{
+    public ResPath StripebackPath { get; }
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/ITabContainerConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/ITabContainerConfig.cs
new file mode 100644
index 0000000000..bfd33d9009
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/ITabContainerConfig.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface ITabContainerConfig : ISheetletConfig
+{
+    public ResPath TabContainerPanelPath { get; }
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/ITooltipConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/ITooltipConfig.cs
new file mode 100644
index 0000000000..eef4e7fc25
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/ITooltipConfig.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface ITooltipConfig : ISheetletConfig
+{
+    public ResPath TooltipBoxPath { get; }
+    public ResPath WhisperBoxPath { get; }
+}
diff --git a/Content.Client/Stylesheets/SheetletConfigs/IWindowConfig.cs b/Content.Client/Stylesheets/SheetletConfigs/IWindowConfig.cs
new file mode 100644
index 0000000000..669d2ce0a3
--- /dev/null
+++ b/Content.Client/Stylesheets/SheetletConfigs/IWindowConfig.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Utility;
+
+namespace Content.Client.Stylesheets.SheetletConfigs;
+
+public interface IWindowConfig : ISheetletConfig
+{
+    public ResPath WindowHeaderTexturePath { get; }
+    public ResPath WindowHeaderAlertTexturePath { get; }
+    public ResPath WindowBackgroundPath { get; }
+    public ResPath WindowBackgroundBorderedPath { get; }
+    public ResPath TransparentWindowBackgroundBorderedPath { get; }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/ButtonSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/ButtonSheetlet.cs
new file mode 100644
index 0000000000..51ba206392
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/ButtonSheetlet.cs
@@ -0,0 +1,180 @@
+using System.Numerics;
+using Content.Client.Stylesheets.Palette;
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class ButtonSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, IButtonConfig, IIconConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IButtonConfig buttonCfg = sheet;
+        IIconConfig iconCfg = sheet;
+
+        var crossTex = sheet.GetTextureOr(iconCfg.CrossIconPath, NanotrasenStylesheet.TextureRoot);
+        var refreshTex = sheet.GetTextureOr(iconCfg.RefreshIconPath, NanotrasenStylesheet.TextureRoot);
+
+        var rules = new List<StyleRule>
+        {
+            // Set textures for the kinds of buttons
+            CButton()
+                .Box(StyleBoxHelpers.BaseStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonOpenLeft)
+                .Box(StyleBoxHelpers.OpenLeftStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonOpenRight)
+                .Box(StyleBoxHelpers.OpenRightStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonOpenBoth)
+                .Box(StyleBoxHelpers.SquareStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonSquare)
+                .Box(StyleBoxHelpers.SquareStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonSmall)
+                .Box(StyleBoxHelpers.SmallStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonSmall)
+                .ParentOf(E<Label>())
+                .Font(sheet.BaseFont.GetFont(8)),
+            CButton().Class(StyleClass.ButtonBig).ParentOf(E<Label>()).Font(sheet.BaseFont.GetFont(16)),
+
+            // Cross Button (Red)
+            E<TextureButton>()
+                .Class(StyleClass.CrossButtonRed)
+                .Prop(TextureButton.StylePropertyTexture, crossTex),
+
+            // Refresh Button
+            E<TextureButton>()
+                .Class(StyleClass.RefreshButton)
+                .Prop(TextureButton.StylePropertyTexture, refreshTex),
+
+            // Ensure labels in buttons are aligned.
+            E<Label>()
+                // ReSharper disable once AccessToStaticMemberViaDerivedType
+                .Class(Button.StyleClassButton)
+                .AlignMode(Label.AlignMode.Center),
+
+            // Have disabled button's text be faded
+            CButton().PseudoDisabled().ParentOf(E<Label>()).FontColor(Color.FromHex("#E5E5E581")),
+            CButton().PseudoDisabled().ParentOf(E()).ParentOf(E<Label>()).FontColor(Color.FromHex("#E5E5E581")),
+        };
+        // Texture button modulation
+        MakeButtonRules<TextureButton>(rules, Palettes.AlphaModulate, null);
+        MakeButtonRules<TextureButton>(rules, sheet.NegativePalette, StyleClass.CrossButtonRed);
+
+        MakeButtonRules(rules, buttonCfg.ButtonPalette, null);
+        MakeButtonRules(rules, buttonCfg.PositiveButtonPalette, StyleClass.Positive);
+        MakeButtonRules(rules, buttonCfg.NegativeButtonPalette, StyleClass.Negative);
+
+        return rules.ToArray();
+    }
+
+    public static void MakeButtonRules<TC>(
+        List<StyleRule> rules,
+        ColorPalette palette,
+        string? styleclass)
+        where TC : Control
+    {
+        rules.AddRange([
+            E<TC>().MaybeClass(styleclass).PseudoNormal().Modulate(palette.Element),
+            E<TC>().MaybeClass(styleclass).PseudoHovered().Modulate(palette.HoveredElement),
+            E<TC>().MaybeClass(styleclass).PseudoPressed().Modulate(palette.PressedElement),
+            E<TC>().MaybeClass(styleclass).PseudoDisabled().Modulate(palette.DisabledElement),
+        ]);
+    }
+
+    public static void MakeButtonRules(
+        List<StyleRule> rules,
+        ColorPalette palette,
+        string? styleclass)
+    {
+        rules.AddRange([
+            E().MaybeClass(styleclass).PseudoNormal().Prop(Control.StylePropertyModulateSelf, palette.Element),
+            E().MaybeClass(styleclass).PseudoHovered().Prop(Control.StylePropertyModulateSelf, palette.HoveredElement),
+            E().MaybeClass(styleclass).PseudoPressed().Prop(Control.StylePropertyModulateSelf, palette.PressedElement),
+            E()
+                .MaybeClass(styleclass)
+                .PseudoDisabled()
+                .Prop(Control.StylePropertyModulateSelf, palette.DisabledElement),
+        ]);
+    }
+
+    private static MutableSelectorElement CButton()
+    {
+        return E<ContainerButton>().Class(ContainerButton.StyleClassButton);
+    }
+}
+
+// this is currently the only other "helper" type class, if any more crop up consider making a specific directory for them
+public static class StyleBoxHelpers
+{
+    // TODO: Figure out a nicer way to store/represent these hardcoded margins. This is icky.
+    public static StyleBoxTexture BaseStyleBox<T>(T sheet) where T : PalettedStylesheet, IButtonConfig
+    {
+        var baseBox = new StyleBoxTexture
+        {
+            Texture = sheet.GetTextureOr(sheet.BaseButtonPath, NanotrasenStylesheet.TextureRoot),
+        };
+        baseBox.SetPatchMargin(StyleBox.Margin.All, 10);
+        baseBox.SetPadding(StyleBox.Margin.All, 1);
+        baseBox.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
+        baseBox.SetContentMarginOverride(StyleBox.Margin.Horizontal, 14);
+        return baseBox;
+    }
+
+    public static StyleBoxTexture OpenLeftStyleBox<T>(T sheet) where T : PalettedStylesheet, IButtonConfig
+    {
+        var openLeftBox = new StyleBoxTexture(BaseStyleBox(sheet))
+        {
+            Texture = new AtlasTexture(sheet.GetTextureOr(sheet.OpenLeftButtonPath, NanotrasenStylesheet.TextureRoot),
+                UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(14, 24))),
+        };
+        openLeftBox.SetPatchMargin(StyleBox.Margin.Left, 0);
+        openLeftBox.SetContentMarginOverride(StyleBox.Margin.Left, 8);
+        // openLeftBox.SetPadding(StyleBox.Margin.Left, 1);
+        return openLeftBox;
+    }
+
+    public static StyleBoxTexture OpenRightStyleBox<T>(T sheet) where T : PalettedStylesheet, IButtonConfig
+    {
+        var openRightBox = new StyleBoxTexture(BaseStyleBox(sheet))
+        {
+            Texture = new AtlasTexture(sheet.GetTextureOr(sheet.OpenRightButtonPath, NanotrasenStylesheet.TextureRoot),
+                UIBox2.FromDimensions(new Vector2(0, 0), new Vector2(14, 24))),
+        };
+        openRightBox.SetPatchMargin(StyleBox.Margin.Right, 0);
+        openRightBox.SetContentMarginOverride(StyleBox.Margin.Right, 8);
+        openRightBox.SetPadding(StyleBox.Margin.Right, 1);
+        return openRightBox;
+    }
+
+    public static StyleBoxTexture SquareStyleBox<T>(T sheet) where T : PalettedStylesheet, IButtonConfig
+    {
+        var openBothBox = new StyleBoxTexture(BaseStyleBox(sheet))
+        {
+            Texture = new AtlasTexture(sheet.GetTextureOr(sheet.OpenBothButtonPath, NanotrasenStylesheet.TextureRoot),
+                UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(3, 24))),
+        };
+        openBothBox.SetPatchMargin(StyleBox.Margin.Horizontal, 0);
+        openBothBox.SetContentMarginOverride(StyleBox.Margin.Horizontal, 8);
+        openBothBox.SetPadding(StyleBox.Margin.Horizontal, 1);
+        return openBothBox;
+    }
+
+    public static StyleBoxTexture SmallStyleBox<T>(T sheet) where T : PalettedStylesheet, IButtonConfig
+    {
+        var smallBox = new StyleBoxTexture
+        {
+            Texture = sheet.GetTextureOr(sheet.SmallButtonPath, NanotrasenStylesheet.TextureRoot),
+        };
+        return smallBox;
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/CheckboxSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/CheckboxSheetlet.cs
new file mode 100644
index 0000000000..67ad4b293f
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/CheckboxSheetlet.cs
@@ -0,0 +1,33 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class CheckboxSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, ICheckboxConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        ICheckboxConfig checkboxCfg = sheet;
+
+        var uncheckedTex = sheet.GetTextureOr(checkboxCfg.CheckboxUncheckedPath, NanotrasenStylesheet.TextureRoot);
+        var checkedTex = sheet.GetTextureOr(checkboxCfg.CheckboxCheckedPath, NanotrasenStylesheet.TextureRoot);
+
+        return
+        [
+            E<TextureRect>()
+                .Class(CheckBox.StyleClassCheckBox)
+                .Prop(TextureRect.StylePropertyTexture, uncheckedTex),
+            E<TextureRect>()
+                .Class(CheckBox.StyleClassCheckBox)
+                .Class(CheckBox.StyleClassCheckBoxChecked)
+                .Prop(TextureRect.StylePropertyTexture, checkedTex),
+            E<BoxContainer>()
+                .Class(CheckBox.StyleClassCheckBox)
+                .Prop(BoxContainer.StylePropertySeparation, 10),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/ConfirmButtonSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/ConfirmButtonSheetlet.cs
new file mode 100644
index 0000000000..45f85210bf
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/ConfirmButtonSheetlet.cs
@@ -0,0 +1,32 @@
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Stylesheets;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.UserInterface.Controls;
+
+[CommonSheetlet]
+public sealed class ConfirmButtonSheetlet : Sheetlet<NanotrasenStylesheet>
+{
+    public override StyleRule[] GetRules(NanotrasenStylesheet sheet, object config)
+    {
+        return [
+            E<ConfirmButton>()
+                .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassNormal)
+                .Prop(Control.StylePropertyModulateSelf, sheet.NegativePalette.Element),
+
+            E<ConfirmButton>()
+                .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassHover)
+                .Prop(Control.StylePropertyModulateSelf, sheet.NegativePalette.HoveredElement),
+
+            E<ConfirmButton>()
+                .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassPressed)
+                .Prop(Control.StylePropertyModulateSelf, sheet.NegativePalette.PressedElement),
+
+            E<ConfirmButton>()
+                .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassDisabled)
+                .Prop(Control.StylePropertyModulateSelf, sheet.NegativePalette.DisabledElement),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/DividersSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/DividersSheetlet.cs
new file mode 100644
index 0000000000..41226c7100
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/DividersSheetlet.cs
@@ -0,0 +1,34 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class DividersSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        var boxHighDivider = new StyleBoxFlat
+        {
+            BackgroundColor = sheet.HighlightPalette.Base,
+            ContentMarginBottomOverride = 2,
+            ContentMarginLeftOverride = 2,
+        };
+
+        var boxLowDivider = new StyleBoxFlat(sheet.SecondaryPalette.TextDark);
+
+        // high divider and low divider styles are VERY inconsistent but its too much of a pain to change right now (also HighDivider has its own Control ???)
+        // i dont think theres a good resolution to this besides just deleting HighDivider. HighDivider is barely used but LowDivider is used everywhere.
+        return
+        [
+            E<PanelContainer>()
+                .Class(StyleClass.LowDivider)
+                .Panel(boxLowDivider)
+                .MinSize(new Vector2(2, 2)),
+            E<PanelContainer>().Class(StyleClass.HighDivider).Panel(boxHighDivider),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/FancyTreeSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/FancyTreeSheetlet.cs
new file mode 100644
index 0000000000..6912dc1ee0
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/FancyTreeSheetlet.cs
@@ -0,0 +1,36 @@
+using Content.Client.UserInterface.Controls.FancyTree;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class FancyTreeSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        return
+        [
+            E<ContainerButton>()
+                .Identifier(TreeItem.StyleIdentifierTreeButton)
+                .Class(TreeItem.StyleClassEvenRow)
+                .Prop(ContainerButton.StylePropertyStyleBox, new StyleBoxFlat(sheet.SecondaryPalette.BackgroundLight)),
+            E<ContainerButton>()
+                .Identifier(TreeItem.StyleIdentifierTreeButton)
+                .Class(TreeItem.StyleClassOddRow)
+                .Prop(ContainerButton.StylePropertyStyleBox, new StyleBoxFlat(sheet.SecondaryPalette.Background)),
+
+            E<ContainerButton>()
+                .Identifier(TreeItem.StyleIdentifierTreeButton)
+                .Class(TreeItem.StyleClassSelected)
+                .Prop(ContainerButton.StylePropertyStyleBox, new StyleBoxFlat(sheet.PrimaryPalette.Element)),
+
+            E<ContainerButton>()
+                .Identifier(TreeItem.StyleIdentifierTreeButton)
+                .Pseudo(ContainerButton.StylePseudoClassHover)
+                .Prop(ContainerButton.StylePropertyStyleBox, new StyleBoxFlat(sheet.PrimaryPalette.HoveredElement)),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/HLineSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/HLineSheetlet.cs
new file mode 100644
index 0000000000..bfd8ac6d1a
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/HLineSheetlet.cs
@@ -0,0 +1,26 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class HLineSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        return
+        [
+            E<HLine>()
+                .Class(StyleClass.Positive)
+                .Panel(new StyleBoxFlat(sheet.PositivePalette.Text)),
+            E<HLine>()
+                .Class(StyleClass.Highlight)
+                .Panel(new StyleBoxFlat(sheet.HighlightPalette.Text)),
+            E<HLine>()
+                .Class(StyleClass.Negative)
+                .Panel(new StyleBoxFlat(sheet.NegativePalette.Text)),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/ActionSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/ActionSheetlet.cs
new file mode 100644
index 0000000000..cc8e1d5b5a
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/ActionSheetlet.cs
@@ -0,0 +1,43 @@
+using Content.Client.Resources;
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Content.Client.UserInterface.Systems.Actions.Controls;
+using Content.Client.UserInterface.Systems.Actions.Windows;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets.Hud;
+
+[CommonSheetlet]
+public sealed class ActionSheetlet<T> : Sheetlet<T> where T: PalettedStylesheet, IPanelConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IPanelConfig panelCfg = sheet;
+
+        // TODO: absolute texture access
+        var handSlotHighlightTex = ResCache.GetTexture("/Textures/Interface/Inventory/hand_slot_highlight.png");
+        var handSlotHighlight = new StyleBoxTexture
+        {
+            Texture = handSlotHighlightTex,
+        };
+        handSlotHighlight.SetPatchMargin(StyleBox.Margin.All, 2);
+
+        var actionSearchBoxTex =
+            sheet.GetTextureOr(panelCfg.BlackPanelDarkThinBorderPath, NanotrasenStylesheet.TextureRoot);
+        var actionSearchBox = new StyleBoxTexture
+        {
+            Texture = actionSearchBoxTex,
+        };
+        actionSearchBox.SetPatchMargin(StyleBox.Margin.All, 3);
+        actionSearchBox.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
+
+        return
+        [
+            E<PanelContainer>().Class(ActionButton.StyleClassActionHighlightRect).Panel(handSlotHighlight),
+            E<LineEdit>().Class(ActionsWindow.StyleClassActionSearchBox).Box(actionSearchBox),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/ChatGameScreenSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/ChatGameScreenSheetlet.cs
new file mode 100644
index 0000000000..e93377b0fc
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/ChatGameScreenSheetlet.cs
@@ -0,0 +1,24 @@
+using Content.Client.UserInterface.Screens;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets.Hud;
+
+[CommonSheetlet]
+public sealed class ChatGameScreenSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        return
+        [
+            E()
+                .Class(SeparatedChatGameScreen.StyleClassChatContainer)
+                .Panel(new StyleBoxFlat(sheet.SecondaryPalette.Background)),
+            E<OutputPanel>()
+                .Class(SeparatedChatGameScreen.StyleClassChatOutput)
+                .Panel(new StyleBoxFlat(sheet.SecondaryPalette.BackgroundDark)),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/ChatSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/ChatSheetlet.cs
new file mode 100644
index 0000000000..ca721c5895
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/ChatSheetlet.cs
@@ -0,0 +1,51 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Content.Client.UserInterface.Systems.Chat.Controls;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets.Hud;
+
+[CommonSheetlet]
+public sealed class ChatSheetlet<T> : Sheetlet<T> where T: PalettedStylesheet, IButtonConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IButtonConfig btnCfg = sheet;
+
+        var chatColor = sheet.SecondaryPalette.Background.WithAlpha(221.0f / 255.0f);
+        var chatBg = new StyleBoxFlat(chatColor);
+
+        var chatChannelButtonTex =
+            sheet.GetTextureOr(btnCfg.RoundedButtonBorderedPath, NanotrasenStylesheet.TextureRoot);
+        var chatChannelButton = new StyleBoxTexture
+        {
+            Texture = chatChannelButtonTex,
+        };
+        chatChannelButton.SetPatchMargin(StyleBox.Margin.All, 5);
+        chatChannelButton.SetPadding(StyleBox.Margin.All, 2);
+
+        var chatFilterButtonTex =
+            sheet.GetTextureOr(btnCfg.RoundedButtonBorderedPath, NanotrasenStylesheet.TextureRoot);
+        var chatFilterButton = new StyleBoxTexture
+        {
+            Texture = chatFilterButtonTex,
+        };
+        chatFilterButton.SetPatchMargin(StyleBox.Margin.All, 5);
+        chatFilterButton.SetPadding(StyleBox.Margin.All, 2);
+
+        return
+        [
+            E<PanelContainer>()
+                .Class(ChatInputBox.StyleClassChatPanel)
+                .Panel(chatBg),
+            E<LineEdit>()
+                .Class(ChatInputBox.StyleClassChatLineEdit)
+                .Prop(LineEdit.StylePropertyStyleBox, new StyleBoxEmpty()),
+            E<Button>().Class(ChatInputBox.StyleClassChatFilterOptionButton).Box(chatChannelButton),
+            E<ContainerButton>().Class(ChatInputBox.StyleClassChatFilterOptionButton).Box(chatFilterButton),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/ContextMenuSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/ContextMenuSheetlet.cs
new file mode 100644
index 0000000000..7016896592
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/ContextMenuSheetlet.cs
@@ -0,0 +1,88 @@
+using Content.Client.ContextMenu.UI;
+using Content.Client.Resources;
+using Content.Client.Stylesheets.Fonts;
+using Content.Client.Stylesheets.Palette;
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Content.Client.Verbs.UI;
+using Content.Shared.Verbs;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets.Hud;
+
+[CommonSheetlet]
+public sealed class ContextMenuSheetlet<T> : Sheetlet<T>
+    where T : PalettedStylesheet, IWindowConfig, IButtonConfig, IIconConfig
+{
+    // TODO: make this not hardcoded (I am too scared to change the context menu colors)
+    private static readonly ColorPalette ContextButtonPalette = ColorPalette.FromHexBase("#000000") with
+    {
+        HoveredElement = Color.DarkSlateGray,
+        Element = Color.FromHex("#1119"),
+        PressedElement = Color.LightSlateGray,
+    };
+
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IWindowConfig windowCfg = sheet;
+
+        var borderedWindowBackground = new StyleBoxTexture
+        {
+            Texture = sheet.GetTextureOr(windowCfg.WindowBackgroundBorderedPath, NanotrasenStylesheet.TextureRoot),
+        };
+        borderedWindowBackground.SetPatchMargin(StyleBox.Margin.All, ContextMenuElement.ElementMargin);
+        var buttonContext = new StyleBoxTexture { Texture = Texture.White };
+        var contextMenuExpansionTexture = ResCache.GetTexture("/Textures/Interface/VerbIcons/group.svg.192dpi.png");
+        var verbMenuConfirmationTexture = ResCache.GetTexture("/Textures/Interface/VerbIcons/group.svg.192dpi.png");
+
+        var rules = new List<StyleRule>
+        {
+            // Context Menu window
+            E<PanelContainer>()
+                .Class(ContextMenuPopup.StyleClassContextMenuPopup)
+                .Panel(borderedWindowBackground),
+
+            // Context menu buttons
+            E<ContextMenuElement>()
+                .Class(ContextMenuElement.StyleClassContextMenuButton)
+                .Prop(ContainerButton.StylePropertyStyleBox, buttonContext),
+
+            // Context Menu Labels
+            E<RichTextLabel>()
+                .Class(InteractionVerb.DefaultTextStyleClass)
+                .Font(sheet.BaseFont.GetFont(12, FontKind.BoldItalic)),
+            E<RichTextLabel>()
+                .Class(ActivationVerb.DefaultTextStyleClass)
+                .Font(sheet.BaseFont.GetFont(12, FontKind.Bold)),
+            E<RichTextLabel>()
+                .Class(AlternativeVerb.DefaultTextStyleClass)
+                .Font(sheet.BaseFont.GetFont(12, FontKind.Italic)),
+            E<RichTextLabel>()
+                .Class(Verb.DefaultTextStyleClass)
+                .Font(sheet.BaseFont.GetFont(12)),
+            E<TextureRect>()
+                .Class(ContextMenuElement.StyleClassContextMenuExpansionTexture)
+                .Prop(TextureRect.StylePropertyTexture, contextMenuExpansionTexture),
+            E<TextureRect>()
+                .Class(VerbMenuElement.StyleClassVerbMenuConfirmationTexture)
+                .Prop(TextureRect.StylePropertyTexture, verbMenuConfirmationTexture),
+
+            // Context menu confirm buttons
+            E<ContextMenuElement>()
+                .Class(ConfirmationMenuElement.StyleClassConfirmationContextMenuButton)
+                .Prop(ContainerButton.StylePropertyStyleBox, buttonContext),
+        };
+
+        ButtonSheetlet<T>.MakeButtonRules<ContextMenuElement>(rules,
+            ContextButtonPalette,
+            ContextMenuElement.StyleClassContextMenuButton);
+        ButtonSheetlet<T>.MakeButtonRules<ContextMenuElement>(rules,
+            sheet.NegativePalette,
+            ConfirmationMenuElement.StyleClassConfirmationContextMenuButton);
+
+        return rules.ToArray();
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/ExamineButtonSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/ExamineButtonSheetlet.cs
new file mode 100644
index 0000000000..5ab78c701d
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/ExamineButtonSheetlet.cs
@@ -0,0 +1,46 @@
+using Content.Client.Examine;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets.Hud;
+
+[CommonSheetlet]
+public sealed class ExamineButtonSheetlet : Sheetlet<PalettedStylesheet>
+{
+    // Examine button colors
+    // TODO: FIX!!
+    private static readonly Color ExamineButtonColorContext = Color.Transparent;
+    private static readonly Color ExamineButtonColorContextHover = Color.DarkSlateGray;
+    private static readonly Color ExamineButtonColorContextPressed = Color.LightSlateGray;
+    private static readonly Color ExamineButtonColorContextDisabled = Color.FromHex("#5A5A5A");
+
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        var buttonContext = new StyleBoxTexture { Texture = Texture.White };
+
+        return
+        [
+            E<ExamineButton>()
+                .Class(ExamineButton.StyleClassExamineButton)
+                .Prop(ContainerButton.StylePropertyStyleBox, buttonContext),
+            E<ExamineButton>()
+                .Class(ExamineButton.StyleClassExamineButton)
+                .PseudoNormal()
+                .Prop(Control.StylePropertyModulateSelf, ExamineButtonColorContext),
+            E<ExamineButton>()
+                .Class(ExamineButton.StyleClassExamineButton)
+                .PseudoHovered()
+                .Prop(Control.StylePropertyModulateSelf, ExamineButtonColorContextHover),
+            E<ExamineButton>()
+                .Class(ExamineButton.StyleClassExamineButton)
+                .PseudoPressed()
+                .Prop(Control.StylePropertyModulateSelf, ExamineButtonColorContextPressed),
+            E<ExamineButton>()
+                .Class(ExamineButton.StyleClassExamineButton)
+                .PseudoDisabled()
+                .Prop(Control.StylePropertyModulateSelf, ExamineButtonColorContextDisabled),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/ItemStatusSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/ItemStatusSheetlet.cs
new file mode 100644
index 0000000000..cc95d1783a
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/ItemStatusSheetlet.cs
@@ -0,0 +1,30 @@
+using Content.Client.Stylesheets.Fonts;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets.Hud;
+
+[CommonSheetlet]
+public sealed class ItemStatusSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        return
+        [
+            E()
+                .Class(StyleClass.ItemStatus)
+                .Prop("font", sheet.BaseFont.GetFont(10)),
+
+            E()
+                .Class(StyleClass.ItemStatusNotHeld)
+                .Prop("font", sheet.BaseFont.GetFont(10, FontKind.Italic))
+                .Prop("font-color", Color.Gray),
+
+            E<RichTextLabel>()
+                .Class(StyleClass.ItemStatus)
+                .Prop(nameof(RichTextLabel.LineHeightScale), 0.7f)
+                .Prop(nameof(Control.Margin), new Thickness(0, 0, 0, -6)),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/Hud/TooltipSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/Hud/TooltipSheetlet.cs
new file mode 100644
index 0000000000..16a5cfe62f
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/Hud/TooltipSheetlet.cs
@@ -0,0 +1,64 @@
+using Content.Client.Examine;
+using Content.Client.Stylesheets.Fonts;
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets.Hud;
+
+[CommonSheetlet]
+public sealed class TooltipSheetlet<T> : Sheetlet<T> where T: PalettedStylesheet, ITooltipConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        ITooltipConfig tooltipCfg = sheet;
+
+        var tooltipBox = sheet.GetTextureOr(tooltipCfg.TooltipBoxPath, NanotrasenStylesheet.TextureRoot)
+            .IntoPatch(StyleBox.Margin.All, 2);
+        tooltipBox.SetContentMarginOverride(StyleBox.Margin.Horizontal, 7);
+
+        var whisperBox = sheet.GetTextureOr(tooltipCfg.WhisperBoxPath, NanotrasenStylesheet.TextureRoot)
+            .IntoPatch(StyleBox.Margin.All, 2);
+        whisperBox.SetContentMarginOverride(StyleBox.Margin.Horizontal, 7);
+
+        return
+        [
+            E<PanelContainer>()
+                .Class(StyleClass.TooltipPanel)
+                .Modulate(Color.Gray.WithAlpha(0.9f)) // TODO: you know the drill by now
+                .Panel(tooltipBox),
+            E<RichTextLabel>()
+                .Class(StyleClass.TooltipTitle)
+                .Font(sheet.BaseFont.GetFont(14, FontKind.Bold)),
+            E<RichTextLabel>()
+                .Class(StyleClass.TooltipDesc)
+                .Font(sheet.BaseFont.GetFont(12)),
+
+            E<Tooltip>()
+                // ReSharper disable once AccessToStaticMemberViaDerivedType
+                .Prop(Tooltip.StylePropertyPanel, tooltipBox),
+            E<PanelContainer>()
+                .Class(ExamineSystem.StyleClassEntityTooltip)
+                .Panel(tooltipBox),
+            E<PanelContainer>()
+                .Class("speechBox", "sayBox")
+                .Panel(tooltipBox),
+            E<PanelContainer>()
+                .Class("speechBox", "whisperBox")
+                .Panel(whisperBox),
+
+            E<PanelContainer>()
+                .Class("speechBox", "whisperBox")
+                .ParentOf(E<RichTextLabel>().Class("bubbleContent"))
+                .Prop(Label.StylePropertyFont, sheet.BaseFont.GetFont(12, FontKind.Italic)),
+            E<PanelContainer>()
+                .Class("speechBox", "emoteBox")
+                .ParentOf(E<RichTextLabel>().Class("bubbleContent"))
+                .Prop(Label.StylePropertyFont, sheet.BaseFont.GetFont(12, FontKind.Italic)),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/ItemListSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/ItemListSheetlet.cs
new file mode 100644
index 0000000000..26a8210c1c
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/ItemListSheetlet.cs
@@ -0,0 +1,52 @@
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class ItemListSheetlet : Sheetlet<PalettedStylesheet>
+{
+    private static StyleBoxFlat Box(Color c)
+    {
+        return new StyleBoxFlat(c)
+            // TODO: dont hardcode these maybe
+            {
+                ContentMarginLeftOverride = 4,
+                ContentMarginTopOverride = 2,
+                ContentMarginRightOverride = 4,
+                ContentMarginBottomOverride = 2,
+            };
+    }
+
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        var boxBackground = new StyleBoxFlat { BackgroundColor = sheet.PrimaryPalette.Background };
+        var boxItemBackground = Box(sheet.PrimaryPalette.Background);
+        var boxSelected = Box(sheet.PrimaryPalette.Element);
+        var boxDisabled = Box(sheet.PrimaryPalette.BackgroundDark);
+
+        return
+        [
+            E<ItemList>()
+                .Prop(ItemList.StylePropertyBackground, boxBackground)
+                .Prop(ItemList.StylePropertyItemBackground, boxItemBackground)
+                .Prop(ItemList.StylePropertyDisabledItemBackground, boxDisabled)
+                .Prop(ItemList.StylePropertySelectedItemBackground, boxSelected),
+
+            // these styles seem to be unused now
+            // E<ItemList>().Class("transparentItemList")
+            //     .Prop(ItemList.StylePropertyBackground, boxTransparent)
+            //     .Prop(ItemList.StylePropertyItemBackground, boxTransparent)
+            //     .Prop(ItemList.StylePropertyDisabledItemBackground, boxDisabled)
+            //     .Prop(ItemList.StylePropertySelectedItemBackground, boxItemBackground),
+            //
+            // E<ItemList>().Class("transparentBackgroundItemList")
+            //     .Prop(ItemList.StylePropertyBackground, boxTransparent)
+            //     .Prop(ItemList.StylePropertyItemBackground, boxBackground)
+            //     .Prop(ItemList.StylePropertyDisabledItemBackground, boxItemBackground)
+            //     .Prop(ItemList.StylePropertySelectedItemBackground, boxSelected),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/LabelSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/LabelSheetlet.cs
new file mode 100644
index 0000000000..9135b53555
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/LabelSheetlet.cs
@@ -0,0 +1,63 @@
+using Content.Client.Stylesheets.Fonts;
+using Content.Client.Stylesheets.Palette;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class LabelSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        return
+        [
+            E<Label>()
+                .Class(StyleClass.LabelHeading)
+                .Font(sheet.BaseFont.GetFont(16, FontKind.Bold))
+                .FontColor(sheet.HighlightPalette.Text),
+            E<Label>()
+                .Class(StyleClass.LabelHeadingBigger)
+                .Font(sheet.BaseFont.GetFont(20, FontKind.Bold))
+                .FontColor(sheet.HighlightPalette.Text),
+            E<Label>()
+                .Class(StyleClass.LabelSubText)
+                .Font(sheet.BaseFont.GetFont(10))
+                .FontColor(Color.DarkGray),
+            E<Label>()
+                .Class(StyleClass.LabelKeyText)
+                .Font(sheet.BaseFont.GetFont(12, FontKind.Bold))
+                .FontColor(sheet.HighlightPalette.Text),
+            E<Label>()
+                .Class(StyleClass.LabelWeak)
+                .FontColor(Color.DarkGray), // TODO: you know the drill by now
+
+            E<Label>()
+                .Class(StyleClass.Positive)
+                .FontColor(sheet.PositivePalette.Text),
+            E<Label>()
+                .Class(StyleClass.Negative)
+                .FontColor(sheet.NegativePalette.Text),
+            E<Label>()
+                .Class(StyleClass.Highlight)
+                .FontColor(sheet.HighlightPalette.Text),
+
+            E<Label>()
+                .Class(StyleClass.StatusGood)
+                .FontColor(Palettes.Status.Good),
+            E<Label>()
+                .Class(StyleClass.StatusOkay)
+                .FontColor(Palettes.Status.Okay),
+            E<Label>()
+                .Class(StyleClass.StatusWarning)
+                .FontColor(Palettes.Status.Warning),
+            E<Label>()
+                .Class(StyleClass.StatusBad)
+                .FontColor(Palettes.Status.Bad),
+            E<Label>()
+                .Class(StyleClass.StatusCritical)
+                .FontColor(Palettes.Status.Critical),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/LineEditSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/LineEditSheetlet.cs
new file mode 100644
index 0000000000..b478af5bd0
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/LineEditSheetlet.cs
@@ -0,0 +1,37 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class LineEditSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, ILineEditConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        ILineEditConfig lineEditCfg = sheet;
+
+        var lineEditStylebox = sheet.GetTextureOr(lineEditCfg.LineEditPath, NanotrasenStylesheet.TextureRoot)
+            .IntoPatch(StyleBox.Margin.All, 3);
+        lineEditStylebox.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
+
+        return
+        [
+            E<LineEdit>()
+                .Prop(LineEdit.StylePropertyStyleBox, lineEditStylebox),
+            // TODO: Hardcoded colors bad, kill.
+            E<LineEdit>()
+                .Class(LineEdit.StyleClassLineEditNotEditable)
+                .Prop("font-color", new Color(192, 192, 192)),
+            E<LineEdit>()
+                .Pseudo(LineEdit.StylePseudoClassPlaceholder)
+                .Prop("font-color", Color.Gray),
+            E<TextEdit>()
+                .Pseudo(TextEdit.StylePseudoClassPlaceholder)
+                .Prop("font-color", Color.Gray),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/ListContainerSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/ListContainerSheetlet.cs
new file mode 100644
index 0000000000..ebbff954db
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/ListContainerSheetlet.cs
@@ -0,0 +1,31 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class ListContainerSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, IButtonConfig, IIconConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IButtonConfig buttonCfg = sheet;
+
+        var box = new StyleBoxFlat() { BackgroundColor = Color.White };
+
+        var rules = new List<StyleRule>(
+        [
+            E<ContainerButton>()
+                .Class(ListContainer.StyleClassListContainerButton)
+                .Box(box),
+        ]);
+        ButtonSheetlet<T>.MakeButtonRules<ContainerButton>(rules,
+            buttonCfg.ButtonPalette,
+            ListContainer.StyleClassListContainerButton);
+
+        return rules.ToArray();
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/MenuButtonSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/MenuButtonSheetlet.cs
new file mode 100644
index 0000000000..ac880b5a45
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/MenuButtonSheetlet.cs
@@ -0,0 +1,80 @@
+using System.Numerics;
+using Content.Client.Stylesheets.Fonts;
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class MenuButtonSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, IButtonConfig, IIconConfig
+{
+    private static MutableSelectorElement CButton()
+    {
+        return E<MenuButton>();
+    }
+
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IButtonConfig cfg = sheet;
+
+        var buttonTex = sheet.GetTextureOr(cfg.BaseButtonPath, NanotrasenStylesheet.TextureRoot);
+        var topButtonBase = new StyleBoxTexture
+        {
+            Texture = buttonTex,
+        };
+        topButtonBase.SetPatchMargin(StyleBox.Margin.All, 10);
+        topButtonBase.SetPadding(StyleBox.Margin.All, 0);
+        topButtonBase.SetContentMarginOverride(StyleBox.Margin.All, 0);
+
+        var topButtonOpenRight = new StyleBoxTexture(topButtonBase)
+        {
+            Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(0, 0), new Vector2(14, 24))),
+        };
+        topButtonOpenRight.SetPatchMargin(StyleBox.Margin.Right, 0);
+
+        var topButtonOpenLeft = new StyleBoxTexture(topButtonBase)
+        {
+            Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(14, 24))),
+        };
+        topButtonOpenLeft.SetPatchMargin(StyleBox.Margin.Left, 0);
+
+        var topButtonSquare = new StyleBoxTexture(topButtonBase)
+        {
+            Texture = new AtlasTexture(buttonTex, UIBox2.FromDimensions(new Vector2(10, 0), new Vector2(3, 24))),
+        };
+        topButtonSquare.SetPatchMargin(StyleBox.Margin.Horizontal, 0);
+
+        var rules = new List<StyleRule>
+        {
+            CButton().Class(StyleClass.ButtonSquare).Box(topButtonSquare),
+            CButton().Class(StyleClass.ButtonOpenLeft).Box(topButtonOpenLeft),
+            CButton().Class(StyleClass.ButtonOpenRight).Box(topButtonOpenRight),
+            CButton().Box(StyleBoxHelpers.BaseStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonOpenLeft)
+                .Prop(ContainerButton.StylePropertyStyleBox, StyleBoxHelpers.OpenLeftStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonOpenRight)
+                .Prop(ContainerButton.StylePropertyStyleBox, StyleBoxHelpers.OpenRightStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonOpenBoth)
+                .Prop(ContainerButton.StylePropertyStyleBox, StyleBoxHelpers.SquareStyleBox(sheet)),
+            CButton()
+                .Class(StyleClass.ButtonSquare)
+                .Prop(ContainerButton.StylePropertyStyleBox, StyleBoxHelpers.SquareStyleBox(sheet)),
+            E<Label>()
+                .Class(MenuButton.StyleClassLabelTopButton)
+                .Prop(Label.StylePropertyFont, sheet.BaseFont.GetFont(14, FontKind.Bold)),
+            // new StyleProperty(Label.StylePropertyFont, notoSansDisplayBold14),
+        };
+
+        ButtonSheetlet<T>.MakeButtonRules<MenuButton>(rules, cfg.ButtonPalette, null);
+
+        return rules.ToArray();
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/OptionButtonSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/OptionButtonSheetlet.cs
new file mode 100644
index 0000000000..f972ab3a5e
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/OptionButtonSheetlet.cs
@@ -0,0 +1,31 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class OptionButtonSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, IIconConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IIconConfig iconCfg = sheet;
+
+        var invertedTriangleTex =
+            sheet.GetTextureOr(iconCfg.InvertedTriangleIconPath, NanotrasenStylesheet.TextureRoot);
+
+        return
+        [
+            E<TextureRect>()
+                .Class(OptionButton.StyleClassOptionTriangle)
+                .Prop(TextureRect.StylePropertyTexture, invertedTriangleTex),
+            E<Label>().Class(OptionButton.StyleClassOptionButton).AlignMode(Label.AlignMode.Center),
+            E<PanelContainer>()
+                .Class(OptionButton.StyleClassOptionsBackground)
+                .Panel(new StyleBoxFlat(sheet.PrimaryPalette.Background)),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/PanelSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/PanelSheetlet.cs
new file mode 100644
index 0000000000..64ce2e5356
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/PanelSheetlet.cs
@@ -0,0 +1,57 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class PanelSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, IButtonConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IButtonConfig buttonCfg = sheet;
+
+        var boxLight = new StyleBoxFlat()
+        {
+            BackgroundColor = sheet.SecondaryPalette.BackgroundLight,
+        };
+        var boxDark = new StyleBoxFlat()
+        {
+            BackgroundColor = sheet.SecondaryPalette.BackgroundDark,
+        };
+        var boxPositive = new StyleBoxFlat { BackgroundColor = sheet.PositivePalette.Background };
+        var boxNegative = new StyleBoxFlat { BackgroundColor = sheet.NegativePalette.Background };
+        var boxHighlight = new StyleBoxFlat { BackgroundColor = sheet.HighlightPalette.Background };
+
+        return
+        [
+            E<PanelContainer>().Class(StyleClass.PanelLight).Panel(boxLight),
+            E<PanelContainer>().Class(StyleClass.PanelDark).Panel(boxDark),
+
+            E<PanelContainer>().Class(StyleClass.Positive).Panel(boxPositive),
+            E<PanelContainer>().Class(StyleClass.Negative).Panel(boxNegative),
+            E<PanelContainer>().Class(StyleClass.Highlight).Panel(boxHighlight),
+
+            // TODO: this should probably be cleaned up but too many UIs rely on this hardcoded color so I'm scared to touch it
+            E<PanelContainer>()
+                .Class("BackgroundDark")
+                .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat(Color.FromHex("#25252A"))),
+
+            // panels that have the same corner bezels as buttons
+            E()
+                .Class(StyleClass.BackgroundPanel)
+                .Prop(PanelContainer.StylePropertyPanel, StyleBoxHelpers.BaseStyleBox(sheet))
+                .Modulate(sheet.SecondaryPalette.Background),
+            E()
+                .Class(StyleClass.BackgroundPanelOpenLeft)
+                .Prop(PanelContainer.StylePropertyPanel, StyleBoxHelpers.OpenLeftStyleBox(sheet))
+                .Modulate(sheet.SecondaryPalette.Background),
+            E()
+                .Class(StyleClass.BackgroundPanelOpenRight)
+                .Prop(PanelContainer.StylePropertyPanel, StyleBoxHelpers.OpenRightStyleBox(sheet))
+                .Modulate(sheet.SecondaryPalette.Background),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/PlaceholderSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/PlaceholderSheetlet.cs
new file mode 100644
index 0000000000..eed7062392
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/PlaceholderSheetlet.cs
@@ -0,0 +1,34 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class PlaceholderSheetlet<T> : Sheetlet<T> where T: PalettedStylesheet, IPlaceholderConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IPlaceholderConfig placeholderCfg = sheet;
+
+        var placeholderBox = sheet.GetTextureOr(placeholderCfg.PlaceholderPath, NanotrasenStylesheet.TextureRoot)
+            .IntoPatch(StyleBox.Margin.All, 19);
+        placeholderBox.SetExpandMargin(StyleBox.Margin.All, -5);
+        placeholderBox.Mode = StyleBoxTexture.StretchMode.Tile;
+
+        return
+        [
+            E<Placeholder>()
+                // ReSharper disable once AccessToStaticMemberViaDerivedType
+                .Prop(Placeholder.StylePropertyPanel, placeholderBox),
+            E<Label>()
+                .Class(Placeholder.StyleClassPlaceholderText)
+                .Font(sheet.BaseFont.GetFont(16))
+                .FontColor(new Color(103, 103, 103, 128)), // TODO: fix hardcoded color
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/ProgressBarSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/ProgressBarSheetlet.cs
new file mode 100644
index 0000000000..e342042646
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/ProgressBarSheetlet.cs
@@ -0,0 +1,32 @@
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class ProgressBarSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        // TODO: 1) hardcoded colors, 2) yuck
+        var progressBarBackground = new StyleBoxFlat
+        {
+            BackgroundColor = new Color(0.25f, 0.25f, 0.25f),
+        };
+        progressBarBackground.SetContentMarginOverride(StyleBox.Margin.Vertical, 14.5f);
+        var progressBarForeground = new StyleBoxFlat
+        {
+            BackgroundColor = new Color(0.25f, 0.50f, 0.25f),
+        };
+        progressBarForeground.SetContentMarginOverride(StyleBox.Margin.Vertical, 14.5f);
+
+        return
+        [
+            E<ProgressBar>()
+                .Prop(ProgressBar.StylePropertyBackground, progressBarBackground)
+                .Prop(ProgressBar.StylePropertyForeground, progressBarForeground),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/RadialMenuSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/RadialMenuSheetlet.cs
new file mode 100644
index 0000000000..20f7eab335
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/RadialMenuSheetlet.cs
@@ -0,0 +1,51 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class RadialMenuSheetlet<T> : Sheetlet<T> where T: PalettedStylesheet, IRadialMenuConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IRadialMenuConfig radialCfg = sheet;
+
+        var btnNormalTex = sheet.GetTextureOr(radialCfg.ButtonNormalPath, NanotrasenStylesheet.TextureRoot);
+        var btnHoverTex = sheet.GetTextureOr(radialCfg.ButtonHoverPath, NanotrasenStylesheet.TextureRoot);
+        var closeNormalTex = sheet.GetTextureOr(radialCfg.CloseNormalPath, NanotrasenStylesheet.TextureRoot);
+        var closeHoverTex = sheet.GetTextureOr(radialCfg.CloseHoverPath, NanotrasenStylesheet.TextureRoot);
+        var backNormalTex = sheet.GetTextureOr(radialCfg.BackNormalPath, NanotrasenStylesheet.TextureRoot);
+        var backHoverTex = sheet.GetTextureOr(radialCfg.BackHoverPath, NanotrasenStylesheet.TextureRoot);
+
+        return
+        [
+            // TODO: UNHARDCODE
+            E<TextureButton>()
+                .Class("RadialMenuButton")
+                .Prop(TextureButton.StylePropertyTexture, btnNormalTex),
+            E<TextureButton>()
+                .Class("RadialMenuButton")
+                .Pseudo(TextureButton.StylePseudoClassHover)
+                .Prop(TextureButton.StylePropertyTexture, btnHoverTex),
+
+            E<TextureButton>()
+                .Class("RadialMenuCloseButton")
+                .Prop(TextureButton.StylePropertyTexture, closeNormalTex),
+            E<TextureButton>()
+                .Class("RadialMenuCloseButton")
+                .Pseudo(TextureButton.StylePseudoClassHover)
+                .Prop(TextureButton.StylePropertyTexture, closeHoverTex),
+
+            E<TextureButton>()
+                .Class("RadialMenuBackButton")
+                .Prop(TextureButton.StylePropertyTexture, backNormalTex),
+            E<TextureButton>()
+                .Class("RadialMenuBackButton")
+                .Pseudo(TextureButton.StylePseudoClassHover)
+                .Prop(TextureButton.StylePropertyTexture, backHoverTex),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/ScrollbarSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/ScrollbarSheetlet.cs
new file mode 100644
index 0000000000..b7f0eeccba
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/ScrollbarSheetlet.cs
@@ -0,0 +1,58 @@
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class ScrollbarSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public const int DefaultGrabberSize = 10;
+
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        // TODO: hardcoded colors!!!
+        var vScrollBarGrabberNormal = new StyleBoxFlat
+        {
+            BackgroundColor = Color.Gray.WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
+            ContentMarginTopOverride = DefaultGrabberSize,
+        };
+        var vScrollBarGrabberHover = new StyleBoxFlat
+        {
+            BackgroundColor = new Color(140, 140, 140).WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
+            ContentMarginTopOverride = DefaultGrabberSize,
+        };
+
+        var vScrollBarGrabberGrabbed = new StyleBoxFlat
+        {
+            BackgroundColor = new Color(160, 160, 160).WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
+            ContentMarginTopOverride = DefaultGrabberSize,
+        };
+
+        var hScrollBarGrabberNormal = new StyleBoxFlat
+        {
+            BackgroundColor = Color.Gray.WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize,
+        };
+
+        var hScrollBarGrabberHover = new StyleBoxFlat
+        {
+            BackgroundColor = new Color(140, 140, 140).WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize,
+        };
+
+        var hScrollBarGrabberGrabbed = new StyleBoxFlat
+        {
+            BackgroundColor = new Color(160, 160, 160).WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize,
+        };
+
+        return
+        [
+            E<VScrollBar>().Prop(ScrollBar.StylePropertyGrabber, vScrollBarGrabberNormal),
+            E<VScrollBar>().PseudoHovered().Prop(ScrollBar.StylePropertyGrabber, vScrollBarGrabberHover),
+            E<VScrollBar>().PseudoPressed().Prop(ScrollBar.StylePropertyGrabber, vScrollBarGrabberGrabbed),
+            E<HScrollBar>().Prop(ScrollBar.StylePropertyGrabber, hScrollBarGrabberNormal),
+            E<HScrollBar>().PseudoHovered().Prop(ScrollBar.StylePropertyGrabber, hScrollBarGrabberHover),
+            E<HScrollBar>().PseudoPressed().Prop(ScrollBar.StylePropertyGrabber, hScrollBarGrabberGrabbed),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/SliderSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/SliderSheetlet.cs
new file mode 100644
index 0000000000..5ef1c0e6c5
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/SliderSheetlet.cs
@@ -0,0 +1,74 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class SliderSheetlet<T> : Sheetlet<T> where T: PalettedStylesheet, ISliderConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        ISliderConfig sliderCfg = sheet;
+
+        var sliderFillTex = sheet.GetTextureOr(sliderCfg.SliderFillPath, NanotrasenStylesheet.TextureRoot);
+
+        var sliderFillBox = new StyleBoxTexture
+        {
+            Texture = sliderFillTex,
+            Modulate = sheet.PositivePalette.TextDark,
+        };
+
+        var sliderBackBox = new StyleBoxTexture
+        {
+            Texture = sliderFillTex,
+            Modulate = sheet.SecondaryPalette.BackgroundDark,
+        };
+
+        var sliderForeBox = new StyleBoxTexture
+        {
+            Texture = sheet.GetTextureOr(sliderCfg.SliderOutlinePath, NanotrasenStylesheet.TextureRoot),
+            Modulate = Color.FromHex("#494949") // TODO: Unhardcode.
+        };
+
+        var sliderGrabBox = new StyleBoxTexture
+        {
+            Texture = sheet.GetTextureOr(sliderCfg.SliderGrabber, NanotrasenStylesheet.TextureRoot),
+        };
+
+        sliderFillBox.SetPatchMargin(StyleBox.Margin.All, 12);
+        sliderBackBox.SetPatchMargin(StyleBox.Margin.All, 12);
+        sliderForeBox.SetPatchMargin(StyleBox.Margin.All, 12);
+        sliderGrabBox.SetPatchMargin(StyleBox.Margin.All, 12);
+
+        // var sliderFillGreen = new StyleBoxTexture(sliderFillBox) { Modulate = Color.LimeGreen };
+        // var sliderFillRed = new StyleBoxTexture(sliderFillBox) { Modulate = Color.Red };
+        // var sliderFillBlue = new StyleBoxTexture(sliderFillBox) { Modulate = Color.Blue };
+        // var sliderFillWhite = new StyleBoxTexture(sliderFillBox) { Modulate = Color.White };
+
+        return new StyleRule[]
+        {
+            E<Slider>()
+                .Prop(Slider.StylePropertyBackground, sliderBackBox)
+                .Prop(Slider.StylePropertyForeground, sliderForeBox)
+                .Prop(Slider.StylePropertyGrabber, sliderGrabBox)
+                .Prop(Slider.StylePropertyFill, sliderFillBox),
+            // these styles seem to be unused now
+            // E<ColorableSlider>()
+            //     .Prop(ColorableSlider.StylePropertyFillWhite, sliderFillWhite)
+            //     .Prop(ColorableSlider.StylePropertyBackgroundWhite, sliderFillWhite),
+            //
+            // E<Slider>().Class(StyleClass.StyleClassSliderRed)
+            //     .Prop(Slider.StylePropertyFill, sliderFillRed),
+            // E<Slider>().Class(StyleClass.StyleClassSliderBlue)
+            //     .Prop(Slider.StylePropertyFill, sliderFillBlue),
+            // E<Slider>().Class(StyleClass.StyleClassSliderGreen)
+            //     .Prop(Slider.StylePropertyFill, sliderFillGreen),
+            // E<Slider>().Class(StyleClass.StyleClassSliderWhite)
+            //     .Prop(Slider.StylePropertyFill, sliderFillWhite),
+        };
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/StripebackSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/StripebackSheetlet.cs
new file mode 100644
index 0000000000..dc0c8dc011
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/StripebackSheetlet.cs
@@ -0,0 +1,29 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class StripebackSheetlet<T> : Sheetlet<T> where T : PalettedStylesheet, IStripebackConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IStripebackConfig stripebackCfg = sheet;
+
+        var stripeBack = new StyleBoxTexture
+        {
+            Texture = sheet.GetTextureOr(stripebackCfg.StripebackPath, NanotrasenStylesheet.TextureRoot),
+            Mode = StyleBoxTexture.StretchMode.Tile,
+        };
+
+        return
+        [
+            E<StripeBack>()
+                .Prop(StripeBack.StylePropertyBackground, stripeBack),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/TabContainerSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/TabContainerSheetlet.cs
new file mode 100644
index 0000000000..de6add06d6
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/TabContainerSheetlet.cs
@@ -0,0 +1,33 @@
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class TabContainerSheetlet<T> : Sheetlet<T> where T: PalettedStylesheet, ITabContainerConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        ITabContainerConfig tabCfg = sheet;
+
+        var tabContainerPanel = sheet.GetTextureOr(tabCfg.TabContainerPanelPath, NanotrasenStylesheet.TextureRoot)
+            .IntoPatch(StyleBox.Margin.All, 2);
+
+        var tabContainerBoxActive = new StyleBoxFlat(sheet.SecondaryPalette.Element);
+        tabContainerBoxActive.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
+        var tabContainerBoxInactive = new StyleBoxFlat(sheet.SecondaryPalette.Background);
+        tabContainerBoxInactive.SetContentMarginOverride(StyleBox.Margin.Horizontal, 5);
+
+        return
+        [
+            E<TabContainer>()
+                .Prop(TabContainer.StylePropertyPanelStyleBox, tabContainerPanel)
+                .Prop(TabContainer.StylePropertyTabStyleBox, tabContainerBoxActive)
+                .Prop(TabContainer.StylePropertyTabStyleBoxInactive, tabContainerBoxInactive),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/TextSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/TextSheetlet.cs
new file mode 100644
index 0000000000..71725e4a0d
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/TextSheetlet.cs
@@ -0,0 +1,25 @@
+using Content.Client.Resources;
+using Content.Client.Stylesheets.Fonts;
+using Robust.Client.UserInterface;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+/// These are not in `LabelSheetlet` because a label is not the only thing you might want to be monospaced.
+[CommonSheetlet]
+public sealed class TextSheetlet : Sheetlet<PalettedStylesheet>
+{
+    public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
+    {
+        // TODO: once fonts are reworked, change this!
+        var mono = ResCache.GetFont("/EngineFonts/NotoSans/NotoSansMono-Regular.ttf", 12);
+
+        return
+        [
+            E().Class(StyleClass.Monospace).Font(mono),
+            E().Class(StyleClass.Italic).Font(sheet.BaseFont.GetFont(12, FontKind.Italic)),
+            E().Class(StyleClass.FontLarge).Font(sheet.BaseFont.GetFont(14)),
+            E().Class(StyleClass.FontSmall).Font(sheet.BaseFont.GetFont(10)),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/Sheetlets/WindowSheetlet.cs b/Content.Client/Stylesheets/Sheetlets/WindowSheetlet.cs
new file mode 100644
index 0000000000..143baec992
--- /dev/null
+++ b/Content.Client/Stylesheets/Sheetlets/WindowSheetlet.cs
@@ -0,0 +1,132 @@
+using Content.Client.Resources;
+using Content.Client.Stylesheets.Fonts;
+using Content.Client.Stylesheets.Palette;
+using Content.Client.Stylesheets.SheetletConfigs;
+using Content.Client.Stylesheets.Stylesheets;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using static Content.Client.Stylesheets.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Sheetlets;
+
+[CommonSheetlet]
+public sealed class WindowSheetlet<T> : Sheetlet<T>
+    where T : PalettedStylesheet, IButtonConfig, IWindowConfig, IIconConfig
+{
+    public override StyleRule[] GetRules(T sheet, object config)
+    {
+        IButtonConfig buttonCfg = sheet;
+        IWindowConfig windowCfg = sheet;
+        IIconConfig iconCfg = sheet;
+
+        var headerStylebox = new StyleBoxTexture
+        {
+            Texture = sheet.GetTextureOr(windowCfg.WindowHeaderTexturePath, NanotrasenStylesheet.TextureRoot),
+            PatchMarginBottom = 3,
+            ExpandMarginBottom = 3,
+            ContentMarginBottomOverride = 0,
+        };
+        // TODO: This would probably be better palette-based but we can leave it for now.
+        var headerAlertStylebox = new StyleBoxTexture
+        {
+            Texture = sheet.GetTextureOr(windowCfg.WindowHeaderAlertTexturePath, NanotrasenStylesheet.TextureRoot),
+            PatchMarginBottom = 3,
+            ExpandMarginBottom = 3,
+            ContentMarginBottomOverride = 0,
+        };
+        var backgroundBox = new StyleBoxTexture()
+        {
+            Texture = sheet.GetTextureOr(windowCfg.WindowBackgroundPath, NanotrasenStylesheet.TextureRoot),
+        };
+        backgroundBox.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
+        backgroundBox.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
+        var borderedBackgroundBox = new StyleBoxTexture
+        {
+            Texture = sheet.GetTextureOr(windowCfg.WindowBackgroundBorderedPath, NanotrasenStylesheet.TextureRoot),
+        };
+        borderedBackgroundBox.SetPatchMargin(StyleBox.Margin.All, 2);
+        var closeButtonTex = sheet.GetTextureOr(iconCfg.CrossIconPath, NanotrasenStylesheet.TextureRoot);
+
+        var leftPanel = StyleBoxHelpers.OpenLeftStyleBox(sheet);
+        leftPanel.SetPadding(StyleBox.Margin.All, 0.0f);
+
+        // TODO: maybe also change everything here to `NanoWindow` or something
+        return
+        [
+            // TODO: KILL DEFAULT WINDOW (in a bit)
+            E<Label>()
+                .Class(DefaultWindow.StyleClassWindowTitle)
+                .FontColor(sheet.HighlightPalette.Text)
+                .Font(sheet.BaseFont.GetFont(14, FontKind.Bold)),
+            E<Label>()
+                .Class("windowTitleAlert")
+                .FontColor(Color.White)
+                .Font(sheet.BaseFont.GetFont(14, FontKind.Bold)),
+            // TODO: maybe also change everything here to `NanoWindow` or something
+            E()
+                .Class(DefaultWindow.StyleClassWindowPanel)
+                .Panel(backgroundBox),
+            E()
+                .Class(DefaultWindow.StyleClassWindowHeader)
+                .Panel(headerStylebox),
+            E()
+                .Class(StyleClass.AlertWindowHeader)
+                .Panel(headerAlertStylebox),
+            E()
+                .Class(StyleClass.BorderedWindowPanel)
+                .Panel(borderedBackgroundBox),
+
+            // Close button
+            E<TextureButton>()
+                .Class(DefaultWindow.StyleClassWindowCloseButton)
+                .Prop(TextureButton.StylePropertyTexture, closeButtonTex)
+                .Margin(3),
+            E<TextureButton>()
+                .Class(DefaultWindow.StyleClassWindowCloseButton)
+                .PseudoNormal()
+                .Modulate(Palettes.Neutral.Element),
+            E<TextureButton>()
+                .Class(DefaultWindow.StyleClassWindowCloseButton)
+                .PseudoHovered()
+                .Modulate(Palettes.Red.HoveredElement),
+            E<TextureButton>()
+                .Class(DefaultWindow.StyleClassWindowCloseButton)
+                .PseudoPressed()
+                .Modulate(Palettes.Red.PressedElement),
+            E<TextureButton>()
+                .Class(DefaultWindow.StyleClassWindowCloseButton)
+                .PseudoDisabled()
+                .Modulate(Palettes.Red.DisabledElement),
+
+            // Title
+            E<Label>()
+                .Class("FancyWindowTitle") // TODO: hardcoding class name
+                .Font(ResCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13)) // TODO: hardcoding font
+                .FontColor(sheet.HighlightPalette.Text),
+
+            // Help Button
+            E<TextureButton>()
+                .Class(FancyWindow.StyleClassWindowHelpButton)
+                .Prop(TextureButton.StylePropertyTexture,
+                    sheet.GetTextureOr(iconCfg.HelpIconPath, NanotrasenStylesheet.TextureRoot))
+                .Prop(Control.StylePropertyModulateSelf, sheet.PrimaryPalette.Element),
+            E<TextureButton>()
+                .Class(FancyWindow.StyleClassWindowHelpButton)
+                .Pseudo(ContainerButton.StylePseudoClassHover)
+                .Prop(Control.StylePropertyModulateSelf, sheet.PrimaryPalette.HoveredElement),
+            E<TextureButton>()
+                .Class(FancyWindow.StyleClassWindowHelpButton)
+                .Pseudo(ContainerButton.StylePseudoClassPressed)
+                .Prop(Control.StylePropertyModulateSelf, sheet.PrimaryPalette.PressedElement),
+
+            // Footer
+            E<Label>()
+                .Class("WindowFooterText") // TODO: hardcoding font
+                .Prop(Label.StylePropertyFont, sheet.BaseFont.GetFont(8))
+                .Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),
+        ];
+    }
+}
diff --git a/Content.Client/Stylesheets/StyleBase.cs b/Content.Client/Stylesheets/StyleBase.cs
index 76b77cbe63..99f71f39a2 100644
--- a/Content.Client/Stylesheets/StyleBase.cs
+++ b/Content.Client/Stylesheets/StyleBase.cs
@@ -10,25 +10,9 @@ using Robust.Shared.Maths;
 
 namespace Content.Client.Stylesheets
 {
+    [Obsolete("Please use the new sheetlet system to define styles, and remove all references to this class as it may be deleted in the future")]
     public abstract class StyleBase
     {
-        public const string ClassHighDivider = "HighDivider";
-        public const string ClassLowDivider = "LowDivider";
-        public const string StyleClassLabelHeading = "LabelHeading";
-        public const string StyleClassLabelSubText = "LabelSubText";
-        public const string StyleClassItalic = "Italic";
-
-        public const string ClassAngleRect = "AngleRect";
-
-        public const string ButtonOpenRight = "OpenRight";
-        public const string ButtonOpenLeft = "OpenLeft";
-        public const string ButtonOpenBoth = "OpenBoth";
-        public const string ButtonSquare = "ButtonSquare";
-
-        public const string ButtonCaution = "Caution";
-
-        public const int DefaultGrabberSize = 10;
-
         public abstract Stylesheet Stylesheet { get; }
 
         protected StyleRule[] BaseRules { get; }
@@ -123,35 +107,6 @@ namespace Content.Client.Stylesheets
             };
             AngleBorderRect.SetPatchMargin(StyleBox.Margin.All, 10);
 
-            var vScrollBarGrabberNormal = new StyleBoxFlat
-            {
-                BackgroundColor = Color.Gray.WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
-                ContentMarginTopOverride = DefaultGrabberSize
-            };
-            var vScrollBarGrabberHover = new StyleBoxFlat
-            {
-                BackgroundColor = new Color(140, 140, 140).WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
-                ContentMarginTopOverride = DefaultGrabberSize
-            };
-            var vScrollBarGrabberGrabbed = new StyleBoxFlat
-            {
-                BackgroundColor = new Color(160, 160, 160).WithAlpha(0.35f), ContentMarginLeftOverride = DefaultGrabberSize,
-                ContentMarginTopOverride = DefaultGrabberSize
-            };
-
-            var hScrollBarGrabberNormal = new StyleBoxFlat
-            {
-                BackgroundColor = Color.Gray.WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize
-            };
-            var hScrollBarGrabberHover = new StyleBoxFlat
-            {
-                BackgroundColor = new Color(140, 140, 140).WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize
-            };
-            var hScrollBarGrabberGrabbed = new StyleBoxFlat
-            {
-                BackgroundColor = new Color(160, 160, 160).WithAlpha(0.35f), ContentMarginTopOverride = DefaultGrabberSize
-            };
-
 
             BaseRules = new[]
             {
@@ -165,7 +120,7 @@ namespace Content.Client.Stylesheets
 
                 // Default font.
                 new StyleRule(
-                    new SelectorElement(null, new[] {StyleClassItalic}, null, null),
+                    new SelectorElement(null, new[] {StyleClass.Italic}, null, null),
                     new[]
                     {
                         new StyleProperty("font", notoSans12Italic),
@@ -196,53 +151,6 @@ namespace Content.Client.Stylesheets
                     {
                         new StyleProperty(Control.StylePropertyModulateSelf, Color.FromHex("#753131")),
                     }),
-
-                // Scroll bars
-                new StyleRule(new SelectorElement(typeof(VScrollBar), null, null, null),
-                    new[]
-                    {
-                        new StyleProperty(ScrollBar.StylePropertyGrabber,
-                            vScrollBarGrabberNormal),
-                    }),
-
-                new StyleRule(
-                    new SelectorElement(typeof(VScrollBar), null, null, new[] {ScrollBar.StylePseudoClassHover}),
-                    new[]
-                    {
-                        new StyleProperty(ScrollBar.StylePropertyGrabber,
-                            vScrollBarGrabberHover),
-                    }),
-
-                new StyleRule(
-                    new SelectorElement(typeof(VScrollBar), null, null, new[] {ScrollBar.StylePseudoClassGrabbed}),
-                    new[]
-                    {
-                        new StyleProperty(ScrollBar.StylePropertyGrabber,
-                            vScrollBarGrabberGrabbed),
-                    }),
-
-                new StyleRule(new SelectorElement(typeof(HScrollBar), null, null, null),
-                    new[]
-                    {
-                        new StyleProperty(ScrollBar.StylePropertyGrabber,
-                            hScrollBarGrabberNormal),
-                    }),
-
-                new StyleRule(
-                    new SelectorElement(typeof(HScrollBar), null, null, new[] {ScrollBar.StylePseudoClassHover}),
-                    new[]
-                    {
-                        new StyleProperty(ScrollBar.StylePropertyGrabber,
-                            hScrollBarGrabberHover),
-                    }),
-
-                new StyleRule(
-                    new SelectorElement(typeof(HScrollBar), null, null, new[] {ScrollBar.StylePseudoClassGrabbed}),
-                    new[]
-                    {
-                        new StyleProperty(ScrollBar.StylePropertyGrabber,
-                            hScrollBarGrabberGrabbed),
-                    }),
             };
         }
     }
diff --git a/Content.Client/Stylesheets/StyleClass.cs b/Content.Client/Stylesheets/StyleClass.cs
new file mode 100644
index 0000000000..4a1082751b
--- /dev/null
+++ b/Content.Client/Stylesheets/StyleClass.cs
@@ -0,0 +1,67 @@
+namespace Content.Client.Stylesheets;
+
+///
+/// <summary>
+///     A collection of public reusable style classes. These should be general purpose (Not specific to only one element
+///     or Ui).
+/// </summary>
+/// <remarks>
+///     It is named `StyleClass` as opposed to `StyleClasses` because `StyleClasses` is a field on `Control` so it made
+///     it a pain to reference this class from a `Control`. (Weird name is worth typing `StyleClass.OpenBoth` vs.
+///     `Stylesheets.Styleclasses.OpenBoth`)
+/// </remarks>
+public static class StyleClass
+{
+    // These style classes affect more than one type of element
+    public const string Positive = "positive";
+    public const string Negative = "negative";
+    public const string Highlight = "highlight";
+
+    public const string StatusGood = "status-good"; //          Status.GetStatusColor(1.0f)
+    public const string StatusOkay = "status-okay"; //          Status.GetStatusColor(0.75f)
+    public const string StatusWarning = "status-warning"; //    Status.GetStatusColor(0.5f)
+    public const string StatusBad = "status-bad"; //            Status.GetStatusColor(0.25f)
+    public const string StatusCritical = "status-critical"; //  Status.GetStatusColor(0.0f)
+
+    public const string FontLarge = "font-large";
+    public const string FontSmall = "font-small";
+    public const string Italic = "italic";
+    public const string Monospace = "monospace";
+
+    public const string BorderedWindowPanel = "BorderedWindowPanel";
+    public const string AlertWindowHeader = "windowHeaderAlert";
+    public const string WindowContentsContainer = "WindowContentsContainer";
+
+    public const string HighDivider = "HighDivider";
+    public const string LowDivider = "LowDivider";
+
+    public const string LabelHeading = "LabelHeading";
+    public const string LabelHeadingBigger = "LabelHeadingBigger";
+    public const string LabelSubText = "LabelSubText";
+    public const string LabelKeyText = "LabelKeyText";
+    public const string LabelWeak = "LabelWeak"; // replaces `LabelSecondaryColor`
+
+    public const string BackgroundPanel = "BackgroundPanel"; // replaces `AngleRect`
+    public const string BackgroundPanelOpenLeft = "BackgroundPanelOpenLeft"; // replaces `BackgroundOpenLeft`
+    public const string BackgroundPanelOpenRight = "BackgroundPanelOpenRight"; // replaces `BackgroundOpenRight`
+
+    public const string PanelDark = "PanelDark";
+    public const string PanelLight = "PanelLight";
+
+    public const string ButtonOpenRight = "OpenRight";
+    public const string ButtonOpenLeft = "OpenLeft";
+    public const string ButtonOpenBoth = "OpenBoth";
+    public const string ButtonSquare = "ButtonSquare";
+    public const string ButtonSmall = "ButtonSmall";
+    public const string ButtonBig = "ButtonBig";
+
+    public const string CrossButtonRed = "CrossButtonRed";
+    public const string RefreshButton = "RefreshButton";
+
+    public const string ItemStatus = "ItemStatus";
+    public const string ItemStatusNotHeld = "ItemStatusNotHeld";
+
+    public const string TooltipPanel = "TooltipPanel";
+    public const string TooltipTitle = "TooltipTitle";
+    public const string TooltipDesc = "TooltipDesc";
+}
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 2d55accd3e..b1c20d1814 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -41,6 +41,8 @@ namespace Content.Client.Stylesheets
 
     }
     // STLYE SHEETS WERE A MISTAKE. KILL ALL OF THIS WITH FIRE
+    [Obsolete("Please use the new sheetlet system to define styles, and remove all references to this class as it may be deleted in the future")]
+    // i did :)
     public sealed class StyleNano : StyleBase
     {
         public const string StyleClassBorderedWindowPanel = "BorderedWindowPanel";
@@ -48,7 +50,6 @@ namespace Content.Client.Stylesheets
         public const string StyleClassHandSlotHighlight = "HandSlotHighlight";
         public const string StyleClassChatPanel = "ChatPanel";
         public const string StyleClassChatSubPanel = "ChatSubPanel";
-        public const string StyleClassTransparentBorderedWindowPanel = "TransparentBorderedWindowPanel";
         public const string StyleClassHotbarPanel = "HotbarPanel";
         public const string StyleClassTooltipPanel = "tooltipBox";
         public const string StyleClassTooltipAlertTitle = "tooltipAlertTitle";
@@ -162,6 +163,19 @@ namespace Content.Client.Stylesheets
         public const string StyleClassPinButtonPinned = "pinButtonPinned";
         public const string StyleClassPinButtonUnpinned = "pinButtonUnpinned";
 
+        // i'm not sure what the missing symbols were referencing, and this is getting obseleted anyway so:
+        public const string ButtonOpenRight = "OpenRight";
+        public const string ButtonOpenLeft = "OpenLeft";
+        public const string ButtonOpenBoth = "OpenBoth";
+        public const string ButtonSquare = "OpenBoth";
+        public const string ButtonCaution = "negative";
+        public const string StyleClassLabelHeading = "LabelHeading";
+        public const string StyleClassLabelSubText = "LabelSubText";
+        public const string StyleClassRedTopButton = "negative";
+        public const string ClassHighDivider = "HighDivider";
+        public const string ClassLowDivider = "LowDivider";
+        public const string ClassAngleRect = "AngleRect";
+
 
         public override Stylesheet Stylesheet { get; }
 
@@ -240,13 +254,6 @@ namespace Content.Client.Stylesheets
             };
             handSlotHighlight.SetPatchMargin(StyleBox.Margin.All, 2);
 
-            var borderedTransparentWindowBackgroundTex = resCache.GetTexture("/Textures/Interface/Nano/transparent_window_background_bordered.png");
-            var borderedTransparentWindowBackground = new StyleBoxTexture
-            {
-                Texture = borderedTransparentWindowBackgroundTex,
-            };
-            borderedTransparentWindowBackground.SetPatchMargin(StyleBox.Margin.All, 2);
-
             var hotbarBackground = new StyleBoxTexture
             {
                 Texture = borderedWindowBackgroundTex,
@@ -515,10 +522,8 @@ namespace Content.Client.Stylesheets
             itemListItemBackgroundTransparent.SetContentMarginOverride(StyleBox.Margin.Vertical, 2);
             itemListItemBackgroundTransparent.SetContentMarginOverride(StyleBox.Margin.Horizontal, 4);
 
-            var squareTex = resCache.GetTexture("/Textures/Interface/Nano/square.png");
-            var listContainerButton = new StyleBoxTexture
+            var listContainerButton = new StyleBoxFlat
             {
-                Texture = squareTex,
                 ContentMarginLeftOverride = 10
             };
 
@@ -641,12 +646,6 @@ namespace Content.Client.Stylesheets
                     {
                         new StyleProperty(PanelContainer.StylePropertyPanel, borderedWindowBackground),
                     }),
-                new StyleRule(
-                    new SelectorElement(null, new[] {StyleClassTransparentBorderedWindowPanel}, null, null),
-                    new[]
-                    {
-                        new StyleProperty(PanelContainer.StylePropertyPanel, borderedTransparentWindowBackground),
-                    }),
                 // inventory slot background
                 new StyleRule(
                     new SelectorElement(null, new[] {StyleClassInventorySlotBackground}, null, null),
@@ -741,23 +740,6 @@ namespace Content.Client.Stylesheets
                     .Pseudo(ContainerButton.StylePseudoClassDisabled)
                     .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionDisabled),
 
-                // Colors for confirm buttons confirm states.
-                Element<ConfirmButton>()
-                    .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassNormal)
-                    .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionDefault),
-
-                Element<ConfirmButton>()
-                    .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassHover)
-                    .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionHovered),
-
-                Element<ConfirmButton>()
-                    .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassPressed)
-                    .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionPressed),
-
-                Element<ConfirmButton>()
-                    .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassDisabled)
-                    .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionDisabled),
-
                 new StyleRule(new SelectorChild(
                     new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassDisabled}),
                     new SelectorElement(typeof(Label), null, null, null)),
@@ -1096,11 +1078,11 @@ namespace Content.Client.Stylesheets
                 }),
 
                 // small number for the entity counter in the entity menu
-                new StyleRule(new SelectorElement(typeof(Label), new[] {ContextMenuElement.StyleClassEntityMenuIconLabel}, null, null), new[]
-                {
-                    new StyleProperty("font", notoSans10),
-                    new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Right),
-                }),
+                // new StyleRule(new SelectorElement(typeof(Label), new[] {ContextMenuElement.StyleClassEntityMenuIconLabel}, null, null), new[]
+                // {
+                //     new StyleProperty("font", notoSans10),
+                //     new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Right),
+                // }),
 
                 // hotbar slot
                 new StyleRule(new SelectorElement(typeof(RichTextLabel), new[] {StyleClassHotbarSlotNumber}, null, null), new[]
@@ -1287,13 +1269,6 @@ namespace Content.Client.Stylesheets
                         new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorDefault),
                     }),
 
-                new StyleRule(
-                    new SelectorElement(typeof(MenuButton), new[] {MenuButton.StyleClassRedTopButton}, null, new[] {Button.StylePseudoClassNormal}),
-                    new[]
-                    {
-                        new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorDefaultRed),
-                    }),
-
                 new StyleRule(
                     new SelectorElement(typeof(MenuButton), null, null, new[] {Button.StylePseudoClassNormal}),
                     new[]
@@ -1315,20 +1290,6 @@ namespace Content.Client.Stylesheets
                         new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorHovered),
                     }),
 
-                new StyleRule(
-                    new SelectorElement(typeof(MenuButton), new[] {MenuButton.StyleClassRedTopButton}, null, new[] {Button.StylePseudoClassHover}),
-                    new[]
-                    {
-                        new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorHoveredRed),
-                    }),
-
-                new StyleRule(
-                    new SelectorElement(typeof(Label), new[] {MenuButton.StyleClassLabelTopButton}, null, null),
-                    new[]
-                    {
-                        new StyleProperty(Label.StylePropertyFont, notoSansDisplayBold14),
-                    }),
-
                 // MonotoneButton (unfilled)
                 new StyleRule(
                     new SelectorElement(typeof(MonotoneButton), null, null, null),
@@ -1618,9 +1579,6 @@ namespace Content.Client.Stylesheets
                 Element<TextureButton>().Class("CrossButtonRed").Pseudo(TextureButton.StylePseudoClassHover)
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#753131")),
 
-                //
-                Element<TextureButton>().Class("Refresh")
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Nano/circular_arrow.svg.96dpi.png")),
                 // ---
 
                 // Profile Editor
diff --git a/Content.Client/Stylesheets/StyleProperties.cs b/Content.Client/Stylesheets/StyleProperties.cs
new file mode 100644
index 0000000000..cc6ca12688
--- /dev/null
+++ b/Content.Client/Stylesheets/StyleProperties.cs
@@ -0,0 +1,10 @@
+namespace Content.Client.Stylesheets;
+
+public sealed class StyleProperties
+{
+    public const string PrimaryPalette = "palette-primary";
+    public const string SecondaryPalette = "palette-secondary";
+    public const string PositivePalette = "palette-positive";
+    public const string NegativePalette = "palette-negative";
+    public const string HighlightPalette = "palette-highlight";
+}
diff --git a/Content.Client/Stylesheets/StyleSpace.cs b/Content.Client/Stylesheets/StyleSpace.cs
index 3bb4e986af..637b4999d0 100644
--- a/Content.Client/Stylesheets/StyleSpace.cs
+++ b/Content.Client/Stylesheets/StyleSpace.cs
@@ -8,6 +8,7 @@ using static Robust.Client.UserInterface.StylesheetHelpers;
 
 namespace Content.Client.Stylesheets
 {
+    [Obsolete("Please use the new sheetlet system to define styles, and remove all references to this class as it may be deleted in the future")]
     public sealed class StyleSpace : StyleBase
     {
         public static readonly Color SpaceRed = Color.FromHex("#9b2236");
@@ -71,21 +72,21 @@ namespace Content.Client.Stylesheets
 
             Stylesheet = new Stylesheet(BaseRules.Concat(new StyleRule[]
             {
-                Element<Label>().Class(StyleClassLabelHeading)
+                Element<Label>().Class(StyleClass.LabelHeading)
                     .Prop(Label.StylePropertyFont, notoSansBold16)
                     .Prop(Label.StylePropertyFontColor, SpaceRed),
 
-                Element<Label>().Class(StyleClassLabelSubText)
+                Element<Label>().Class(StyleClass.LabelSubText)
                     .Prop(Label.StylePropertyFont, notoSans10)
                     .Prop(Label.StylePropertyFontColor, Color.DarkGray),
 
-                Element<PanelContainer>().Class(ClassHighDivider)
+                Element<PanelContainer>().Class(StyleClass.HighDivider)
                     .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
                     {
                         BackgroundColor = SpaceRed, ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2
                     }),
 
-                Element<PanelContainer>().Class(ClassLowDivider)
+                Element<PanelContainer>().Class(StyleClass.LowDivider)
                     .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
                     {
                         BackgroundColor = Color.FromHex("#444"),
@@ -98,19 +99,19 @@ namespace Content.Client.Stylesheets
                     .Prop(ContainerButton.StylePropertyStyleBox, BaseButton),
 
                 Element<ContainerButton>().Class(ContainerButton.StyleClassButton)
-                    .Class(ButtonOpenRight)
+                    .Class(StyleClass.ButtonOpenRight)
                     .Prop(ContainerButton.StylePropertyStyleBox, BaseButtonOpenRight),
 
                 Element<ContainerButton>().Class(ContainerButton.StyleClassButton)
-                    .Class(ButtonOpenLeft)
+                    .Class(StyleClass.ButtonOpenLeft)
                     .Prop(ContainerButton.StylePropertyStyleBox, BaseButtonOpenLeft),
 
                 Element<ContainerButton>().Class(ContainerButton.StyleClassButton)
-                    .Class(ButtonOpenBoth)
+                    .Class(StyleClass.ButtonOpenBoth)
                     .Prop(ContainerButton.StylePropertyStyleBox, BaseButtonOpenBoth),
 
                 Element<ContainerButton>().Class(ContainerButton.StyleClassButton)
-                    .Class(ButtonSquare)
+                    .Class(StyleClass.ButtonSquare)
                     .Prop(ContainerButton.StylePropertyStyleBox, BaseButtonSquare),
 
                 // Colors for the buttons.
@@ -131,19 +132,19 @@ namespace Content.Client.Stylesheets
                     .Prop(Control.StylePropertyModulateSelf, ButtonColorDisabled),
 
                 // Colors for the caution buttons.
-                Element<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(ButtonCaution)
+                Element<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(StyleClass.Negative)
                     .Pseudo(ContainerButton.StylePseudoClassNormal)
                     .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionDefault),
 
-                Element<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(ButtonCaution)
+                Element<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(StyleClass.Negative)
                     .Pseudo(ContainerButton.StylePseudoClassHover)
                     .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionHovered),
 
-                Element<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(ButtonCaution)
+                Element<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(StyleClass.Negative)
                     .Pseudo(ContainerButton.StylePseudoClassPressed)
                     .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionPressed),
 
-                Element<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(ButtonCaution)
+                Element<ContainerButton>().Class(ContainerButton.StyleClassButton).Class(StyleClass.Negative)
                     .Pseudo(ContainerButton.StylePseudoClassDisabled)
                     .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionDisabled),
 
@@ -151,7 +152,7 @@ namespace Content.Client.Stylesheets
                 Element<Label>().Class(ContainerButton.StyleClassButton)
                     .Prop(Label.StylePropertyAlignMode, Label.AlignMode.Center),
 
-                Element<PanelContainer>().Class(ClassAngleRect)
+                Element<PanelContainer>().Class(StyleClass.BackgroundPanel)
                     .Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#202030")),
 
diff --git a/Content.Client/Stylesheets/StylesheetHelpers.cs b/Content.Client/Stylesheets/StylesheetHelpers.cs
new file mode 100644
index 0000000000..2cd2ec4e2b
--- /dev/null
+++ b/Content.Client/Stylesheets/StylesheetHelpers.cs
@@ -0,0 +1,171 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using static Robust.Client.UserInterface.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets;
+
+public static class StylesheetHelpers
+{
+    public static MutableSelector Modulate(this MutableSelector selector, Color modulate)
+    {
+        return selector.Prop(Control.StylePropertyModulateSelf, modulate);
+    }
+
+    public static MutableSelector Margin(this MutableSelector selector, Thickness margin)
+    {
+        return selector.Prop(nameof(Control.Margin), margin);
+    }
+
+    public static MutableSelector Margin(this MutableSelector selector, float margin)
+    {
+        return selector.Margin(new Thickness(margin));
+    }
+
+    public static MutableSelector MinWidth(this MutableSelector selector, float width)
+    {
+        return selector.Prop(nameof(Control.MinWidth), width);
+    }
+
+    public static MutableSelector MinHeight(this MutableSelector selector, float height)
+    {
+        return selector.Prop(nameof(Control.MinHeight), height);
+    }
+
+    public static MutableSelector MinSize(this MutableSelector selector, Vector2 size)
+    {
+        return selector.MinWidth(size.X).MinHeight(size.Y);
+    }
+
+    public static MutableSelector MaxWidth(this MutableSelector selector, float width)
+    {
+        return selector.Prop(nameof(Control.MaxWidth), width);
+    }
+
+    public static MutableSelector MaxHeight(this MutableSelector selector, float height)
+    {
+        return selector.Prop(nameof(Control.MaxHeight), height);
+    }
+
+    public static MutableSelector MaxSize(this MutableSelector selector, Vector2 size)
+    {
+        return selector.MaxWidth(size.X).MaxHeight(size.Y);
+    }
+
+    public static MutableSelector SetWidth(this MutableSelector selector, float width)
+    {
+        return selector.Prop(nameof(Control.SetWidth), width);
+    }
+
+    public static MutableSelector SetHeight(this MutableSelector selector, float height)
+    {
+        return selector.Prop(nameof(Control.SetHeight), height);
+    }
+
+    public static MutableSelector SetSize(this MutableSelector selector, Vector2 size)
+    {
+        return selector.SetWidth(size.X).SetHeight(size.Y);
+    }
+
+    public static MutableSelector HorizontalExpand(this MutableSelector selector, bool val)
+    {
+        return selector.Prop(nameof(Control.HorizontalExpand), val);
+    }
+
+    public static MutableSelector VerticalExpand(this MutableSelector selector, bool val)
+    {
+        return selector.Prop(nameof(Control.VerticalExpand), val);
+    }
+
+    public static MutableSelector HorizontalAlignment(this MutableSelector selector, Control.HAlignment val)
+    {
+        return selector.Prop(nameof(Control.HorizontalExpand), val);
+    }
+
+    public static MutableSelector VerticalAlignment(this MutableSelector selector, Control.VAlignment val)
+    {
+        return selector.Prop(nameof(Control.VerticalExpand), val);
+    }
+
+    public static MutableSelector AlignMode(this MutableSelector selector, Label.AlignMode mode)
+    {
+        return selector.Prop(Label.StylePropertyAlignMode, mode);
+    }
+
+    // Pseudo class helpers
+
+    public static MutableSelectorElement PseudoNormal(this MutableSelectorElement selector)
+    {
+        return selector.Pseudo(ContainerButton.StylePseudoClassNormal);
+    }
+
+    public static MutableSelectorElement PseudoHovered(this MutableSelectorElement selector)
+    {
+        return selector.Pseudo(ContainerButton.StylePseudoClassHover);
+    }
+
+    public static MutableSelectorElement PseudoPressed(this MutableSelectorElement selector)
+    {
+        return selector.Pseudo(ContainerButton.StylePseudoClassPressed);
+    }
+
+    public static MutableSelectorElement PseudoDisabled(this MutableSelectorElement selector)
+    {
+        return selector.Pseudo(ContainerButton.StylePseudoClassDisabled);
+    }
+
+    public static MutableSelectorElement MaybeClass(this MutableSelectorElement selector, string? styleclass)
+    {
+        if (styleclass is { } c)
+            return selector.Class(c);
+
+        return selector;
+    }
+
+    public static MutableSelectorElement E<T>() where T : Control
+    {
+        return new MutableSelectorElement { Type = typeof(T) };
+    }
+
+    public static MutableSelectorElement E()
+    {
+        return new MutableSelectorElement();
+    }
+
+    public static MutableSelector Panel(this MutableSelector selector, StyleBox panel)
+    {
+        return selector.Prop(PanelContainer.StylePropertyPanel, panel);
+    }
+
+    public static MutableSelector Box(this MutableSelector selector, StyleBox box)
+    {
+        return selector.Prop(ContainerButton.StylePropertyStyleBox, box);
+    }
+
+    public static MutableSelector Font(this MutableSelector selector, Font font)
+    {
+        return selector.Prop(Label.StylePropertyFont, font);
+    }
+
+    public static MutableSelector FontColor(this MutableSelector selector, Color fontColor)
+    {
+        return selector.Prop(Label.StylePropertyFontColor, fontColor);
+    }
+
+    public static StyleBoxTexture IntoPatch(this Texture texture, StyleBox.Margin patchMargin, float amount)
+    {
+        var stylebox = new StyleBoxTexture
+        {
+            Texture = texture,
+        };
+        stylebox.SetPatchMargin(patchMargin, amount);
+
+        return stylebox;
+    }
+
+    public static MutableSelectorChild ParentOf(this MutableSelector selector, MutableSelector other)
+    {
+        return Child().Parent(selector).Child(other);
+    }
+}
diff --git a/Content.Client/Stylesheets/StylesheetManager.cs b/Content.Client/Stylesheets/StylesheetManager.cs
index 4c767bd554..b03fcdf497 100644
--- a/Content.Client/Stylesheets/StylesheetManager.cs
+++ b/Content.Client/Stylesheets/StylesheetManager.cs
@@ -1,23 +1,79 @@
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Client.Stylesheets.Stylesheets;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
-using Robust.Shared.IoC;
+using Robust.Shared.Reflection;
 
 namespace Content.Client.Stylesheets
 {
     public sealed class StylesheetManager : IStylesheetManager
     {
+        [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
-        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IReflectionManager _reflection = default!;
 
+        [Dependency]
+        private readonly IResourceCache
+            _resCache = default!; // TODO: REMOVE (obsolete; used to construct StyleNano/StyleSpace)
+
+        public Stylesheet SheetNanotrasen { get; private set; } = default!;
+        public Stylesheet SheetSystem { get; private set; } = default!;
+
+        [Obsolete("Update to use SheetNanotrasen instead")]
         public Stylesheet SheetNano { get; private set; } = default!;
+
+        [Obsolete("Update to use SheetSystem instead")]
         public Stylesheet SheetSpace { get; private set; } = default!;
 
+        private Dictionary<string, Stylesheet> Stylesheets { get; set; } = default!;
+
+        public bool TryGetStylesheet(string name, [MaybeNullWhen(false)] out Stylesheet stylesheet)
+        {
+            return Stylesheets.TryGetValue(name, out stylesheet);
+        }
+
+        public HashSet<Type> UnusedSheetlets { get; private set; } = [];
+
         public void Initialize()
         {
-            SheetNano = new StyleNano(_resourceCache).Stylesheet;
-            SheetSpace = new StyleSpace(_resourceCache).Stylesheet;
+            var sawmill = _logManager.GetSawmill("style");
+            sawmill.Debug("Initializing Stylesheets...");
+            var sw = Stopwatch.StartNew();
 
-            _userInterfaceManager.Stylesheet = SheetNano;
+            // add all sheetlets to the hashset
+            var tys = _reflection.FindTypesWithAttribute<CommonSheetletAttribute>();
+            UnusedSheetlets = [..tys];
+
+            Stylesheets = new Dictionary<string, Stylesheet>();
+            SheetNanotrasen = Init(new NanotrasenStylesheet(new BaseStylesheet.NoConfig(), this));
+            SheetSystem = Init(new SystemStylesheet(new BaseStylesheet.NoConfig(), this));
+            SheetNano = new StyleNano(_resCache).Stylesheet; // TODO: REMOVE (obsolete)
+            SheetSpace = new StyleSpace(_resCache).Stylesheet; // TODO: REMOVE (obsolete)
+
+            _userInterfaceManager.Stylesheet = SheetNanotrasen;
+
+            // warn about unused sheetlets
+            if (UnusedSheetlets.Count > 0)
+            {
+                var sheetlets = UnusedSheetlets.AsEnumerable()
+                    .Take(5)
+                    .Select(t => t.FullName ?? "<could not get FullName>")
+                    .ToArray();
+                sawmill.Error($"There are unloaded sheetlets: {string.Join(", ", sheetlets)}");
+            }
+
+            sawmill.Debug($"Initialized {_styleRuleCount} style rules in {sw.Elapsed}");
+        }
+
+        private int _styleRuleCount;
+
+        private Stylesheet Init(BaseStylesheet baseSheet)
+        {
+            Stylesheets.Add(baseSheet.StylesheetName, baseSheet.Stylesheet);
+            _styleRuleCount += baseSheet.Stylesheet.Rules.Count;
+            return baseSheet.Stylesheet;
         }
     }
 }
diff --git a/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.Palettes.cs b/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.Palettes.cs
new file mode 100644
index 0000000000..df190154f8
--- /dev/null
+++ b/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.Palettes.cs
@@ -0,0 +1,12 @@
+using Content.Client.Stylesheets.Palette;
+
+namespace Content.Client.Stylesheets.Stylesheets;
+
+public sealed partial class NanotrasenStylesheet
+{
+    public override ColorPalette PrimaryPalette => Palettes.Navy;
+    public override ColorPalette SecondaryPalette => Palettes.Slate;
+    public override ColorPalette PositivePalette => Palettes.Green;
+    public override ColorPalette NegativePalette => Palettes.Red;
+    public override ColorPalette HighlightPalette => Palettes.Gold;
+}
diff --git a/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.cs b/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.cs
new file mode 100644
index 0000000000..eb8472d98e
--- /dev/null
+++ b/Content.Client/Stylesheets/Stylesheets/NanotrasenStylesheet.cs
@@ -0,0 +1,62 @@
+using System.Linq;
+using Content.Client.Stylesheets.Fonts;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.StylesheetHelpers;
+
+namespace Content.Client.Stylesheets.Stylesheets;
+
+[Virtual]
+public partial class NanotrasenStylesheet : CommonStylesheet
+{
+    public override string StylesheetName => "Nanotrasen";
+
+    public override NotoFontFamilyStack BaseFont { get; } // TODO: NotoFontFamilyStack is temporary
+
+
+    public static readonly ResPath TextureRoot = new("/Textures/Interface/Nano");
+
+    public override Dictionary<Type, ResPath[]> Roots => new()
+    {
+        { typeof(TextureResource), [TextureRoot] },
+    };
+
+    private const int PrimaryFontSize = 12;
+    private const int FontSizeStep = 2;
+
+    // why? see InterfaceStylesheet.cs
+    // ReSharper disable once UseCollectionExpression
+    private readonly List<(string?, int)> _commonFontSizes = new()
+    {
+        (null, PrimaryFontSize),
+        (StyleClass.FontSmall, PrimaryFontSize - FontSizeStep),
+        (StyleClass.FontLarge, PrimaryFontSize + FontSizeStep),
+    };
+
+    public NanotrasenStylesheet(object config, StylesheetManager man) : base(config)
+    {
+        BaseFont = new NotoFontFamilyStack(ResCache);
+        var rules = new[]
+        {
+            // Set up important rules that need to go first.
+            GetRulesForFont(null, BaseFont, _commonFontSizes),
+            // Set up our core rules.
+            [
+                // Declare the default font.
+                Element().Prop(Label.StylePropertyFont, BaseFont.GetFont(PrimaryFontSize)),
+                // Branding.
+                Element<TextureRect>()
+                    .Class("NTLogoDark")
+                    .Prop(TextureRect.StylePropertyTexture, GetTexture(new ResPath("ntlogo.svg.png")))
+                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#757575")),
+            ],
+            // Finally, load all the other sheetlets.
+            GetAllSheetletRules<PalettedStylesheet, CommonSheetletAttribute>(man),
+            GetAllSheetletRules<NanotrasenStylesheet, CommonSheetletAttribute>(man),
+        };
+
+        Stylesheet = new Stylesheet(rules.SelectMany(x => x).ToArray());
+    }
+}
diff --git a/Content.Client/Stylesheets/Stylesheets/SystemStylesheet.Palettes.cs b/Content.Client/Stylesheets/Stylesheets/SystemStylesheet.Palettes.cs
new file mode 100644
index 0000000000..6d8430b4ad
--- /dev/null
+++ b/Content.Client/Stylesheets/Stylesheets/SystemStylesheet.Palettes.cs
@@ -0,0 +1,12 @@
+using Content.Client.Stylesheets.Palette;
+
+namespace Content.Client.Stylesheets.Stylesheets;
+
+public partial class SystemStylesheet
+{
+    public override ColorPalette PrimaryPalette => Palettes.Cyan;
+    public override ColorPalette SecondaryPalette => Palettes.Neutral;
+    public override ColorPalette PositivePalette => Palettes.Green;
+    public override ColorPalette NegativePalette => Palettes.Red;
+    public override ColorPalette HighlightPalette => Palettes.Maroon;
+}
diff --git a/Content.Client/Stylesheets/Stylesheets/SystemStylesheet.cs b/Content.Client/Stylesheets/Stylesheets/SystemStylesheet.cs
new file mode 100644
index 0000000000..d8c2dd2b97
--- /dev/null
+++ b/Content.Client/Stylesheets/Stylesheets/SystemStylesheet.cs
@@ -0,0 +1,56 @@
+using System.Linq;
+using Content.Client.Stylesheets.Fonts;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Utility;
+using static Robust.Client.UserInterface.StylesheetHelpers;
+
+
+namespace Content.Client.Stylesheets.Stylesheets;
+
+[Virtual]
+public partial class SystemStylesheet : CommonStylesheet
+{
+    public override string StylesheetName => "System";
+
+    public override NotoFontFamilyStack BaseFont { get; } // TODO: NotoFontFamilyStack is temporary
+
+    public override Dictionary<Type, ResPath[]> Roots => new()
+    {
+        { typeof(TextureResource), [] },
+    };
+
+    private const int PrimaryFontSize = 12;
+    private const int FontSizeStep = 2;
+
+    // for some GOD FORSAKEN REASON if I use a collection expression here it throws a sandbox error
+    // Thanks ReSharper, this was very fun to find in the ~40 files I last committed
+    // ReSharper disable once UseCollectionExpression
+    private readonly List<(string?, int)> _commonFontSizes = new()
+    {
+        (null, PrimaryFontSize),
+        (StyleClass.FontSmall, PrimaryFontSize - FontSizeStep),
+        (StyleClass.FontLarge, PrimaryFontSize + FontSizeStep),
+    };
+
+    public SystemStylesheet(object config, StylesheetManager man) : base(config)
+    {
+        BaseFont = new NotoFontFamilyStack(ResCache);
+        var rules = new[]
+        {
+            // Set up important rules that need to go first.
+            GetRulesForFont(null, BaseFont, _commonFontSizes),
+            // Set up our core rules.
+            [
+                // Declare the default font.
+                Element().Prop(Label.StylePropertyFont, BaseFont.GetFont(PrimaryFontSize)),
+            ],
+            // Finally, load all the other sheetlets.
+            GetAllSheetletRules<PalettedStylesheet, CommonSheetletAttribute>(man),
+            GetAllSheetletRules<SystemStylesheet, CommonSheetletAttribute>(man),
+        };
+
+        Stylesheet = new Stylesheet(rules.SelectMany(x => x).ToArray());
+    }
+}
diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs
index 25d5907b05..879f1fd9b5 100644
--- a/Content.Client/Tabletop/TabletopSystem.cs
+++ b/Content.Client/Tabletop/TabletopSystem.cs
@@ -36,7 +36,7 @@ namespace Content.Client.Tabletop
         private float _timePassed; // Time passed since last update sent to the server.
         private EntityUid? _draggedEntity; // Entity being dragged
         private ScalingViewport? _viewport; // Viewport currently being used
-        private DefaultWindow? _window; // Current open tabletop window (only allow one at a time)
+        private BaseWindow? _window; // Current open tabletop window (only allow one at a time)
         private EntityUid? _table; // The table entity of the currently open game session
 
         public override void Initialize()
diff --git a/Content.Client/Temperature/Systems/TemperatureSystem.cs b/Content.Client/Temperature/Systems/TemperatureSystem.cs
new file mode 100644
index 0000000000..94a1e836e8
--- /dev/null
+++ b/Content.Client/Temperature/Systems/TemperatureSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Temperature.Systems;
+
+namespace Content.Client.Temperature.Systems;
+
+/// <summary>
+/// This exists so <see cref="SharedTemperatureSystem"/> runs on client/>
+/// </summary>
+public sealed class TemperatureSystem : SharedTemperatureSystem;
diff --git a/Content.Client/Thief/ThiefBackpackSet.xaml b/Content.Client/Thief/ThiefBackpackSet.xaml
index 0d8b5e24f7..817de21031 100644
--- a/Content.Client/Thief/ThiefBackpackSet.xaml
+++ b/Content.Client/Thief/ThiefBackpackSet.xaml
@@ -8,7 +8,7 @@
 			</PanelContainer.PanelOverride>
 			<BoxContainer Orientation="Vertical" HorizontalExpand="True">
 			<GridContainer Margin="5" Columns="2" MinSize="600 0">
-				<Label Name="SetName" Text="Set" StyleClasses="StatusFieldTitle"></Label>
+				<Label Name="SetName" Text="Set" StyleClasses="highlight"></Label>
 				<Button Margin="0 10" Name="SetButton" Text="Select" StyleClasses="OpenRight" Access="Public" HorizontalAlignment="Right"/>
 			</GridContainer>
 			<controls:HLine Color="#404040" Thickness="1" Margin="0 5"/>
diff --git a/Content.Client/Tools/Components/MultipleToolComponent.cs b/Content.Client/Tools/Components/MultipleToolComponent.cs
index 5a7aeb5cb4..8748a51a4f 100644
--- a/Content.Client/Tools/Components/MultipleToolComponent.cs
+++ b/Content.Client/Tools/Components/MultipleToolComponent.cs
@@ -15,7 +15,7 @@ namespace Content.Client.Tools.Components
         public MultipleToolStatusControl(MultipleToolComponent parent)
         {
             _parent = parent;
-            _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+            _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
             _label.SetMarkup(_parent.StatusShowBehavior ? _parent.CurrentQualityName : string.Empty);
             AddChild(_label);
         }
diff --git a/Content.Client/Tools/UI/WelderStatusControl.cs b/Content.Client/Tools/UI/WelderStatusControl.cs
index 3d44d6fa84..de56286641 100644
--- a/Content.Client/Tools/UI/WelderStatusControl.cs
+++ b/Content.Client/Tools/UI/WelderStatusControl.cs
@@ -20,7 +20,7 @@ public sealed class WelderStatusControl : PollingItemStatusControl<WelderStatusC
         _parent = parent;
         _entityManager = entityManager;
         _toolSystem = toolSystem;
-        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+        _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
         AddChild(_label);
 
         UpdateDraw();
diff --git a/Content.Client/UserInterface/Controls/DatePicker.xaml b/Content.Client/UserInterface/Controls/DatePicker.xaml
new file mode 100644
index 0000000000..e1dd4e1cd7
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/DatePicker.xaml
@@ -0,0 +1,7 @@
+<Control xmlns="https://spacestation14.io">
+    <BoxContainer Orientation="Horizontal" >
+        <LineEdit Name="DayLineEdit" PlaceHolder="{Loc 'datepicker-day'}" Margin="4 4" MinWidth="38" />
+        <OptionButton Name="MonthOptionButton" Margin="4 4" MinWidth="120" />
+        <LineEdit Name="YearLineEdit" PlaceHolder="{Loc 'datepicker-year'}" Margin="4 4" MinWidth="55" />
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/UserInterface/Controls/DatePicker.xaml.cs b/Content.Client/UserInterface/Controls/DatePicker.xaml.cs
new file mode 100644
index 0000000000..189182df19
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/DatePicker.xaml.cs
@@ -0,0 +1,84 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.UserInterface.Controls;
+
+/// <summary>
+/// An input control for dates.
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class DatePicker : Control
+{
+    /// <summary>
+    /// Raised when <see cref="SelectedDate"> is changed.
+    /// </summary>
+    public event Action? OnChanged;
+
+    /// <summary>
+    /// The date currently selected by the input, or null if it's not a valid date.
+    /// </summary>
+    public DateOnly? SelectedDate;
+
+    /// <summary>
+    /// The oldest possible date that the user can select.
+    /// </summary>
+    public DateOnly MinDate = DateOnly.MinValue;
+
+    /// <summary>
+    /// The most recent date that the user can select.
+    /// </summary>
+    public DateOnly MaxDate = DateOnly.MaxValue;
+
+    /// <summary>
+    /// True if a valid date is selected.
+    /// </summary>
+    public bool IsValid => SelectedDate is not null;
+
+    public DatePicker()
+    {
+        RobustXamlLoader.Load(this);
+
+        MonthOptionButton.AddItem(Loc.GetString("datepicker-month"), 0);
+        for (var i = 1; i <= 12; i++)
+        {
+            MonthOptionButton.AddItem(Loc.GetString($"month-{i}"), i);
+        }
+
+        DayLineEdit.OnTextChanged += _ => Update();
+        YearLineEdit.OnTextChanged += _ => Update();
+        MonthOptionButton.OnItemSelected += args => {
+            if (args.Id != 0)
+            {
+                MonthOptionButton.SelectId(args.Id);
+            }
+            Update();
+        };
+    }
+
+    private void Update()
+    {
+        var monthNum = MonthOptionButton.SelectedId;
+
+        DateOnly? newDate = null;
+
+        if (int.TryParse(YearLineEdit.Text, out var year)
+            && int.TryParse(DayLineEdit.Text, out var day)
+            && monthNum != 0
+        )
+        {
+            newDate = new DateOnly(year, monthNum, day);
+        }
+
+        if (newDate < MinDate || newDate > MaxDate)
+        {
+            newDate = null;
+        }
+
+        if (SelectedDate != newDate)
+        {
+            SelectedDate = newDate;
+            OnChanged?.Invoke();
+        }
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/FancyWindow.xaml b/Content.Client/UserInterface/Controls/FancyWindow.xaml
index 6195d6aea8..3ec29054ae 100644
--- a/Content.Client/UserInterface/Controls/FancyWindow.xaml
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml
@@ -3,12 +3,12 @@
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       MouseFilter="Stop"
                       MinWidth="200" MinHeight="150">
-    <PanelContainer StyleClasses="AngleRect" />
+    <PanelContainer StyleClasses="BackgroundPanel" />
 
     <BoxContainer Orientation="Vertical">
         <Control>
-            <PanelContainer StyleClasses="WindowHeadingBackground" />
-            <BoxContainer Margin="4 2 8 0" Orientation="Horizontal">
+            <PanelContainer StyleClasses="WindowHeadingBackground" Name="WindowHeader" />
+            <BoxContainer Margin="4 2 4 0" Orientation="Horizontal">
                 <Label Name="WindowTitle"
                        HorizontalExpand="True" VAlign="Center" StyleClasses="FancyWindowTitle" ClipText="true" />
                 <TextureButton Name="HelpButton" StyleClasses="windowHelpButton" VerticalAlignment="Center" Disabled="True" Visible="False" Access="Public" />
@@ -17,6 +17,6 @@
             </BoxContainer>
         </Control>
         <PanelContainer StyleClasses="LowDivider" />
-        <Control Access="Public" Name="ContentsContainer" Margin="0 2" RectClipContent="True" VerticalExpand="true" />
+        <Control Access="Public" Name="ContentsContainer" StyleClasses="WindowContentsContainer" RectClipContent="True" VerticalExpand="true" />
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
index 71d0066a79..a761ab2e1d 100644
--- a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Client.Guidebook;
 using Content.Client.Guidebook.Components;
+using Content.Client.Stylesheets;
 using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
@@ -14,13 +15,17 @@ namespace Content.Client.UserInterface.Controls
     public partial class FancyWindow : BaseWindow
     {
         [Dependency] private readonly IEntitySystemManager _sysMan = default!;
+        [Dependency] private readonly IStylesheetManager _styleMan = default!;
         private GuidebookSystem? _guidebookSystem;
         private const int DRAG_MARGIN_SIZE = 7;
+
         public const string StyleClassWindowHelpButton = "windowHelpButton";
+        public const string StyleClassWindowCloseButton = "windowCloseButton";
 
         public FancyWindow()
         {
             RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
 
             CloseButton.OnPressed += _ => Close();
             HelpButton.OnPressed += _ => Help();
@@ -33,7 +38,21 @@ namespace Content.Client.UserInterface.Controls
             set => WindowTitle.Text = value;
         }
 
+        private string? _stylesheet;
+
+        public new string? Stylesheet
+        {
+            get => _stylesheet;
+            set
+            {
+                _stylesheet = value;
+                if (value is not null && _styleMan.TryGetStylesheet(value, out var stylesheet))
+                    base.Stylesheet = stylesheet;
+            }
+        }
+
         private List<ProtoId<GuideEntryPrototype>>? _helpGuidebookIds;
+
         public List<ProtoId<GuideEntryPrototype>>? HelpGuidebookIds
         {
             get => _helpGuidebookIds;
@@ -80,6 +99,9 @@ namespace Content.Client.UserInterface.Controls
 
             return mode;
         }
+
+        public string HeaderClass { set => WindowHeader.SetOnlyStyleClass(value); }
+        public string TitleClass { set => WindowTitle.SetOnlyStyleClass(value); }
     }
 
     /// <summary>
diff --git a/Content.Client/UserInterface/Controls/HLine.cs b/Content.Client/UserInterface/Controls/HLine.cs
index 656768cd2b..849f5003d0 100644
--- a/Content.Client/UserInterface/Controls/HLine.cs
+++ b/Content.Client/UserInterface/Controls/HLine.cs
@@ -6,41 +6,36 @@ using Robust.Shared.Maths;
 
 namespace Content.Client.UserInterface.Controls;
 
-public sealed class HLine : Container
+public sealed class HLine : PanelContainer
 {
     public Color? Color
     {
         get
         {
-            if (_line.PanelOverride is StyleBoxFlat styleBox) return styleBox.BackgroundColor;
+            StyleBox box;
+            if (PanelOverride != null)
+                box = PanelOverride;
+            if (TryGetStyleProperty<StyleBox>(StylePropertyPanel, out var _box))
+                box = _box;
+            else
+                return null;
+
+            if (box is StyleBoxFlat boxFlat)
+                return boxFlat.BackgroundColor;
             return null;
         }
-        set
-        {
-            if (_line.PanelOverride is StyleBoxFlat styleBox) styleBox.BackgroundColor = value!.Value;
-        }
+        set =>
+            // should use style classes instead in ui code but keeping this functionality for consistency
+            PanelOverride = new StyleBoxFlat() { BackgroundColor = value!.Value };
     }
 
-    public float? Thickness {
-        get
-        {
-            if (_line.PanelOverride is StyleBoxFlat styleBox) return styleBox.ContentMarginTopOverride;
-            return null;
-        }
-        set
-        {
-            if (_line.PanelOverride is StyleBoxFlat styleBox) styleBox.ContentMarginTopOverride = value!.Value;
-        }
+    public float? Thickness
+    {
+        get => MinHeight;
+        set => MinHeight = value!.Value;
     }
 
-    private readonly PanelContainer _line;
-
     public HLine()
     {
-        _line = new PanelContainer();
-        _line.PanelOverride = new StyleBoxFlat();
-        _line.PanelOverride.ContentMarginTopOverride = Thickness;
-        AddChild(_line);
     }
-
 }
diff --git a/Content.Client/UserInterface/Controls/HighDivider.cs b/Content.Client/UserInterface/Controls/HighDivider.cs
index c71dba31b1..1b15badcb2 100644
--- a/Content.Client/UserInterface/Controls/HighDivider.cs
+++ b/Content.Client/UserInterface/Controls/HighDivider.cs
@@ -8,7 +8,7 @@ namespace Content.Client.UserInterface.Controls
     {
         public HighDivider()
         {
-            Children.Add(new PanelContainer {StyleClasses = {StyleBase.ClassHighDivider}});
+            Children.Add(new PanelContainer {StyleClasses = {StyleClass.HighDivider}});
         }
     }
 }
diff --git a/Content.Client/UserInterface/Controls/ListContainer.cs b/Content.Client/UserInterface/Controls/ListContainer.cs
index 0bd7d32215..53dddf110c 100644
--- a/Content.Client/UserInterface/Controls/ListContainer.cs
+++ b/Content.Client/UserInterface/Controls/ListContainer.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using JetBrains.Annotations;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
@@ -385,6 +386,7 @@ public sealed class ListContainerButton : ContainerButton, IEntityControl
         AddStyleClass(StyleClassButton);
         Data = data;
         Index = index;
+        StyleBoxOverride = new StyleBoxFlat(Color.White);
         // AddChild(Background = new PanelContainer
         // {
         //     HorizontalExpand = true,
diff --git a/Content.Client/UserInterface/Controls/MenuButton.cs b/Content.Client/UserInterface/Controls/MenuButton.cs
index a0ba21da74..24767c2201 100644
--- a/Content.Client/UserInterface/Controls/MenuButton.cs
+++ b/Content.Client/UserInterface/Controls/MenuButton.cs
@@ -13,17 +13,14 @@ public sealed class MenuButton : ContainerButton
 {
     [Dependency] private readonly IInputManager _inputManager = default!;
     public const string StyleClassLabelTopButton = "topButtonLabel";
-    public const string StyleClassRedTopButton = "topButtonLabel";
+    // public const string StyleClassRedTopButton = "topButtonLabel";
 
-    private static readonly Color ColorNormal = Color.FromHex("#7b7e9e");
-    private static readonly Color ColorRedNormal = Color.FromHex("#FEFEFE");
-    private static readonly Color ColorHovered = Color.FromHex("#9699bb");
-    private static readonly Color ColorRedHovered = Color.FromHex("#FFFFFF");
-    private static readonly Color ColorPressed = Color.FromHex("#789B8C");
+    // TODO: KIIIIIILLLLLLLLLLLLLLLLLLLLLLLLLLL --kaylie.
+    private static readonly Color ColorNormal = Color.FromHex("#99a7b3"); // primary color[0] + 0.24 L
+    private static readonly Color ColorHovered = Color.FromHex("#acbac6"); // primary color[0] + 0.30 L
+    private static readonly Color ColorPressed = Color.FromHex("#75838e"); // primary color[0] + 0.12 L
 
-    private const float VertPad = 8f;
-    private Color NormalColor => HasStyleClass(StyleClassRedTopButton) ? ColorRedNormal : ColorNormal;
-    private Color HoveredColor => HasStyleClass(StyleClassRedTopButton) ? ColorRedHovered : ColorHovered;
+    private const float VertPad = 4f;
 
     private BoundKeyFunction? _function;
     private readonly BoxContainer _root;
@@ -55,14 +52,14 @@ public sealed class MenuButton : ContainerButton
             VerticalAlignment = VAlignment.Center,
             VerticalExpand = true,
             Margin = new Thickness(0, VertPad),
-            ModulateSelfOverride = NormalColor,
+            ModulateSelfOverride = ColorNormal,
             Stretch = TextureRect.StretchMode.KeepCentered
         };
         _buttonLabel = new Label
         {
             Text = "",
             HorizontalAlignment = HAlignment.Center,
-            ModulateSelfOverride = NormalColor,
+            ModulateSelfOverride = ColorNormal,
             StyleClasses = {StyleClassLabelTopButton}
         };
         _root = new BoxContainer
@@ -116,8 +113,8 @@ public sealed class MenuButton : ContainerButton
         switch (DrawMode)
         {
             case DrawModeEnum.Normal:
-                _buttonIcon.ModulateSelfOverride = NormalColor;
-                _buttonLabel.ModulateSelfOverride = NormalColor;
+                _buttonIcon.ModulateSelfOverride = ColorNormal;
+                _buttonLabel.ModulateSelfOverride = ColorNormal;
                 break;
 
             case DrawModeEnum.Pressed:
@@ -126,8 +123,8 @@ public sealed class MenuButton : ContainerButton
                 break;
 
             case DrawModeEnum.Hover:
-                _buttonIcon.ModulateSelfOverride = HoveredColor;
-                _buttonLabel.ModulateSelfOverride = HoveredColor;
+                _buttonIcon.ModulateSelfOverride = ColorHovered;
+                _buttonLabel.ModulateSelfOverride = ColorHovered;
                 break;
 
             case DrawModeEnum.Disabled:
diff --git a/Content.Client/UserInterface/Controls/NanoHeading.cs b/Content.Client/UserInterface/Controls/NanoHeading.cs
index a02ac0835d..2ba0371d33 100644
--- a/Content.Client/UserInterface/Controls/NanoHeading.cs
+++ b/Content.Client/UserInterface/Controls/NanoHeading.cs
@@ -14,7 +14,7 @@ namespace Content.Client.UserInterface.Controls
             {
                 Children = {(_label = new Label
                 {
-                    StyleClasses = {StyleNano.StyleClassLabelHeading}
+                    StyleClasses = {StyleClass.LabelHeading}
                 })}
             };
             AddChild(_panel);
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
index 54aeffe72c..6ef0e99520 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
@@ -18,7 +18,7 @@
     </LayoutContainer>
     <BoxContainer Name="TopLeft" Access="Protected" Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <menuBar:GameTopMenuBar Name="TopBar" Access="Protected" />
+            <menuBar:GameTopMenuBar Name="TopBar" Access="Public" />
             <!-- Buffer so big votes don't skew it -->
             <Control/>
         </BoxContainer>
diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
index 653302fae4..3e5ccc6486 100644
--- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
@@ -32,8 +32,8 @@
             </PanelContainer.PanelOverride>
 
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SeparationOverride="10" Margin="10">
-                <menuBar:GameTopMenuBar Name="TopBar" HorizontalExpand="True" Access="Protected" />
-                <chat:ChatBox VerticalExpand="True" HorizontalExpand="True" Name="Chat" Access="Protected" MinSize="0 0"/>
+                <menuBar:GameTopMenuBar Name="TopBar" HorizontalExpand="True" Access="Public" />
+                <chat:ChatBox StyleClasses="ChatOutput" VerticalExpand="True" HorizontalExpand="True" Name="Chat" Access="Protected" MinSize="0 0"/>
             </BoxContainer>
         </PanelContainer>
     </SplitContainer>
diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
index 2892ca4425..9fe95c63f1 100644
--- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Chat.Widgets;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -9,6 +10,9 @@ namespace Content.Client.UserInterface.Screens;
 [GenerateTypedNameReferences]
 public sealed partial class SeparatedChatGameScreen : InGameScreen
 {
+    public const string StyleClassChatContainer = "ChatContainer";
+    public const string StyleClassChatOutput = "ChatOutput";
+
     public SeparatedChatGameScreen()
     {
         RobustXamlLoader.Load(this);
diff --git a/Content.Client/UserInterface/StatValuesEui.cs b/Content.Client/UserInterface/StatValuesEui.cs
index 33035940b5..0e714817b2 100644
--- a/Content.Client/UserInterface/StatValuesEui.cs
+++ b/Content.Client/UserInterface/StatValuesEui.cs
@@ -11,7 +11,7 @@ public sealed class StatValuesEui : BaseEui
     public StatValuesEui()
     {
         _window = new StatsWindow();
-        _window.Title = "Melee stats";
+        _window.Title = Loc.GetString("stat-values-ui-title");
         _window.OpenCentered();
         _window.OnClose += Closed;
     }
diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
index be3af28b15..ec66e4a9da 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
@@ -22,6 +22,8 @@ namespace Content.Client.UserInterface.Systems.Actions.Controls;
 
 public sealed class ActionButton : Control, IEntityControl
 {
+    public const string StyleClassActionHighlightRect = "ActionHighlightRect";
+
     private IEntityManager _entities;
     private IPlayerManager _player;
     private SpriteSystem? _spriteSys;
@@ -79,7 +81,7 @@ public sealed class ActionButton : Control, IEntityControl
         };
         HighlightRect = new PanelContainer
         {
-            StyleClasses = {StyleNano.StyleClassHandSlotHighlight},
+            StyleClasses = { StyleClassActionHighlightRect },
             MinSize = new Vector2(32, 32),
             Visible = false
         };
diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionTooltip.xaml b/Content.Client/UserInterface/Systems/Actions/Controls/ActionTooltip.xaml
deleted file mode 100644
index 22893ccef4..0000000000
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionTooltip.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<controls:ActionTooltip
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Actions.Controls"
-    StyleClasses="StyleClassTooltipPanel">
-    <BoxContainer Orientation="Vertical" RectClipContent="True">
-        <RichTextLabel MaxWidth="350" StyleClasses="StyleClassTooltipActionTitle"/>
-        <RichTextLabel MaxWidth="350" StyleClasses="StyleClassTooltipActionDescription"/>
-        <RichTextLabel MaxWidth="350" StyleClasses="StyleClassTooltipActionCharges"/>
-    </BoxContainer>
-</controls:ActionTooltip>
diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionTooltip.xaml.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionTooltip.xaml.cs
deleted file mode 100644
index 92d9b50ebe..0000000000
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionTooltip.xaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client.UserInterface.Systems.Actions.Controls;
-
-[GenerateTypedNameReferences]
-public sealed partial class ActionTooltip : PanelContainer
-{
-    public ActionTooltip()
-    {
-        RobustXamlLoader.Load(this);
-    }
-}
diff --git a/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs b/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs
index f972a96eb7..4aaabb3d05 100644
--- a/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Windows/ActionsWindow.xaml.cs
@@ -8,6 +8,8 @@ namespace Content.Client.UserInterface.Systems.Actions.Windows;
 [GenerateTypedNameReferences]
 public sealed partial class ActionsWindow : DefaultWindow
 {
+    public const string StyleClassActionSearchBox = "actionSearchBox";
+
     public MultiselectOptionButton<Filters> FilterButton { get; private set; }
 
     /// <summary>
diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
index 2b06eb7f8d..96a965f2bd 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
@@ -95,7 +95,7 @@ public sealed class GasTankWindow
         _topLabel = new Label
         {
             FontOverride = font,
-            FontColorOverride = StyleNano.NanoGold,
+           StyleClasses = { StyleClass.LabelKeyText },
             VerticalAlignment = VAlignment.Center,
             HorizontalExpand = true,
             HorizontalAlignment = HAlignment.Left,
diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
index 17cbcc38ac..d09511040b 100644
--- a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
+++ b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
@@ -232,7 +232,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
         helper.ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters
         {
             Maximized = false,
-            Title = "Admin Help",
+            Title = Loc.GetString("bwoink-admin-title"),
             Monitor = monitor,
             Width = 900,
             Height = 500
@@ -250,15 +250,15 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
 
     private void UnreadAHelpReceived()
     {
-        GameAHelpButton?.StyleClasses.Add(MenuButton.StyleClassRedTopButton);
-        LobbyAHelpButton?.StyleClasses.Add(StyleNano.StyleClassButtonColorRed);
+        GameAHelpButton?.StyleClasses.Add(StyleClass.Negative);
+        LobbyAHelpButton?.StyleClasses.Add(StyleClass.Negative);
         _hasUnreadAHelp = true;
     }
 
     private void UnreadAHelpRead()
     {
-        GameAHelpButton?.StyleClasses.Remove(MenuButton.StyleClassRedTopButton);
-        LobbyAHelpButton?.StyleClasses.Remove(StyleNano.StyleClassButtonColorRed);
+        GameAHelpButton?.StyleClasses.Remove(StyleClass.Negative);
+        LobbyAHelpButton?.StyleClasses.Remove(StyleClass.Negative);
         _hasUnreadAHelp = false;
     }
 
diff --git a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
index 50a6862b8f..bc50826cfd 100644
--- a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
+++ b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
@@ -155,7 +155,7 @@ public sealed class CharacterUIController : UIController, IOnStateEntered<Gamepl
 
             var objectiveLabel = new RichTextLabel
             {
-                StyleClasses = { StyleNano.StyleClassTooltipActionTitle }
+                StyleClasses = { StyleClass.TooltipTitle }
             };
             objectiveLabel.SetMessage(objectiveText);
 
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index e324429859..25d3d58226 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -278,7 +278,7 @@ public sealed partial class ChatUIController : UIController
                  && style is StyleBoxFlat propStyleBoxFlat)
             color = propStyleBoxFlat.BackgroundColor;
         else
-            color = StyleNano.ChatBackgroundColor;
+            color = Color.FromHex("#25252ADD");
 
         panel.PanelOverride = new StyleBoxFlat
         {
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorItemButton.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorItemButton.cs
index bf37a412e8..e96d35f825 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorItemButton.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorItemButton.cs
@@ -6,6 +6,9 @@ namespace Content.Client.UserInterface.Systems.Chat.Controls;
 
 public sealed class ChannelSelectorItemButton : Button
 {
+    public const string StyleClassChatSelectorOptionButton = "ChatSelectorOptionButton";
+
+
     public readonly ChatSelectChannel Channel;
 
     public bool IsHidden => Parent == null;
@@ -13,7 +16,7 @@ public sealed class ChannelSelectorItemButton : Button
     public ChannelSelectorItemButton(ChatSelectChannel selector)
     {
         Channel = selector;
-        AddStyleClass(StyleNano.StyleClassChatChannelSelectorButton);
+        AddStyleClass(StyleClassChatSelectorOptionButton);
 
         Text = ChannelSelectorButton.ChannelSelectorName(selector);
 
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
index 0326664bd6..e9345d25f9 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChatInputBox.xaml.cs
@@ -1,5 +1,4 @@
-using Content.Client.Stylesheets;
-using Content.Shared.Chat;
+using Content.Shared.Chat;
 using Content.Shared.Input;
 using Robust.Client.UserInterface.Controls;
 
@@ -8,6 +7,10 @@ namespace Content.Client.UserInterface.Systems.Chat.Controls;
 [Virtual]
 public class ChatInputBox : PanelContainer
 {
+    public const string StyleClassChatPanel = "ChatPanel";
+    public const string StyleClassChatLineEdit = "ChatLineEdit";
+    public const string StyleClassChatFilterOptionButton = "ChatFilterOptionButton";
+
     public readonly ChannelSelectorButton ChannelSelector;
     public readonly HistoryLineEdit Input;
     public readonly ChannelFilterButton FilterButton;
@@ -27,7 +30,7 @@ public class ChatInputBox : PanelContainer
         {
             Name = "ChannelSelector",
             ToggleMode = true,
-            StyleClasses = {"chatSelectorOptionButton"},
+            StyleClasses = { ChannelSelectorItemButton.StyleClassChatSelectorOptionButton },
             MinWidth = 75
         };
         Container.AddChild(ChannelSelector);
@@ -36,16 +39,16 @@ public class ChatInputBox : PanelContainer
             Name = "Input",
             PlaceHolder = GetChatboxInfoPlaceholder(),
             HorizontalExpand = true,
-            StyleClasses = {"chatLineEdit"}
+            StyleClasses = { StyleClassChatLineEdit }
         };
         Container.AddChild(Input);
         FilterButton = new ChannelFilterButton
         {
             Name = "FilterButton",
-            StyleClasses = {"chatFilterOptionButton"}
+            StyleClasses = { StyleClassChatFilterOptionButton }
         };
         Container.AddChild(FilterButton);
-        AddStyleClass(StyleNano.StyleClassChatSubPanel);
+        AddStyleClass(StyleClassChatPanel);
         ChannelSelector.OnChannelSelect += UpdateActiveChannel;
     }
 
@@ -56,12 +59,17 @@ public class ChatInputBox : PanelContainer
 
     private static string GetChatboxInfoPlaceholder()
     {
-        return (BoundKeyHelper.IsBound(ContentKeyFunctions.FocusChat), BoundKeyHelper.IsBound(ContentKeyFunctions.CycleChatChannelForward)) switch
-        {
-            (true, true) => Loc.GetString("hud-chatbox-info", ("talk-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.FocusChat)), ("cycle-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.CycleChatChannelForward))),
-            (true, false) => Loc.GetString("hud-chatbox-info-talk", ("talk-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.FocusChat))),
-            (false, true) => Loc.GetString("hud-chatbox-info-cycle", ("cycle-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.CycleChatChannelForward))),
-            (false, false) => Loc.GetString("hud-chatbox-info-unbound")
-        };
+        return (BoundKeyHelper.IsBound(ContentKeyFunctions.FocusChat),
+                BoundKeyHelper.IsBound(ContentKeyFunctions.CycleChatChannelForward)) switch
+            {
+                (true, true) => Loc.GetString("hud-chatbox-info",
+                    ("talk-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.FocusChat)),
+                    ("cycle-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.CycleChatChannelForward))),
+                (true, false) => Loc.GetString("hud-chatbox-info-talk",
+                    ("talk-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.FocusChat))),
+                (false, true) => Loc.GetString("hud-chatbox-info-cycle",
+                    ("cycle-key", BoundKeyHelper.ShortKeyName(ContentKeyFunctions.CycleChatChannelForward))),
+                (false, false) => Loc.GetString("hud-chatbox-info-unbound")
+            };
     }
 }
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
index ff8e56f8fe..2cf3f89145 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
@@ -1,47 +1,47 @@
-<DefaultWindow Title="{Loc Make Ghost Role}"
+<DefaultWindow Title="{Loc make-ghost-roles-window-title}"
             xmlns="https://spacestation14.io">
 
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleEntityLabel" Text="Entity" />
+            <Label Name="RoleEntityLabel" Text="{Loc make-ghost-roles-window-entity-label}" />
             <Label Name="RoleEntity" Text="" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleNameLabel" Text="Role Name" />
+            <Label Name="RoleNameLabel" Text="{Loc make-ghost-roles-window-role-name-label}" />
             <LineEdit Name="RoleName" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleDescriptionLabel" Text="Role Description" />
+            <Label Name="RoleDescriptionLabel" Text="{Loc make-ghost-roles-window-role-description-label}" />
             <LineEdit Name="RoleDescription" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RoleRulesLabel" Text="Role Rules" />
+            <Label Name="RoleRulesLabel" Text="{Loc make-ghost-roles-window-role-rules-label}" />
             <LineEdit Name="RoleRules" HorizontalExpand="True" Text="{Loc ghost-role-component-default-rules}" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="MakeSentientLabel" Text="Make Sentient" />
+            <Label Name="MakeSentientLabel" Text="{Loc make-ghost-roles-window-make-sentient-label}" />
             <CheckBox Name="MakeSentientCheckbox" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Name="RaffleLabel" Text="Raffle Role?" />
+            <Label Name="RaffleLabel" Text="{Loc make-ghost-roles-window-raffle-role-label}" />
             <OptionButton Name="RaffleButton" />
         </BoxContainer>
         <BoxContainer Name="RaffleCustomSettingsContainer" Orientation="Vertical" Visible="False">
             <BoxContainer Orientation="Horizontal">
-                <Label Name="RaffleInitialDurationLabel" Text="Initial Duration (s)" />
+                <Label Name="RaffleInitialDurationLabel" Text="{Loc make-ghost-roles-window-initial-duration-label}" />
                 <SpinBox Name="RaffleInitialDuration" HorizontalExpand="True" />
             </BoxContainer>
             <BoxContainer Orientation="Horizontal">
-                <Label Name="RaffleJoinExtendsDurationByLabel" Text="Joins Extend By (s)" />
+                <Label Name="RaffleJoinExtendsDurationByLabel" Text="{Loc make-ghost-roles-window-join-extends-by-label}" />
                 <SpinBox Name="RaffleJoinExtendsDurationBy" HorizontalExpand="True" />
             </BoxContainer>
             <BoxContainer Orientation="Horizontal">
-                <Label Name="RaffleMaxDurationLabel" Text="Max Duration (s)" />
+                <Label Name="RaffleMaxDurationLabel" Text="{Loc make-ghost-roles-window-max-duration-label}" />
                 <SpinBox Name="RaffleMaxDuration" HorizontalExpand="True" />
             </BoxContainer>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Button Name="MakeButton" Text="Make" />
+            <Button Name="MakeButton" Text="{Loc make-ghost-roles-window-make-button}" />
         </BoxContainer>
     </BoxContainer>
 
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
index 5480db1dcd..03a6b9da01 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
@@ -62,8 +62,8 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             RaffleMaxDuration.ValueChanged += OnRaffleDurationChanged;
 
 
-            RaffleButton.AddItem("Don't raffle", RaffleDontRaffleId);
-            RaffleButton.AddItem("Custom settings", RaffleCustomRaffleId);
+            RaffleButton.AddItem(Loc.GetString("make-ghost-roles-window-raffle-not-button"), RaffleDontRaffleId);
+            RaffleButton.AddItem(Loc.GetString("make-ghost-roles-window-raffle-custom-settings-button"), RaffleCustomRaffleId);
 
             var raffleProtos =
                 _prototypeManager.EnumeratePrototypes<GhostRoleRaffleSettingsPrototype>();
@@ -74,7 +74,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
                 _rafflePrototypes.Add(raffleProto);
                 var s = raffleProto.Settings;
                 var label =
-                    $"{raffleProto.ID} (initial {s.InitialDuration}s, max {s.MaxDuration}s, join adds {s.JoinExtendsDurationBy}s)";
+                    Loc.GetString("make-ghost-roles-window-raffle-settings-label", ("id", raffleProto.ID), ("initialDuration", s.InitialDuration), ("maxDuration", s.MaxDuration), ("joinExtendsDurationBy", s.JoinExtendsDurationBy));
                 RaffleButton.AddItem(label, idx++);
             }
 
@@ -92,7 +92,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             if (RaffleInitialDuration.Value > RaffleMaxDuration.Value)
             {
                 MakeButton.Disabled = true;
-                MakeButton.ToolTip = "The initial duration must not exceed the maximum duration.";
+                MakeButton.ToolTip = Loc.GetString("make-ghost-roles-window-raffle-warning-tooltip");
             }
             else
             {
diff --git a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
index db16895d59..7252b17bf9 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
@@ -27,7 +27,7 @@ public sealed partial class GhostGui : UIWidget
         GhostWarpButton.OnPressed += _ => RequestWarpsPressed?.Invoke();
         ReturnToBodyButton.OnPressed += _ => ReturnToBodyPressed?.Invoke();
         GhostRolesButton.OnPressed += _ => GhostRolesPressed?.Invoke();
-        GhostRolesButton.OnPressed += _ => GhostRolesButton.StyleClasses.Remove(StyleBase.ButtonCaution);
+        GhostRolesButton.OnPressed += _ => GhostRolesButton.StyleClasses.Remove(StyleClass.Negative);
     }
 
     public void Hide()
@@ -46,7 +46,7 @@ public sealed partial class GhostGui : UIWidget
 
             if (roles > _prevNumberRoles)
             {
-                GhostRolesButton.StyleClasses.Add(StyleBase.ButtonCaution);
+                GhostRolesButton.StyleClasses.Add(StyleClass.Negative);
             }
 
             _prevNumberRoles = (int)roles;
diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
index dc8972970a..8bfd1bebca 100644
--- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
+++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
@@ -21,7 +21,7 @@
         ToolTip="{Loc 'game-hud-open-escape-menu-button-tooltip'}"
         MinSize="70 64"
         HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonOpenRight}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonOpenRight}"
         />
     <ui:MenuButton
         Name="GuidebookButton"
@@ -31,7 +31,7 @@
         BoundKey = "{x:Static is:ContentKeyFunctions.OpenGuidebook}"
         MinSize="42 64"
         HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
         />
     <ui:MenuButton
         Name="CharacterButton"
@@ -41,7 +41,7 @@
         BoundKey = "{x:Static is:ContentKeyFunctions.OpenCharacterMenu}"
         MinSize="42 64"
         HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
         />
     <ui:MenuButton
         Name="EmotesButton"
@@ -51,7 +51,7 @@
         BoundKey = "{x:Static is:ContentKeyFunctions.OpenEmotesMenu}"
         MinSize="42 64"
         HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
         />
     <ui:MenuButton
         Name="CraftingButton"
@@ -61,7 +61,7 @@
         ToolTip="{Loc 'game-hud-open-crafting-menu-button-tooltip'}"
         MinSize="42 64"
         HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
         />
     <ui:MenuButton
         Name="ActionButton"
@@ -71,7 +71,7 @@
         ToolTip="{Loc 'game-hud-open-actions-menu-button-tooltip'}"
         MinSize="42 64"
         HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
         />
     <ui:MenuButton
         Name="AdminButton"
@@ -81,7 +81,7 @@
         ToolTip="{Loc 'game-hud-open-admin-menu-button-tooltip'}"
         MinSize="42 64"
         HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
         />
     <ui:MenuButton
         Name="SandboxButton"
@@ -91,7 +91,7 @@
         ToolTip="{Loc 'game-hud-open-sandbox-menu-button-tooltip'}"
         MinSize="42 64"
         HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
         />
     <ui:MenuButton
         Name="AHelpButton"
@@ -101,6 +101,6 @@
         ToolTip="{Loc 'ui-options-function-open-a-help'}"
         MinSize="42 64"
         HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonOpenLeft}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonOpenLeft}"
         />
 </widgets:GameTopMenuBar>
diff --git a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs
index 5bbb791123..107ed7e7c6 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs
@@ -1,4 +1,5 @@
 using Content.Client.SubFloor;
+using Content.Client.Stylesheets;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
index 392532c7b7..291874b213 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
@@ -111,7 +111,7 @@ public sealed class StorageWindow : BaseWindow
             HorizontalExpand = true,
             Name = "StorageLabel",
             ClipText = true,
-            Text = "Dummy",
+            Text = Loc.GetString("comp-storage-window-dummy"),
             StyleClasses =
             {
                 "FancyWindowTitle",
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
index a139d327b0..d277d05b81 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Numerics;
+using Content.Client.Stylesheets;
 using Content.Shared.VendingMachines;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -79,7 +80,7 @@ namespace Content.Client.VendingMachines.UI
             var item = new VendingMachineItem(protoID, text);
             _listItems[protoID] = (button, item);
             button.AddChild(item);
-            button.AddStyleClass("ButtonSquare");
+            button.AddStyleClass(StyleClass.ButtonSquare);
             button.Disabled = !_enabled || _amounts[protoID] == 0;
         }
 
diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml b/Content.Client/Voting/UI/VoteCallMenu.xaml
index caca4fd553..cee37a3ff8 100644
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml
@@ -2,7 +2,7 @@
                  xmlns:ui="clr-namespace:Content.Client.Voting.UI"
                  xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                  MouseFilter="Stop" MinSize="350 200">
-    <PanelContainer StyleClasses="AngleRect" />
+    <PanelContainer StyleClasses="BackgroundPanel" />
     <BoxContainer Orientation="Vertical">
         <BoxContainer Margin="8 0" Orientation="Horizontal">
             <Label Text="{Loc 'ui-vote-create-title'}"
@@ -15,7 +15,7 @@
         <BoxContainer Orientation="Vertical" Margin="8 2 8 0" VerticalExpand="True" VerticalAlignment="Top">
             <BoxContainer Orientation="Vertical">
                 <OptionButton Margin="2 1" Name="VoteTypeButton" HorizontalExpand="False" />
-                <BoxContainer Name="VoteOptionsButtonContainer" HorizontalExpand="False" Orientation="Vertical"> 
+                <BoxContainer Name="VoteOptionsButtonContainer" HorizontalExpand="False" Orientation="Vertical">
                 </BoxContainer>
                 <Button Margin="64 4" Name="FollowButton" Text="{Loc 'ui-vote-follow-button'}" Visible="False" />
                 <Label Margin="2 2" Name="VoteNotTrustedLabel" Text="{Loc 'ui-vote-trusted-users-notice'}" Visible="False" />
@@ -23,7 +23,7 @@
             </BoxContainer>
             <Label Margin="8 2" Name="VoteTypeTimeoutLabel" Visible="False" />
         </BoxContainer>
-        
+
         <Button Margin="8 32 8 2" Name="CreateButton" Text="{Loc 'ui-vote-create-button'}" />
 
         <PanelContainer StyleClasses="LowDivider" />
diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
index 7cb2b37085..86e4a08923 100644
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
@@ -63,7 +63,7 @@ namespace Content.Client.Voting.UI
             RobustXamlLoader.Load(this);
             _votingSystem = _entityManager.System<VotingSystem>();
 
-            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSystem;
             CloseButton.OnPressed += _ => Close();
             VoteNotTrustedLabel.Text = Loc.GetString("ui-vote-trusted-users-notice", ("timeReq", _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime)));
 
diff --git a/Content.Client/Voting/UI/VotePopup.xaml b/Content.Client/Voting/UI/VotePopup.xaml
index aacefd33a8..a2de1eea8d 100644
--- a/Content.Client/Voting/UI/VotePopup.xaml
+++ b/Content.Client/Voting/UI/VotePopup.xaml
@@ -1,10 +1,10 @@
 <Control xmlns="https://spacestation14.io" MinWidth="300" MaxWidth="500">
-    <PanelContainer StyleClasses="AngleRect" />
+    <PanelContainer StyleClasses="BackgroundPanel" />
     <BoxContainer Margin="4" Orientation="Vertical">
         <Label Name="VoteCaller" />
         <RichTextLabel Name="VoteTitle" />
         <Button Margin="4 4" Name="FollowVoteTarget" Text="{Loc 'ui-vote-follow-button-popup'}" Visible="False"></Button>
-        
+
         <GridContainer Columns="3" Name="VoteOptionsContainer"/>
         <BoxContainer Orientation="Horizontal">
             <ProgressBar Margin="4" HorizontalExpand="True" Name="TimeLeftBar" MinValue="0" MaxValue="1" />
diff --git a/Content.Client/Voting/UI/VotePopup.xaml.cs b/Content.Client/Voting/UI/VotePopup.xaml.cs
index 2a9a6b31f8..b9ff4dd7bd 100644
--- a/Content.Client/Voting/UI/VotePopup.xaml.cs
+++ b/Content.Client/Voting/UI/VotePopup.xaml.cs
@@ -27,7 +27,7 @@ namespace Content.Client.Voting.UI
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
-            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSystem;
 
             if (_vote.TargetEntity != null && _vote.TargetEntity != 0)
             {
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
index 84eaa9af1b..b9a5d1df9a 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
@@ -137,7 +137,7 @@ public sealed partial class GunSystem
                     }),
                     (_ammoCount = new Label
                     {
-                        StyleClasses = { StyleNano.StyleClassItemStatus },
+                        StyleClasses = { StyleClass.ItemStatus },
                         HorizontalAlignment = HAlignment.Right,
                         VerticalAlignment = VAlignment.Bottom
                     }),
@@ -189,7 +189,7 @@ public sealed partial class GunSystem
                             (_noMagazineLabel = new Label
                             {
                                 Text = "No Magazine!",
-                                StyleClasses = {StyleNano.StyleClassItemStatus}
+                                StyleClasses = {StyleClass.ItemStatus}
                             })
                         }
                     },
@@ -202,7 +202,7 @@ public sealed partial class GunSystem
                         {
                             (_ammoCount = new Label
                             {
-                                StyleClasses = {StyleNano.StyleClassItemStatus},
+                                StyleClasses = {StyleClass.ItemStatus},
                                 HorizontalAlignment = HAlignment.Right,
                             }),
                             (_chamberedBullet = new TextureRect
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index c27e81b5c7..adef067b60 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -5,6 +5,8 @@ using Content.Client.Items;
 using Content.Client.Weapons.Ranged.Components;
 using Content.Shared.Camera;
 using Content.Shared.CombatMode;
+using Content.Shared.Damage;
+using Content.Shared.Weapons.Hitscan.Components;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
@@ -16,6 +18,7 @@ using Robust.Client.Input;
 using Robust.Client.Player;
 using Robust.Client.State;
 using Robust.Shared.Animations;
+using Robust.Shared.Audio;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -234,6 +237,7 @@ public sealed partial class GunSystem : SharedGunSystem
                 continue;
             }
 
+            // TODO: Clean this up in a gun refactor at some point - too much copy pasting
             switch (shootable)
             {
                 case CartridgeAmmoComponent cartridge:
@@ -266,7 +270,7 @@ public sealed partial class GunSystem : SharedGunSystem
                     else
                         RemoveShootable(ent.Value);
                     break;
-                case HitscanPrototype:
+                case HitscanAmmoComponent:
                     Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
                     Recoil(user, direction, gun.CameraRecoilScalarModified);
                     break;
@@ -404,4 +408,7 @@ public sealed partial class GunSystem : SharedGunSystem
         _animPlayer.Stop(gunUid, uidPlayer, "muzzle-flash-light");
         _animPlayer.Play((gunUid, uidPlayer), animTwo, "muzzle-flash-light");
     }
+
+    // TODO: Move RangedDamageSoundComponent to shared so this can be predicted.
+    public override void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound) {}
 }
diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs
index 01c88bcd0c..7aca78215f 100644
--- a/Content.Client/Wires/UI/WiresMenu.cs
+++ b/Content.Client/Wires/UI/WiresMenu.cs
@@ -159,8 +159,8 @@ namespace Content.Client.Wires.UI
                     {
                         Text = Loc.GetString("wires-menu-name-label"),
                         FontOverride = font,
-                        FontColorOverride = StyleNano.NanoGold,
                         VerticalAlignment = VAlignment.Center,
+                        StyleClasses = { StyleClass.LabelKeyText },
                     }),
                     (_serialLabel = new Label
                     {
diff --git a/Content.IntegrationTests/Tests/Administration/Logs/LogWindowTest.cs b/Content.IntegrationTests/Tests/Administration/Logs/LogWindowTest.cs
new file mode 100644
index 0000000000..80236c7d90
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Administration/Logs/LogWindowTest.cs
@@ -0,0 +1,60 @@
+using System.Linq;
+using Content.Client.Administration.UI;
+using Content.Client.Administration.UI.CustomControls;
+using Content.Client.Administration.UI.Logs;
+using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Systems.MenuBar.Widgets;
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Server.Administration.Commands;
+using Content.Server.Administration.Logs;
+using Content.Shared.Database;
+
+namespace Content.IntegrationTests.Tests.Administration.Logs;
+
+public sealed class LogWindowTest : InteractionTest
+{
+    protected override PoolSettings Settings => new() { Connected = true, Dirty = true, AdminLogsEnabled = true, DummyTicker = false };
+
+    [Test]
+    public async Task TestAdminLogsWindow()
+    {
+        // First, generate a new log
+        var log = Server.Resolve<IAdminLogManager>();
+        var guid = Guid.NewGuid();
+        await Server.WaitPost(() => log.Add(LogType.Unknown, $"{SPlayer} test log 1: {guid}"));
+
+        // Click the admin button in the menu bar
+        await ClickWidgetControl<GameTopMenuBar, MenuButton>(nameof(GameTopMenuBar.AdminButton));
+        var adminWindow = GetWindow<AdminMenuWindow>();
+
+        // Find and click the "open logs" button.
+        Assert.That(TryGetControlFromChildren<CommandButton>(x => x.Command == OpenAdminLogsCommand.Cmd, adminWindow, out var btn));
+        await ClickControl(btn!);
+        var logWindow = GetWindow<AdminLogsWindow>();
+
+        // Find the log search field and refresh buttons
+        var search = logWindow.Logs.LogSearch;
+        var refresh = logWindow.Logs.RefreshButton;
+        var cont = logWindow.Logs.LogsContainer;
+
+        // Search for the log we added earlier.
+        await Client.WaitPost(() => search.Text = guid.ToString());
+        await ClickControl(refresh);
+        await RunTicks(5);
+        var searchResult = cont.Children.Where(x => x.Visible && x is AdminLogLabel).Cast<AdminLogLabel>().ToArray();
+        Assert.That(searchResult.Length, Is.EqualTo(1));
+        Assert.That(searchResult[0].Log.Message, Contains.Substring($" test log 1: {guid}"));
+
+        // Add a new log
+        guid = Guid.NewGuid();
+        await Server.WaitPost(() => log.Add(LogType.Unknown, $"{SPlayer} test log 2: {guid}"));
+
+        // Update the search and refresh
+        await Client.WaitPost(() => search.Text = guid.ToString());
+        await ClickControl(refresh);
+        await RunTicks(5);
+        searchResult = cont.Children.Where(x => x.Visible && x is AdminLogLabel).Cast<AdminLogLabel>().ToArray();
+        Assert.That(searchResult.Length, Is.EqualTo(1));
+        Assert.That(searchResult[0].Log.Message, Contains.Substring($" test log 2: {guid}"));
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Administration/Notes/NotesControlTest.cs b/Content.IntegrationTests/Tests/Administration/Notes/NotesControlTest.cs
new file mode 100644
index 0000000000..c8dd637c05
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Administration/Notes/NotesControlTest.cs
@@ -0,0 +1,56 @@
+using System.Linq;
+using Content.Client.Administration.UI.Bwoink;
+using Content.Client.Administration.UI.CustomControls;
+using Content.Client.Administration.UI.Notes;
+using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Systems.MenuBar.Widgets;
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.Database;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Tests.Administration.Notes;
+
+/// <summary>
+/// Test that the admin notes UI can be used to add a new note.
+/// </summary>
+public sealed class NotesControlTest : InteractionTest
+{
+    protected override PoolSettings Settings => new() {Connected = true, Dirty = true, AdminLogsEnabled = true, DummyTicker = false};
+
+    [Test]
+    public async Task TestNotesControl()
+    {
+        // Click the ahelp button in the menu bar
+        await ClickWidgetControl<GameTopMenuBar, MenuButton>(nameof(GameTopMenuBar.AHelpButton));
+        var bwoink = GetWindow<BwoinkWindow>();
+
+        // Damn, if only I had an excuse to use bwoink.Bwoink.BwoinkArea
+        var players = bwoink.Bwoink.ChannelSelector.PlayerListContainer;
+
+        // Check that the player is in the menu, and make sure it is selected
+        var entry = players.Data.Cast<PlayerListData>().Single(x => x.Info.SessionId == ServerSession.UserId);
+        await Client.WaitPost(() => players.Select(entry));
+
+        // Open their notes
+        await ClickControl(bwoink.Bwoink.Notes);
+        var noteCtrl = GetWindow<AdminNotesWindow>().Notes;
+        Assert.That(noteCtrl.Notes.ChildCount, Is.EqualTo(0));
+
+        // Add a new note
+        await ClickControl(noteCtrl.NewNoteButton);
+        var addNoteWindow = GetWindow<NoteEdit>();
+        var msg = $"note: {Guid.NewGuid()}";
+        await Client.WaitPost(() => addNoteWindow.NoteTextEdit.TextRope = new Rope.Leaf(msg));
+        addNoteWindow.NoteSeverity = NoteSeverity.None;
+
+        // Have to click submit twice for confirmation?
+        await ClickControl(addNoteWindow.SubmitButton);
+        await ClickControl(addNoteWindow.SubmitButton);
+
+        // Check that the new note exists
+        await RunTicks(5);
+        Assert.That(noteCtrl.Notes.ChildCount, Is.EqualTo(1));
+        var note = (AdminNotesLine)noteCtrl.Notes.Children[0];
+        Assert.That(note.Note.Message, Is.EqualTo(msg));
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs b/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs
index 9dda130847..839e0ea897 100644
--- a/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs
@@ -93,6 +93,12 @@ public sealed class DeltaPressureTest
 
     private readonly ResPath _testMap = new("Maps/Test/Atmospherics/DeltaPressure/deltapressuretest.yml");
 
+    // TODO ATMOS TESTS
+    // - Check for directional windows (partial airtight ents) properly computing pressure differences
+    // - Check for multi-tick damage (window with n damage threshold should take n ticks to destroy)
+    // - Check that all maps do not explode into a million pieces on load due to dP
+    // - Ensure that all tests work for a map that has an origin at a non zero coordinate
+
     /// <summary>
     /// Asserts that an entity with a DeltaPressureComponent with autoJoinProcessingList
     /// set to true is automatically added to the DeltaPressure processing list
diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index aad87b711a..df85e61550 100644
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -215,13 +215,10 @@ public sealed class CargoTest
 
     [TestPrototypes]
     private const string StackProto = @"
-- type: entity
-  id: A
-
 - type: stack
   id: StackProto
   name: stack-steel
-  spawn: A
+  spawn: StackEnt
 
 - type: entity
   id: StackEnt
diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
index e4ec7e907a..53604b2c1e 100644
--- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
@@ -1,5 +1,4 @@
-using Content.Server.Administration.Commands;
-using Content.Server.Administration.Systems;
+using Content.Shared.Administration.Systems;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs b/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
index 05e8197c8d..a7b96bdd2f 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
@@ -95,8 +95,8 @@ public sealed class CraftingTests : InteractionTest
         Assert.That(sys.IsEntityInContainer(shard), Is.True);
         Assert.That(sys.IsEntityInContainer(rods), Is.False);
         Assert.That(sys.IsEntityInContainer(wires), Is.False);
-        Assert.That(rodStack, Has.Count.EqualTo(8));
-        Assert.That(wireStack, Has.Count.EqualTo(7));
+        Assert.That(rodStack.Count, Is.EqualTo(8));
+        Assert.That(wireStack.Count, Is.EqualTo(7));
 
         await FindEntity(Spear, shouldSucceed: false);
 
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
index 0da07ad5a1..3650fd69d7 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
@@ -1,10 +1,8 @@
-using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.Destructible.Thresholds.Triggers;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;
 
@@ -91,7 +89,7 @@ namespace Content.IntegrationTests.Tests.Destructible
                     Assert.That(threshold.Trigger, Is.InstanceOf<AndTrigger>());
                 });
 
-                var trigger = (AndTrigger) threshold.Trigger;
+                var trigger = (AndTrigger)threshold.Trigger;
 
                 Assert.Multiple(() =>
                 {
@@ -162,7 +160,7 @@ namespace Content.IntegrationTests.Tests.Destructible
                     Assert.That(threshold.Trigger, Is.InstanceOf<AndTrigger>());
                 });
 
-                trigger = (AndTrigger) threshold.Trigger;
+                trigger = (AndTrigger)threshold.Trigger;
 
                 Assert.Multiple(() =>
                 {
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
index ccd459668b..4b1dc1ab3b 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
@@ -1,6 +1,6 @@
-using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.Destructible.Thresholds.Triggers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;
@@ -86,7 +86,7 @@ namespace Content.IntegrationTests.Tests.Destructible
                     Assert.That(threshold.Trigger, Is.InstanceOf<AndTrigger>());
                 });
 
-                var trigger = (AndTrigger) threshold.Trigger;
+                var trigger = (AndTrigger)threshold.Trigger;
 
                 Assert.Multiple(() =>
                 {
@@ -154,7 +154,7 @@ namespace Content.IntegrationTests.Tests.Destructible
                     Assert.That(threshold.Trigger, Is.InstanceOf<AndTrigger>());
                 });
 
-                trigger = (AndTrigger) threshold.Trigger;
+                trigger = (AndTrigger)threshold.Trigger;
 
                 Assert.Multiple(() =>
                 {
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
index 4e169e7dfa..b1342eeafe 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Server.Destructible.Thresholds;
 using Content.Server.Destructible.Thresholds.Behaviors;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
@@ -59,7 +58,7 @@ namespace Content.IntegrationTests.Tests.Destructible
                     Assert.That(threshold.Behaviors, Has.Count.EqualTo(3));
                 });
 
-                var spawnEntitiesBehavior = (SpawnEntitiesBehavior) threshold.Behaviors.Single(b => b is SpawnEntitiesBehavior);
+                var spawnEntitiesBehavior = (SpawnEntitiesBehavior)threshold.Behaviors.Single(b => b is SpawnEntitiesBehavior);
 
                 Assert.Multiple(() =>
                 {
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
index af86e406ef..fb3c40ec3c 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
@@ -2,12 +2,12 @@ using System.Linq;
 using Content.Server.Destructible;
 using Content.Server.Destructible.Thresholds;
 using Content.Server.Destructible.Thresholds.Behaviors;
-using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.Destructible;
+using Content.Shared.Destructible.Thresholds.Triggers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;
@@ -99,9 +99,9 @@ namespace Content.IntegrationTests.Tests.Destructible
                 // Check that it matches the YAML prototype
                 Assert.That(threshold.Behaviors, Has.Count.EqualTo(3));
 
-                var soundThreshold = (PlaySoundBehavior) threshold.Behaviors[0];
-                var spawnThreshold = (SpawnEntitiesBehavior) threshold.Behaviors[1];
-                var actsThreshold = (DoActsBehavior) threshold.Behaviors[2];
+                var soundThreshold = (PlaySoundBehavior)threshold.Behaviors[0];
+                var spawnThreshold = (SpawnEntitiesBehavior)threshold.Behaviors[1];
+                var actsThreshold = (DoActsBehavior)threshold.Behaviors[2];
 
                 Assert.Multiple(() =>
                 {
@@ -164,9 +164,9 @@ namespace Content.IntegrationTests.Tests.Destructible
                 // Check that it matches the YAML prototype
                 Assert.That(threshold.Behaviors, Has.Count.EqualTo(3));
 
-                soundThreshold = (PlaySoundBehavior) threshold.Behaviors[0];
-                spawnThreshold = (SpawnEntitiesBehavior) threshold.Behaviors[1];
-                actsThreshold = (DoActsBehavior) threshold.Behaviors[2];
+                soundThreshold = (PlaySoundBehavior)threshold.Behaviors[0];
+                spawnThreshold = (SpawnEntitiesBehavior)threshold.Behaviors[1];
+                actsThreshold = (DoActsBehavior)threshold.Behaviors[2];
 
                 // Check that it matches the YAML prototype
                 Assert.Multiple(() =>
@@ -201,11 +201,11 @@ namespace Content.IntegrationTests.Tests.Destructible
 
                 // Verify the first one, should be the lowest one (20)
                 msg = sTestThresholdListenerSystem.ThresholdsReached[0];
-                var trigger = (DamageTrigger) msg.Threshold.Trigger;
+                var trigger = (DamageTrigger)msg.Threshold.Trigger;
                 Assert.Multiple(() =>
                 {
                     Assert.That(trigger, Is.Not.Null);
-                    Assert.That(trigger.Damage, Is.EqualTo(20));
+                    Assert.That(trigger.Damage, Is.EqualTo(FixedPoint2.New(20)));
                 });
 
                 threshold = msg.Threshold;
@@ -215,20 +215,20 @@ namespace Content.IntegrationTests.Tests.Destructible
 
                 // Verify the second one, should be the highest one (50)
                 msg = sTestThresholdListenerSystem.ThresholdsReached[1];
-                trigger = (DamageTrigger) msg.Threshold.Trigger;
+                trigger = (DamageTrigger)msg.Threshold.Trigger;
                 Assert.Multiple(() =>
                 {
                     Assert.That(trigger, Is.Not.Null);
-                    Assert.That(trigger.Damage, Is.EqualTo(50));
+                    Assert.That(trigger.Damage, Is.EqualTo(FixedPoint2.New(50)));
                 });
 
                 threshold = msg.Threshold;
 
                 Assert.That(threshold.Behaviors, Has.Count.EqualTo(3));
 
-                soundThreshold = (PlaySoundBehavior) threshold.Behaviors[0];
-                spawnThreshold = (SpawnEntitiesBehavior) threshold.Behaviors[1];
-                actsThreshold = (DoActsBehavior) threshold.Behaviors[2];
+                soundThreshold = (PlaySoundBehavior)threshold.Behaviors[0];
+                spawnThreshold = (SpawnEntitiesBehavior)threshold.Behaviors[1];
+                actsThreshold = (DoActsBehavior)threshold.Behaviors[2];
 
                 // Check that it matches the YAML prototype
                 Assert.Multiple(() =>
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
index ca7445c359..37526f39a7 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
@@ -93,7 +93,7 @@ public abstract partial class InteractionTest
             await Server.WaitPost(() =>
             {
                 uid = SEntMan.SpawnEntity(stackProto.Spawn, coords);
-                Stack.SetCount(uid, spec.Quantity);
+                Stack.SetCount((uid, null), spec.Quantity);
             });
             return uid;
         }
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index eff0ed3a0c..4a33fdc03b 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -156,10 +156,13 @@ public abstract partial class InteractionTest
   - type: CombatMode
 ";
 
+    protected static PoolSettings Default => new() { Connected = true, Dirty = true };
+    protected virtual PoolSettings Settings => Default;
+
     [SetUp]
     public virtual async Task Setup()
     {
-        Pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, Dirty = true });
+        Pair = await PoolManager.GetServerClient(Settings);
 
         // server dependencies
         SEntMan = Server.ResolveDependency<IEntityManager>();
diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index 082baf7e64..dcb47fb81c 100644
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -33,7 +33,7 @@ public sealed class MaterialArbitrageTest
     [
         "BaseChemistryEmptyVial", "DrinkShotGlass", "SodiumLightTube", "DrinkGlassCoupeShaped",
         "LedLightBulb", "ExteriorLightTube", "LightTube", "DrinkGlass", "DimLightBulb", "LightBulb", "LedLightTube",
-        "SheetRGlass1", "ChemistryEmptyBottle01", "WarmLightBulb",
+        "ChemistryEmptyBottle01", "WarmLightBulb",
     ];
 
     private readonly HashSet<string> _compositionArbitrageIgnore =
@@ -469,7 +469,8 @@ public sealed class MaterialArbitrageTest
                 await server.WaitPost(() =>
                 {
                     var ent = entManager.SpawnEntity(id, testMap.GridCoords);
-                    stackSys.SetCount(ent, 1);
+                    if (entManager.TryGetComponent<StackComponent>(ent, out var stackComp))
+                        stackSys.SetCount((ent, stackComp), 1);
                     priceCache[id] = price = pricing.GetPrice(ent, false);
                     entManager.DeleteEntity(ent);
                 });
diff --git a/Content.IntegrationTests/Tests/Materials/MaterialTests.cs b/Content.IntegrationTests/Tests/Materials/MaterialTests.cs
index 30800f358e..a177869e7f 100644
--- a/Content.IntegrationTests/Tests/Materials/MaterialTests.cs
+++ b/Content.IntegrationTests/Tests/Materials/MaterialTests.cs
@@ -54,7 +54,7 @@ namespace Content.IntegrationTests.Tests.Materials
                             $"{proto.ID} material has no stack prototype");
 
                         if (stackProto != null)
-                            Assert.That(proto.StackEntity, Is.EqualTo(stackProto.Spawn));
+                            Assert.That(proto.StackEntity, Is.EqualTo(stackProto.Spawn.Id));
                     }
                 });
 
diff --git a/Content.IntegrationTests/Tests/Nutrition/HungerThirstTest.cs b/Content.IntegrationTests/Tests/Nutrition/HungerThirstTest.cs
new file mode 100644
index 0000000000..7a5195800e
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Nutrition/HungerThirstTest.cs
@@ -0,0 +1,97 @@
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Nutrition;
+
+/// <summary>
+/// Tests the mechanics of hunger and thirst.
+/// </summary>
+public sealed class HungerThirstTest : InteractionTest
+{
+    private readonly EntProtoId _drink = "DrinkLemonadeGlass";
+    private readonly EntProtoId _food = "FoodCakeVanillaSlice";
+    protected override string PlayerPrototype => "MobHuman";
+
+    /// <summary>
+    /// Tests that hunger and thirst values decrease over time (low means hungrier and thirstier).
+    /// Tests that hunger and thirst values increase when eating/drinking (high means less hungry and thirsty).
+    /// </summary>
+    [Test]
+    public async Task HungerThirstIncreaseDecreaseTest()
+    {
+        // Ensure that the player can breathe and not suffocate
+        await AddAtmosphere();
+
+        var hungerComponent = Comp<HungerComponent>(Player);
+        var thirstComponent = Comp<ThirstComponent>(Player);
+        var hungerSystem = SEntMan.System<HungerSystem>();
+        var thirstSystem = SEntMan.System<ThirstSystem>();
+        var ingestionSystem = SEntMan.System<IngestionSystem>();
+
+        // Set initial value
+        hungerSystem.SetHunger(SPlayer, hungerComponent.Thresholds[HungerThreshold.Okay], hungerComponent);
+        thirstSystem.SetThirst(SPlayer, thirstComponent, thirstComponent.ThirstThresholds[ThirstThreshold.Okay]);
+
+        // Ensure hunger and thirst value decrease over time (the Urist gets hungrier/thirstier)
+        var previousHungerValue = hungerSystem.GetHunger(hungerComponent);
+        var previousThirstValue = thirstComponent.CurrentThirst; // TODO: combined sation system with a sane API
+
+        // Simulate long enough for both update loops to run
+        var runTime = Math.Max((float)hungerComponent.ThresholdUpdateRate.TotalSeconds, (float)thirstComponent.UpdateRate.TotalSeconds) + 1f;
+        await RunSeconds(runTime);
+
+        var currentHungerValue = hungerSystem.GetHunger(hungerComponent);
+        Assert.That(currentHungerValue, Is.LessThan(previousHungerValue), "Hunger value did not decrease over time");
+        previousHungerValue = currentHungerValue;
+
+        var currentThirstValue = thirstComponent.CurrentThirst;
+        Assert.That(currentThirstValue, Is.LessThan(previousThirstValue), "Thirst value did not decrease over time");
+        previousThirstValue = currentThirstValue;
+
+        // Now we spawn food in the Urist's hand
+        await PlaceInHands(_food);
+
+        // We eat the food in hand
+        await UseInHand();
+
+        // To see a change in hunger, we need to wait at least 30 seconds
+        await RunSeconds(30);
+
+        // We ensure the food is fully eaten
+        var foodEaten = HandSys.GetActiveItem((SPlayer, Hands));
+        Assert.That(foodEaten, Is.Null, "Food item did not disappear after eating it");
+
+        // Ensure that the hunger value has increased (The Urist is less hungry)
+        Assert.That(hungerSystem.GetHunger(hungerComponent), Is.GreaterThan(previousHungerValue), "Hunger value did not increase after eating food");
+
+        // Now we spawn a drink in the Urist's hand
+        var drink = await PlaceInHands(_drink);
+
+        // Get the solution that can be consumed
+        Assert.That(ingestionSystem.CanConsume(SPlayer, SPlayer, ToServer(drink), out var solution, out _),
+            "Unable to get the solution or the entity can not be consumed");
+
+        // Find the initial amount of solution in the drink
+        var initialSolutionVolume = solution.Value.Comp.Solution.Volume;
+
+        // We drink the drink in hand
+        await UseInHand();
+
+        // To see a change in thirst, we need to wait at least 30 seconds
+        await RunSeconds(30);
+
+        // Ensure the solution volume has decreased
+        Assert.That(solution.Value.Comp.Solution.Volume, Is.LessThan(initialSolutionVolume), "Solution volume did not decrease after drinking");
+
+        // Ensure that the thirst value has increased (The Urist is less thirsty)
+        Assert.That(thirstComponent.CurrentThirst, Is.GreaterThan(previousThirstValue), "Thirst value did not increase after drinking");
+
+        // Make sure that the glass did not get deleted after drinking from it
+        var glass = HandSys.GetActiveItem((SPlayer, Hands));
+        Assert.That(glass, Is.Not.Null, "Glass got deleted after drinking from it");
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs b/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs
new file mode 100644
index 0000000000..bf240ba9e2
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs
@@ -0,0 +1,63 @@
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.Damage;
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Systems;
+using Content.Shared.Wieldable.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Weapons;
+
+public sealed class WeaponTests : InteractionTest
+{
+    protected override string PlayerPrototype => "MobHuman"; // The default test mob only has one hand
+    private static readonly EntProtoId MobHuman = "MobHuman";
+    private static readonly EntProtoId SniperMosin = "WeaponSniperMosin";
+
+    [Test]
+    public async Task GunRequiresWieldTest()
+    {
+        var gunSystem = SEntMan.System<SharedGunSystem>();
+
+        await AddAtmosphere(); // prevent the Urist from suffocating
+
+        var urist = await SpawnTarget(MobHuman);
+        var damageComp = Comp<DamageableComponent>(urist);
+
+        var mosinNet = await PlaceInHands(SniperMosin);
+        var mosinEnt = ToServer(mosinNet);
+
+        await Pair.RunSeconds(2f); // Guns have a cooldown when picking them up.
+
+        Assert.That(HasComp<GunRequiresWieldComponent>(mosinNet),
+            "Looks like you've removed the 'GunRequiresWield' component from the mosin sniper." +
+            "If this was intentional, please update WeaponTests.cs to reflect this change!");
+
+        var startAmmo = gunSystem.GetAmmoCount(mosinEnt);
+        var wieldComp = Comp<WieldableComponent>(mosinNet);
+
+        Assert.That(startAmmo, Is.GreaterThan(0), "Mosin was spawned with no ammo!");
+        Assert.That(wieldComp.Wielded, Is.False, "Mosin was spawned wielded!");
+
+        await AttemptShoot(urist, false); // should fail due to not being wielded
+        var updatedAmmo = gunSystem.GetAmmoCount(mosinEnt);
+
+        Assert.That(updatedAmmo,
+            Is.EqualTo(startAmmo),
+            "Mosin discharged ammo when the weapon should not have fired!");
+        Assert.That(damageComp.TotalDamage.Value,
+            Is.EqualTo(0),
+            "Urist took damage when the weapon should not have fired!");
+
+        await UseInHand();
+
+        Assert.That(wieldComp.Wielded, Is.True, "Mosin failed to wield when interacted with!");
+
+        await AttemptShoot(urist);
+        updatedAmmo = gunSystem.GetAmmoCount(mosinEnt);
+
+        Assert.That(updatedAmmo, Is.EqualTo(startAmmo - 1), "Mosin failed to discharge appropriate amount of ammo!");
+        Assert.That(damageComp.TotalDamage.Value,
+            Is.GreaterThan(0),
+            "Mosin was fired but urist sustained no damage!");
+    }
+}
diff --git a/Content.Replay/Menu/ReplayMainMenuControl.xaml b/Content.Replay/Menu/ReplayMainMenuControl.xaml
index 9eeafd95de..ef2f97ce3d 100644
--- a/Content.Replay/Menu/ReplayMainMenuControl.xaml
+++ b/Content.Replay/Menu/ReplayMainMenuControl.xaml
@@ -44,7 +44,7 @@
                         MinSize="300 150">
             <BoxContainer Orientation="Vertical" Align="Begin" Margin="8">
                 <Label Text="{Loc 'replay-info-title'}" Margin="4" HorizontalAlignment="Center"/>
-                <controls:HLine Color="{x:Static style:StyleNano.NanoGold}" Thickness="4"/>
+                <controls:HLine StyleClasses="highlight" Thickness="4"/>
                 <RichTextLabel Access="Public" Name="Info"/>
             </BoxContainer>
         </PanelContainer>
diff --git a/Content.Server.Database/ModelSqlite.cs b/Content.Server.Database/ModelSqlite.cs
index 1ce9465847..5a993bdbfa 100644
--- a/Content.Server.Database/ModelSqlite.cs
+++ b/Content.Server.Database/ModelSqlite.cs
@@ -17,6 +17,9 @@ namespace Content.Server.Database
     {
         public SqliteServerDbContext(DbContextOptions<SqliteServerDbContext> options) : base(options)
         {
+#if USE_SYSTEM_SQLITE
+            SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());
+#endif
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder options)
diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index 13f2430b3d..7c772830ba 100644
--- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs
+++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Chat.Systems;
 using Content.Server.Containers;
@@ -7,6 +8,7 @@ using static Content.Shared.Access.Components.IdCardConsoleComponent;
 using Content.Shared.Access.Systems;
 using Content.Shared.Access;
 using Content.Shared.Administration.Logs;
+using Content.Shared.Chat;
 using Content.Shared.Construction;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Damage;
@@ -83,7 +85,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
         {
             newState = new IdCardConsoleBoundUserInterfaceState(
                 component.PrivilegedIdSlot.HasItem,
-                PrivilegedIdIsAuthorized(uid, component),
+                PrivilegedIdIsAuthorized(uid, component, out _),
                 false,
                 null,
                 null,
@@ -108,7 +110,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
 
             newState = new IdCardConsoleBoundUserInterfaceState(
                 component.PrivilegedIdSlot.HasItem,
-                PrivilegedIdIsAuthorized(uid, component),
+                PrivilegedIdIsAuthorized(uid, component, out _),
                 true,
                 targetIdComponent.FullName,
                 targetIdComponent.LocalizedJobTitle,
@@ -137,13 +139,13 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
         if (!Resolve(uid, ref component))
             return;
 
-        if (component.TargetIdSlot.Item is not { Valid: true } targetId || !PrivilegedIdIsAuthorized(uid, component))
+        if (component.TargetIdSlot.Item is not { Valid: true } targetId || !PrivilegedIdIsAuthorized(uid, component, out var privilegedId))
             return;
 
         _idCard.TryChangeFullName(targetId, newFullName, player: player);
         _idCard.TryChangeJobTitle(targetId, newJobTitle, player: player);
 
-        if (_prototype.TryIndex<JobPrototype>(newJobProto, out var job)
+        if (_prototype.Resolve(newJobProto, out var job)
             && _prototype.Resolve(job.Icon, out var jobIcon))
         {
             _idCard.TryChangeJobIcon(targetId, jobIcon, player: player);
@@ -165,10 +167,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
             return;
         }
 
-        var oldTags = _access.TryGetTags(targetId) ?? new List<ProtoId<AccessLevelPrototype>>();
-        oldTags = oldTags.ToList();
-
-        var privilegedId = component.PrivilegedIdSlot.Item;
+        var oldTags = _access.TryGetTags(targetId)?.ToList() ?? new List<ProtoId<AccessLevelPrototype>>();
 
         if (oldTags.SequenceEqual(newAccessList))
             return;
@@ -176,8 +175,7 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
         // I hate that C# doesn't have an option for this and don't desire to write this out the hard way.
         // var difference = newAccessList.Difference(oldTags);
         var difference = newAccessList.Union(oldTags).Except(newAccessList.Intersect(oldTags)).ToHashSet();
-        // NULL SAFETY: PrivilegedIdIsAuthorized checked this earlier.
-        var privilegedPerms = _accessReader.FindAccessTags(privilegedId!.Value).ToHashSet();
+        var privilegedPerms = _accessReader.FindAccessTags(privilegedId.Value);
         if (!difference.IsSubsetOf(privilegedPerms))
         {
             _sawmill.Warning($"User {ToPrettyString(uid)} tried to modify permissions they could not give/take!");
@@ -190,26 +188,24 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
 
         /*TODO: ECS SharedIdCardConsoleComponent and then log on card ejection, together with the save.
         This current implementation is pretty shit as it logs 27 entries (27 lines) if someone decides to give themselves AA*/
-        _adminLogger.Add(LogType.Action, LogImpact.Medium,
-            $"{ToPrettyString(player):player} has modified {ToPrettyString(targetId):entity} with the following accesses: [{string.Join(", ", addedTags.Union(removedTags))}] [{string.Join(", ", newAccessList)}]");
+        _adminLogger.Add(LogType.Action,
+            $"{player} has modified {targetId} with the following accesses: [{string.Join(", ", addedTags.Union(removedTags))}] [{string.Join(", ", newAccessList)}]");
     }
 
     /// <summary>
     /// Returns true if there is an ID in <see cref="IdCardConsoleComponent.PrivilegedIdSlot"/> and said ID satisfies the requirements of <see cref="AccessReaderComponent"/>.
     /// </summary>
-    /// <remarks>
-    /// Other code relies on the fact this returns false if privileged Id is null. Don't break that invariant.
-    /// </remarks>
-    private bool PrivilegedIdIsAuthorized(EntityUid uid, IdCardConsoleComponent? component = null)
+    private bool PrivilegedIdIsAuthorized(EntityUid uid, IdCardConsoleComponent component, [NotNullWhen(true)] out EntityUid? id)
     {
-        if (!Resolve(uid, ref component))
-            return true;
+        id = null;
+        if (component.PrivilegedIdSlot.Item == null)
+            return false;
 
+        id = component.PrivilegedIdSlot.Item;
         if (!TryComp<AccessReaderComponent>(uid, out var reader))
             return true;
 
-        var privilegedId = component.PrivilegedIdSlot.Item;
-        return privilegedId != null && _accessReader.IsAllowed(privilegedId.Value, uid, reader);
+        return _accessReader.IsAllowed(id.Value, uid, reader);
     }
 
     private void UpdateStationRecord(EntityUid uid, EntityUid targetId, string newFullName, ProtoId<AccessLevelPrototype> newJobTitle, JobPrototype? newJobProto)
diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index 0fef62d970..f317e88f0f 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -6,6 +6,7 @@ using Content.Server.Popups;
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Popups;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Administration/Commands/DSay.cs b/Content.Server/Administration/Commands/DSay.cs
index f5e0b32793..60f81fce5d 100644
--- a/Content.Server/Administration/Commands/DSay.cs
+++ b/Content.Server/Administration/Commands/DSay.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Chat;
 using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands;
diff --git a/Content.Server/Administration/Commands/OSay.cs b/Content.Server/Administration/Commands/OSay.cs
index 2f17bd9d70..9c5a20ef69 100644
--- a/Content.Server/Administration/Commands/OSay.cs
+++ b/Content.Server/Administration/Commands/OSay.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Chat;
 using Content.Shared.Database;
 using Robust.Shared.Console;
 
diff --git a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs
index 1beaaa928e..df437fcc2d 100644
--- a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs
+++ b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs
@@ -10,7 +10,8 @@ public sealed class OpenAdminLogsCommand : LocalizedEntityCommands
 {
     [Dependency] private readonly EuiManager _euiManager = default!;
 
-    public override string Command => "adminlogs";
+    public override string Command => Cmd;
+    public const string Cmd = "adminlogs";
 
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
diff --git a/Content.Server/Administration/PlayerPanelEui.cs b/Content.Server/Administration/PlayerPanelEui.cs
index 31acd33bf1..7de62ac743 100644
--- a/Content.Server/Administration/PlayerPanelEui.cs
+++ b/Content.Server/Administration/PlayerPanelEui.cs
@@ -2,10 +2,10 @@ using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Administration.Notes;
-using Content.Server.Administration.Systems;
 using Content.Server.Database;
 using Content.Server.EUI;
 using Content.Shared.Administration;
+using Content.Shared.Administration.Systems;
 using Content.Shared.Database;
 using Content.Shared.Eui;
 using Content.Shared.Follower;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 176d4fd04c..41228b5ac8 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -69,7 +69,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb bolt = new()
             {
-                Text = bolts.BoltsDown ? "Unbolt" : "Bolt",
+                Text = Loc.GetString(bolts.BoltsDown ? "admin-verbs-unbolt" : "admin-verbs-bolt"),
                 Category = VerbCategory.Tricks,
                 Icon = bolts.BoltsDown
                     ? new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/unbolt.png"))
@@ -91,7 +91,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb emergencyAccess = new()
             {
-                Text = airlockComp.EmergencyAccess ? "Emergency Access Off" : "Emergency Access On",
+                Text = Loc.GetString(airlockComp.EmergencyAccess ? "admin-verbs-emergency-access-off" : "admin-verbs-emergency-access-on"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/emergency_access.png")),
                 Act = () =>
@@ -111,7 +111,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb rejuvenate = new()
             {
-                Text = "Rejuvenate",
+                Text = Loc.GetString("admin-verbs-rejuvenate"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rejuvenate.png")),
                 Act = () =>
@@ -129,7 +129,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb makeIndestructible = new()
             {
-                Text = "Make Indestructible",
+                Text = Loc.GetString("admin-verbs-make-indestructible"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
                 Act = () =>
@@ -146,7 +146,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb makeVulnerable = new()
             {
-                Text = "Make Vulnerable",
+                Text = Loc.GetString("admin-verbs-make-vulnerable"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
                 Act = () =>
@@ -164,7 +164,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillBattery = new()
             {
-                Text = "Refill Battery",
+                Text = Loc.GetString("admin-verbs-refill-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill_battery.png")),
                 Act = () =>
@@ -179,7 +179,7 @@ public sealed partial class AdminVerbSystem
 
             Verb drainBattery = new()
             {
-                Text = "Drain Battery",
+                Text = Loc.GetString("admin-verbs-drain-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/drain_battery.png")),
                 Act = () =>
@@ -194,7 +194,7 @@ public sealed partial class AdminVerbSystem
 
             Verb infiniteBattery = new()
             {
-                Text = "Infinite Battery",
+                Text = Loc.GetString("admin-verbs-infinite-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/infinite_battery.png")),
                 Act = () =>
@@ -215,7 +215,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb blockUnanchor = new()
             {
-                Text = "Block Unanchoring",
+                Text = Loc.GetString("admin-verbs-block-unanchoring"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/anchor.svg.192dpi.png")),
                 Act = () =>
@@ -233,7 +233,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillInternalsO2 = new()
             {
-                Text = "Refill Internals Oxygen",
+                Text = Loc.GetString("admin-verbs-refill-internals-oxygen"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
                 Act = () =>
@@ -248,7 +248,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsN2 = new()
             {
-                Text = "Refill Internals Nitrogen",
+                Text = Loc.GetString("admin-verbs-refill-internals-nitrogen"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
                 Act = () =>
@@ -263,7 +263,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsPlasma = new()
             {
-                Text = "Refill Internals Plasma",
+                Text = Loc.GetString("admin-verbs-refill-internals-plasma"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
                 Act = () =>
@@ -281,7 +281,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillInternalsO2 = new()
             {
-                Text = "Refill Internals Oxygen",
+                Text = Loc.GetString("admin-verbs-refill-internals-oxygen"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
                 Act = () => RefillEquippedTanks(args.User, Gas.Oxygen),
@@ -293,7 +293,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsN2 = new()
             {
-                Text = "Refill Internals Nitrogen",
+                Text = Loc.GetString("admin-verbs-refill-internals-nitrogen"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
                 Act = () => RefillEquippedTanks(args.User, Gas.Nitrogen),
@@ -305,7 +305,7 @@ public sealed partial class AdminVerbSystem
 
             Verb refillInternalsPlasma = new()
             {
-                Text = "Refill Internals Plasma",
+                Text = Loc.GetString("admin-verbs-refill-internals-plasma"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
                 Act = () => RefillEquippedTanks(args.User, Gas.Plasma),
@@ -318,7 +318,7 @@ public sealed partial class AdminVerbSystem
 
         Verb sendToTestArena = new()
         {
-            Text = "Send to test arena",
+            Text = Loc.GetString("admin-verbs-send-to-test-arena"),
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")),
 
@@ -339,7 +339,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb grantAllAccess = new()
             {
-                Text = "Grant All Access",
+                Text = Loc.GetString("admin-verbs-grant-all-access"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
                 Act = () =>
@@ -354,7 +354,7 @@ public sealed partial class AdminVerbSystem
 
             Verb revokeAllAccess = new()
             {
-                Text = "Revoke All Access",
+                Text = Loc.GetString("admin-verbs-revoke-all-access"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
                 Act = () =>
@@ -372,7 +372,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb grantAllAccess = new()
             {
-                Text = "Grant All Access",
+                Text = Loc.GetString("admin-verbs-grant-all-access"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
                 Act = () =>
@@ -387,7 +387,7 @@ public sealed partial class AdminVerbSystem
 
             Verb revokeAllAccess = new()
             {
-                Text = "Revoke All Access",
+                Text = Loc.GetString("admin-verbs-revoke-all-access"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
                 Act = () =>
@@ -405,15 +405,15 @@ public sealed partial class AdminVerbSystem
         {
             Verb adjustStack = new()
             {
-                Text = "Adjust Stack",
+                Text = Loc.GetString("admin-verbs-adjust-stack"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/adjust-stack.png")),
                 Act = () =>
                 {
                     // Unbounded intentionally.
-                    _quickDialog.OpenDialog(player, "Adjust stack", $"Amount (max {_stackSystem.GetMaxCount(stack)})", (int newAmount) =>
+                    _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-adjust-stack"), Loc.GetString("admin-verbs-dialog-adjust-stack-amount", ("max", _stackSystem.GetMaxCount(stack))), (int newAmount) =>
                     {
-                        _stackSystem.SetCount(args.Target, newAmount, stack);
+                        _stackSystem.SetCount((args.Target, stack), newAmount);
                     });
                 },
                 Impact = LogImpact.Medium,
@@ -424,12 +424,12 @@ public sealed partial class AdminVerbSystem
 
             Verb fillStack = new()
             {
-                Text = "Fill Stack",
+                Text = Loc.GetString("admin-verbs-fill-stack"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill-stack.png")),
                 Act = () =>
                 {
-                    _stackSystem.SetCount(args.Target, _stackSystem.GetMaxCount(stack), stack);
+                    _stackSystem.SetCount((args.Target, stack), _stackSystem.GetMaxCount(stack));
                 },
                 Impact = LogImpact.Medium,
                 Message = Loc.GetString("admin-trick-fill-stack-description"),
@@ -440,12 +440,12 @@ public sealed partial class AdminVerbSystem
 
         Verb rename = new()
         {
-            Text = "Rename",
+            Text = Loc.GetString("admin-verbs-rename"),
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rename.png")),
             Act = () =>
             {
-                _quickDialog.OpenDialog(player, "Rename", "Name", (string newName) =>
+                _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-rename-title"), Loc.GetString("admin-verbs-dialog-rename-name"), (string newName) =>
                 {
                     _metaSystem.SetEntityName(args.Target, newName);
                 });
@@ -458,12 +458,12 @@ public sealed partial class AdminVerbSystem
 
         Verb redescribe = new()
         {
-            Text = "Redescribe",
+            Text = Loc.GetString("admin-verbs-redescribe"),
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/redescribe.png")),
             Act = () =>
             {
-                _quickDialog.OpenDialog(player, "Redescribe", "Description", (LongString newDescription) =>
+                _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-redescribe-title"), Loc.GetString("admin-verbs-dialog-redescribe-description"), (LongString newDescription) =>
                 {
                     _metaSystem.SetEntityDescription(args.Target, newDescription.String);
                 });
@@ -476,12 +476,12 @@ public sealed partial class AdminVerbSystem
 
         Verb renameAndRedescribe = new()
         {
-            Text = "Redescribe",
+            Text = Loc.GetString("admin-verbs-rename-and-redescribe"),
             Category = VerbCategory.Tricks,
             Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rename_and_redescribe.png")),
             Act = () =>
             {
-                _quickDialog.OpenDialog(player, "Rename & Redescribe", "Name", "Description",
+                _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-rename-and-redescribe-title"), Loc.GetString("admin-verbs-dialog-rename-name"), Loc.GetString("admin-verbs-dialog-redescribe-description"),
                     (string newName, LongString newDescription) =>
                     {
                         var meta = MetaData(args.Target);
@@ -501,7 +501,7 @@ public sealed partial class AdminVerbSystem
             {
                 Verb barJobSlots = new()
                 {
-                    Text = "Bar job slots",
+                    Text = Loc.GetString("admin-verbs-bar-job-slots"),
                     Category = VerbCategory.Tricks,
                     Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/bar_jobslots.png")),
                     Act = () =>
@@ -520,7 +520,7 @@ public sealed partial class AdminVerbSystem
 
             Verb locateCargoShuttle = new()
             {
-                Text = "Locate Cargo Shuttle",
+                Text = Loc.GetString("admin-verbs-locate-cargo-shuttle"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Soft/cargosoft.rsi"), "icon"),
                 Act = () =>
@@ -543,7 +543,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb refillBattery = new()
             {
-                Text = "Refill Battery",
+                Text = Loc.GetString("admin-verbs-refill-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill_battery.png")),
                 Act = () =>
@@ -564,7 +564,7 @@ public sealed partial class AdminVerbSystem
 
             Verb drainBattery = new()
             {
-                Text = "Drain Battery",
+                Text = Loc.GetString("admin-verbs-drain-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/drain_battery.png")),
                 Act = () =>
@@ -585,7 +585,7 @@ public sealed partial class AdminVerbSystem
 
             Verb infiniteBattery = new()
             {
-                Text = "Infinite Battery",
+                Text = Loc.GetString("admin-verbs-infinite-battery"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/infinite_battery.png")),
                 Act = () =>
@@ -615,7 +615,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb haltMovement = new()
             {
-                Text = "Halt Movement",
+                Text = Loc.GetString("admin-verbs-halt-movement"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/halt.png")),
                 Act = () =>
@@ -638,7 +638,7 @@ public sealed partial class AdminVerbSystem
                 {
                     Verb unpauseMap = new()
                     {
-                        Text = "Unpause Map",
+                        Text = Loc.GetString("admin-verbs-unpause-map"),
                         Category = VerbCategory.Tricks,
                         Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/play.png")),
                         Act = () =>
@@ -655,7 +655,7 @@ public sealed partial class AdminVerbSystem
                 {
                     Verb pauseMap = new()
                     {
-                        Text = "Pause Map",
+                        Text = Loc.GetString("admin-verbs-pause-map"),
                         Category = VerbCategory.Tricks,
                         Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/pause.png")),
                         Act = () =>
@@ -675,7 +675,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb snapJoints = new()
             {
-                Text = "Snap Joints",
+                Text = Loc.GetString("admin-verbs-snap-joints"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/snap_joints.png")),
                 Act = () =>
@@ -693,7 +693,7 @@ public sealed partial class AdminVerbSystem
         {
             Verb minigunFire = new()
             {
-                Text = "Make Minigun",
+                Text = Loc.GetString("admin-verbs-make-minigun"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi"), "icon"),
                 Act = () =>
@@ -712,12 +712,12 @@ public sealed partial class AdminVerbSystem
         {
             Verb setCapacity = new()
             {
-                Text = "Set Bullet Amount",
+                Text = Loc.GetString("admin-verbs-set-bullet-amount"),
                 Category = VerbCategory.Tricks,
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/caps.rsi"), "mag-6"),
                 Act = () =>
                 {
-                    _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (standard {ballisticAmmo.Capacity}):", (string amount) =>
+                    _quickDialog.OpenDialog(player, Loc.GetString("admin-verbs-dialog-set-bullet-amount-title"), Loc.GetString("admin-verbs-dialog-set-bullet-amount-amount", ("cap", ballisticAmmo.Capacity)), (string amount) =>
                     {
                         if (!int.TryParse(amount, out var result))
                             return;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 61e3013bd9..4232b034f3 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -9,6 +9,7 @@ using Content.Server.Prayer;
 using Content.Server.Silicons.Laws;
 using Content.Server.Station.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Administration.Systems;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Configurable;
diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index 2df9aa9fcc..91211716b5 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -582,7 +582,7 @@ namespace Content.Server.Administration.Systems
             {
                 GameRunLevel.PreRoundLobby => _gameTicker.RoundId == 0
                     ? "pre-round lobby after server restart" // first round after server restart has ID == 0
-                    : $"pre-round lobby for round {_gameTicker.RoundId + 1}",
+                    : $"pre-round lobby for round {_gameTicker.RoundId}",
                 GameRunLevel.InRound => $"round {_gameTicker.RoundId}",
                 GameRunLevel.PostRound => $"post-round {_gameTicker.RoundId}",
                 _ => throw new ArgumentOutOfRangeException(nameof(_gameTicker.RunLevel),
diff --git a/Content.Server/Administration/Toolshed/RejuvenateCommand.cs b/Content.Server/Administration/Toolshed/RejuvenateCommand.cs
index 3925badc58..b503e9cb96 100644
--- a/Content.Server/Administration/Toolshed/RejuvenateCommand.cs
+++ b/Content.Server/Administration/Toolshed/RejuvenateCommand.cs
@@ -1,5 +1,5 @@
-using Content.Server.Administration.Systems;
-using Content.Shared.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Administration.Systems;
 using Robust.Shared.Toolshed;
 using Robust.Shared.Toolshed.Errors;
 
diff --git a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
index 94b20c7b77..812a016b37 100644
--- a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
+++ b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Advertise.Components;
 using Content.Shared.Advertise.Systems;
+using Content.Shared.Chat;
 using Content.Shared.UserInterface;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
diff --git a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
index 4276eafd60..f47c2def5b 100644
--- a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
+++ b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
@@ -150,7 +150,7 @@ public sealed class AmeControllerSystem : EntitySystem
         // how much power can be produced at the current settings, in kW
         // we don't use max. here since this is what is set in the Controller, not what the AME is actually producing
         float targetedPowerSupply = 0;
-        if (TryGetAMENodeGroup(uid, out var group))
+        if (TryGetAMENodeGroup(uid, out var group) && group.CoreCount > 0)
         {
             coreCount = group.CoreCount;
             targetedPowerSupply = group.CalculatePower(controller.InjectionAmount, group.CoreCount) / 1000;
diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainGame.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainGame.cs
index ae4c15f2db..d8acf44da3 100644
--- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainGame.cs
+++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainGame.cs
@@ -243,7 +243,7 @@ public sealed partial class SpaceVillainGame
                 UpdateUi(
                     uid,
                     Loc.GetString("space-villain-game-player-loses-message"),
-                    Loc.GetString("space-villain-game-enemy-dies-with-player-message ", ("enemyName", _villainName)),
+                    Loc.GetString("space-villain-game-enemy-dies-with-player-message", ("enemyName", _villainName)),
                     true
                 );
                 _audioSystem.PlayPvs(arcade.GameOverSound, uid, AudioParams.Default.WithVolume(-4f));
diff --git a/Content.Server/Atmos/Components/DeltaPressureComponent.cs b/Content.Server/Atmos/Components/DeltaPressureComponent.cs
index 8031cd876d..0d2debe08a 100644
--- a/Content.Server/Atmos/Components/DeltaPressureComponent.cs
+++ b/Content.Server/Atmos/Components/DeltaPressureComponent.cs
@@ -34,18 +34,13 @@ public sealed partial class DeltaPressureComponent : Component
     [Access(typeof(DeltaPressureSystem), typeof(AtmosphereSystem))]
     public bool IsTakingDamage;
 
-    /// <summary>
-    /// The current cached position of this entity on the grid.
-    /// Updated via MoveEvent.
-    /// </summary>
-    [DataField(readOnly: true)]
-    public Vector2i CurrentPosition = Vector2i.Zero;
-
     /// <summary>
     /// The grid this entity is currently joined to for processing.
     /// Required for proper deletion, as we cannot reference the grid
     /// for removal while the entity is being deleted.
     /// </summary>
+    /// <remarks>Note that while <see cref="AirtightComponent"/> already stores the grid,
+    /// we cannot trust it to be available on init or when the entity is being deleted. Tragic.</remarks>
     [DataField]
     public EntityUid? GridUid;
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index 87cfce135d..29f091f340 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -355,10 +355,6 @@ public partial class AtmosphereSystem
         grid.Comp.DeltaPressureEntityLookup[ent.Owner] = grid.Comp.DeltaPressureEntities.Count;
         grid.Comp.DeltaPressureEntities.Add(ent);
 
-        ent.Comp.CurrentPosition = _map.CoordinatesToTile(grid,
-            Comp<MapGridComponent>(grid),
-            xform.Coordinates);
-
         ent.Comp.GridUid = grid.Owner;
         ent.Comp.InProcessingList = true;
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs
index 9d72b195fe..efddcaf1a7 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs
@@ -39,11 +39,13 @@ public sealed partial class AtmosphereSystem
          so simple vector operations like min/max/abs can be performed on them.
          */
 
+        var airtightComp = _airtightQuery.Comp(ent);
+        var currentPos = airtightComp.LastPosition.Tile;
         var tiles = new TileAtmosphere?[Atmospherics.Directions];
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
             var direction = (AtmosDirection)(1 << i);
-            var offset = ent.Comp.CurrentPosition.Offset(direction);
+            var offset = currentPos.Offset(direction);
             tiles[i] = gridAtmosComp.Tiles.GetValueOrDefault(offset);
         }
 
@@ -51,6 +53,21 @@ public sealed partial class AtmosphereSystem
 
         GetBulkTileAtmospherePressures(tiles, pressures);
 
+        // This entity could be airtight but still be able to contain air on the tile it's on (ex. directional windows).
+        // As such, substitute the pressure of the pressure on top of the entity for the directions that it can accept air from.
+        // (Or rather, don't do so for directions that it blocks air from.)
+        if (!airtightComp.NoAirWhenFullyAirBlocked)
+        {
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection)(1 << i);
+                if (!airtightComp.AirBlockedDirection.HasFlag(direction))
+                {
+                    pressures[i] = gridAtmosComp.Tiles.GetValueOrDefault(currentPos)?.Air?.Pressure ?? 0f;
+                }
+            }
+        }
+
         Span<float> opposingGroupA = stackalloc float[DeltaPressurePairCount];
         Span<float> opposingGroupB = stackalloc float[DeltaPressurePairCount];
         Span<float> opposingGroupMax = stackalloc float[DeltaPressurePairCount];
diff --git a/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs b/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs
index a6cbec0d0c..dd7091c270 100644
--- a/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs
@@ -17,7 +17,6 @@ namespace Content.Server.Atmos.EntitySystems;
 public sealed class DeltaPressureSystem : EntitySystem
 {
     [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
 
     public override void Initialize()
     {
@@ -26,29 +25,17 @@ public sealed class DeltaPressureSystem : EntitySystem
         SubscribeLocalEvent<DeltaPressureComponent, ComponentInit>(OnComponentInit);
         SubscribeLocalEvent<DeltaPressureComponent, ComponentShutdown>(OnComponentShutdown);
         SubscribeLocalEvent<DeltaPressureComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<DeltaPressureComponent, MoveEvent>(OnMoveEvent);
 
         SubscribeLocalEvent<DeltaPressureComponent, GridUidChangedEvent>(OnGridChanged);
     }
 
-    private void OnMoveEvent(Entity<DeltaPressureComponent> ent, ref MoveEvent args)
-    {
-        var xform = Transform(ent);
-        // May move off-grid, so, might as well protect against that.
-        if (!TryComp<MapGridComponent>(xform.GridUid, out var mapGridComponent))
-        {
-            return;
-        }
-
-        ent.Comp.CurrentPosition = _map.CoordinatesToTile(xform.GridUid.Value, mapGridComponent, args.NewPosition);
-    }
-
     private void OnComponentInit(Entity<DeltaPressureComponent> ent, ref ComponentInit args)
     {
         var xform = Transform(ent);
         if (xform.GridUid == null)
             return;
 
+        EnsureComp<AirtightComponent>(ent);
         _atmosphereSystem.TryAddDeltaPressureEntity(xform.GridUid.Value, ent);
     }
 
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 424f52ed58..81bd4e5c6c 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Server.Stunnable;
-using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Server.Damage.Components;
 using Content.Shared.ActionBlocker;
@@ -24,6 +23,7 @@ using Content.Shared.Toggleable;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands;
+using Content.Shared.Temperature.Components;
 using Robust.Server.Audio;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index 6f14debc3d..57c1504b16 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Rotting;
 using Content.Shared.Body.Events;
 using Content.Shared.Damage;
+using Content.Shared.Temperature.Components;
 using Robust.Server.Containers;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs
index 5821b0d944..46d2fdd8e8 100644
--- a/Content.Server/Body/Components/MetabolizerComponent.cs
+++ b/Content.Server/Body/Components/MetabolizerComponent.cs
@@ -10,13 +10,13 @@ namespace Content.Server.Body.Components
     /// <summary>
     ///     Handles metabolizing various reagents with given effects.
     /// </summary>
-    [RegisterComponent, Access(typeof(MetabolizerSystem))]
+    [RegisterComponent, AutoGenerateComponentPause, Access(typeof(MetabolizerSystem))]
     public sealed partial class MetabolizerComponent : Component
     {
         /// <summary>
         ///     The next time that reagents will be metabolized.
         /// </summary>
-        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+        [DataField, AutoPausedField]
         public TimeSpan NextUpdate;
 
         /// <summary>
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
index c59f87f576..b5b30ae74c 100644
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ b/Content.Server/Body/Systems/MetabolizerSystem.cs
@@ -1,226 +1,282 @@
 using Content.Server.Body.Components;
-using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
+using Content.Shared.Body.Prototypes;
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions.Conditions;
+using Content.Shared.EntityConditions.Conditions.Body;
 using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Body;
+using Content.Shared.EntityEffects.Effects.Solution;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Random.Helpers;
 using Robust.Shared.Collections;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Body.Systems
+namespace Content.Server.Body.Systems;
+
+/// <inheritdoc/>
+public sealed class MetabolizerSystem : SharedMetabolizerSystem
 {
-    /// <inheritdoc/>
-    public sealed class MetabolizerSystem : SharedMetabolizerSystem
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
+    [Dependency] private readonly SharedEntityConditionsSystem _entityConditions = default!;
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+
+    private EntityQuery<OrganComponent> _organQuery;
+    private EntityQuery<SolutionContainerManagerComponent> _solutionQuery;
+    private static readonly ProtoId<MetabolismGroupPrototype> Gas = "Gas";
+
+    public override void Initialize()
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+        base.Initialize();
 
-        private EntityQuery<OrganComponent> _organQuery;
-        private EntityQuery<SolutionContainerManagerComponent> _solutionQuery;
+        _organQuery = GetEntityQuery<OrganComponent>();
+        _solutionQuery = GetEntityQuery<SolutionContainerManagerComponent>();
 
-        public override void Initialize()
+        SubscribeLocalEvent<MetabolizerComponent, ComponentInit>(OnMetabolizerInit);
+        SubscribeLocalEvent<MetabolizerComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<MetabolizerComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
+    }
+
+    private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
+    }
+
+    private void OnMetabolizerInit(Entity<MetabolizerComponent> entity, ref ComponentInit args)
+    {
+        if (!entity.Comp.SolutionOnBody)
         {
-            base.Initialize();
-
-            _organQuery = GetEntityQuery<OrganComponent>();
-            _solutionQuery = GetEntityQuery<SolutionContainerManagerComponent>();
-
-            SubscribeLocalEvent<MetabolizerComponent, ComponentInit>(OnMetabolizerInit);
-            SubscribeLocalEvent<MetabolizerComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<MetabolizerComponent, EntityUnpausedEvent>(OnUnpaused);
-            SubscribeLocalEvent<MetabolizerComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
+            _solutionContainerSystem.EnsureSolution(entity.Owner, entity.Comp.SolutionName, out _);
         }
-
-        private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
+        else if (_organQuery.CompOrNull(entity)?.Body is { } body)
         {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
-        }
-
-        private void OnUnpaused(Entity<MetabolizerComponent> ent, ref EntityUnpausedEvent args)
-        {
-            ent.Comp.NextUpdate += args.PausedTime;
-        }
-
-        private void OnMetabolizerInit(Entity<MetabolizerComponent> entity, ref ComponentInit args)
-        {
-            if (!entity.Comp.SolutionOnBody)
-            {
-                _solutionContainerSystem.EnsureSolution(entity.Owner, entity.Comp.SolutionName, out _);
-            }
-            else if (_organQuery.CompOrNull(entity)?.Body is { } body)
-            {
-                _solutionContainerSystem.EnsureSolution(body, entity.Comp.SolutionName, out _);
-            }
-        }
-
-        private void OnApplyMetabolicMultiplier(Entity<MetabolizerComponent> ent, ref ApplyMetabolicMultiplierEvent args)
-        {
-            ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            var metabolizers = new ValueList<(EntityUid Uid, MetabolizerComponent Component)>(Count<MetabolizerComponent>());
-            var query = EntityQueryEnumerator<MetabolizerComponent>();
-
-            while (query.MoveNext(out var uid, out var comp))
-            {
-                metabolizers.Add((uid, comp));
-            }
-
-            foreach (var (uid, metab) in metabolizers)
-            {
-                // Only update as frequently as it should
-                if (_gameTiming.CurTime < metab.NextUpdate)
-                    continue;
-
-                metab.NextUpdate += metab.AdjustedUpdateInterval;
-                TryMetabolize((uid, metab));
-            }
-        }
-
-        private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, SolutionContainerManagerComponent?> ent)
-        {
-            _organQuery.Resolve(ent, ref ent.Comp2, logMissing: false);
-
-            // First step is get the solution we actually care about
-            var solutionName = ent.Comp1.SolutionName;
-            Solution? solution = null;
-            Entity<SolutionComponent>? soln = default!;
-            EntityUid? solutionEntityUid = null;
-
-            if (ent.Comp1.SolutionOnBody)
-            {
-                if (ent.Comp2?.Body is { } body)
-                {
-                    if (!_solutionQuery.Resolve(body, ref ent.Comp3, logMissing: false))
-                        return;
-
-                    _solutionContainerSystem.TryGetSolution((body, ent.Comp3), solutionName, out soln, out solution);
-                    solutionEntityUid = body;
-                }
-            }
-            else
-            {
-                if (!_solutionQuery.Resolve(ent, ref ent.Comp3, logMissing: false))
-                    return;
-
-                _solutionContainerSystem.TryGetSolution((ent, ent), solutionName, out soln, out solution);
-                solutionEntityUid = ent;
-            }
-
-            if (solutionEntityUid is null
-                || soln is null
-                || solution is null
-                || solution.Contents.Count == 0)
-            {
-                return;
-            }
-
-            // randomize the reagent list so we don't have any weird quirks
-            // like alphabetical order or insertion order mattering for processing
-            var list = solution.Contents.ToArray();
-            _random.Shuffle(list);
-
-            int reagents = 0;
-            foreach (var (reagent, quantity) in list)
-            {
-                if (!_prototypeManager.TryIndex<ReagentPrototype>(reagent.Prototype, out var proto))
-                    continue;
-
-                var mostToRemove = FixedPoint2.Zero;
-                if (proto.Metabolisms is null)
-                {
-                    if (ent.Comp1.RemoveEmpty)
-                    {
-                        solution.RemoveReagent(reagent, FixedPoint2.New(1));
-                    }
-
-                    continue;
-                }
-
-                // we're done here entirely if this is true
-                if (reagents >= ent.Comp1.MaxReagentsProcessable)
-                    return;
-
-
-                // loop over all our groups and see which ones apply
-                if (ent.Comp1.MetabolismGroups is null)
-                    continue;
-
-                foreach (var group in ent.Comp1.MetabolismGroups)
-                {
-                    if (!proto.Metabolisms.TryGetValue(group.Id, out var entry))
-                        continue;
-
-                    var rate = entry.MetabolismRate * group.MetabolismRateModifier;
-
-                    // Remove $rate, as long as there's enough reagent there to actually remove that much
-                    mostToRemove = FixedPoint2.Clamp(rate, 0, quantity);
-
-                    float scale = (float) mostToRemove / (float) rate;
-
-                    // if it's possible for them to be dead, and they are,
-                    // then we shouldn't process any effects, but should probably
-                    // still remove reagents
-                    if (TryComp<MobStateComponent>(solutionEntityUid.Value, out var state))
-                    {
-                        if (!proto.WorksOnTheDead && _mobStateSystem.IsDead(solutionEntityUid.Value, state))
-                            continue;
-                    }
-
-                    var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
-                    var args = new EntityEffectReagentArgs(actualEntity, EntityManager, ent, solution, mostToRemove, proto, null, scale);
-
-                    // do all effects, if conditions apply
-                    foreach (var effect in entry.Effects)
-                    {
-                        if (!effect.ShouldApply(args, _random))
-                            continue;
-
-                        if (effect.ShouldLog)
-                        {
-                            _adminLogger.Add(
-                                LogType.ReagentEffect,
-                                effect.LogImpact,
-                                $"Metabolism effect {effect.GetType().Name:effect}"
-                                + $" of reagent {proto.LocalizedName:reagent}"
-                                + $" applied on entity {actualEntity:entity}"
-                                + $" at {Transform(actualEntity).Coordinates:coordinates}"
-                            );
-                        }
-
-                        effect.Effect(args);
-                    }
-                }
-
-                // remove a certain amount of reagent
-                if (mostToRemove > FixedPoint2.Zero)
-                {
-                    solution.RemoveReagent(reagent, mostToRemove);
-
-                    // We have processed a reagant, so count it towards the cap
-                    reagents += 1;
-                }
-            }
-
-            _solutionContainerSystem.UpdateChemicals(soln.Value);
+            _solutionContainerSystem.EnsureSolution(body, entity.Comp.SolutionName, out _);
         }
     }
+
+    private void OnApplyMetabolicMultiplier(Entity<MetabolizerComponent> ent, ref ApplyMetabolicMultiplierEvent args)
+    {
+        ent.Comp.UpdateIntervalMultiplier = args.Multiplier;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var metabolizers = new ValueList<(EntityUid Uid, MetabolizerComponent Component)>(Count<MetabolizerComponent>());
+        var query = EntityQueryEnumerator<MetabolizerComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            metabolizers.Add((uid, comp));
+        }
+
+        foreach (var (uid, metab) in metabolizers)
+        {
+            // Only update as frequently as it should
+            if (_gameTiming.CurTime < metab.NextUpdate)
+                continue;
+
+            metab.NextUpdate += metab.AdjustedUpdateInterval;
+            TryMetabolize((uid, metab));
+        }
+    }
+
+    private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, SolutionContainerManagerComponent?> ent)
+    {
+        _organQuery.Resolve(ent, ref ent.Comp2, logMissing: false);
+
+        // First step is get the solution we actually care about
+        var solutionName = ent.Comp1.SolutionName;
+        Solution? solution = null;
+        Entity<SolutionComponent>? soln = default!;
+        EntityUid? solutionEntityUid = null;
+
+        if (ent.Comp1.SolutionOnBody)
+        {
+            if (ent.Comp2?.Body is { } body)
+            {
+                if (!_solutionQuery.Resolve(body, ref ent.Comp3, logMissing: false))
+                    return;
+
+                _solutionContainerSystem.TryGetSolution((body, ent.Comp3), solutionName, out soln, out solution);
+                solutionEntityUid = body;
+            }
+        }
+        else
+        {
+            if (!_solutionQuery.Resolve(ent, ref ent.Comp3, logMissing: false))
+                return;
+
+            _solutionContainerSystem.TryGetSolution((ent, ent), solutionName, out soln, out solution);
+            solutionEntityUid = ent;
+        }
+
+        if (solutionEntityUid is null
+            || soln is null
+            || solution is null
+            || solution.Contents.Count == 0)
+        {
+            return;
+        }
+
+        // randomize the reagent list so we don't have any weird quirks
+        // like alphabetical order or insertion order mattering for processing
+        var list = solution.Contents.ToArray();
+        _random.Shuffle(list);
+
+        int reagents = 0;
+        foreach (var (reagent, quantity) in list)
+        {
+            if (!_prototypeManager.TryIndex<ReagentPrototype>(reagent.Prototype, out var proto))
+                continue;
+
+            var mostToRemove = FixedPoint2.Zero;
+            if (proto.Metabolisms is null)
+            {
+                if (ent.Comp1.RemoveEmpty)
+                {
+                    solution.RemoveReagent(reagent, FixedPoint2.New(1));
+                }
+
+                continue;
+            }
+
+            // we're done here entirely if this is true
+            if (reagents >= ent.Comp1.MaxReagentsProcessable)
+                return;
+
+
+            // loop over all our groups and see which ones apply
+            if (ent.Comp1.MetabolismGroups is null)
+                continue;
+
+            // TODO: Kill MetabolismGroups!
+            foreach (var group in ent.Comp1.MetabolismGroups)
+            {
+                if (!proto.Metabolisms.TryGetValue(group.Id, out var entry))
+                    continue;
+
+                var rate = entry.MetabolismRate * group.MetabolismRateModifier;
+
+                // Remove $rate, as long as there's enough reagent there to actually remove that much
+                mostToRemove = FixedPoint2.Clamp(rate, 0, quantity);
+
+                var scale = (float) mostToRemove;
+
+                // TODO: This is a very stupid workaround to lungs heavily relying on scale = reagent quantity. Needs lung and metabolism refactors to remove.
+                // TODO: Lungs just need to have their scale be equal to the mols consumed, scale needs to be not hardcoded either and configurable per metabolizer...
+                if (group.Id != Gas)
+                    scale /= (float) entry.MetabolismRate;
+
+                // if it's possible for them to be dead, and they are,
+                // then we shouldn't process any effects, but should probably
+                // still remove reagents
+                if (TryComp<MobStateComponent>(solutionEntityUid.Value, out var state))
+                {
+                    if (!proto.WorksOnTheDead && _mobStateSystem.IsDead(solutionEntityUid.Value, state))
+                        continue;
+                }
+
+                var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
+
+                // do all effects, if conditions apply
+                foreach (var effect in entry.Effects)
+                {
+                    if (scale < effect.MinScale)
+                        continue;
+
+                    if (effect.Probability < 1.0f && !_random.Prob(effect.Probability))
+                        continue;
+
+                    // See if conditions apply
+                    if (effect.Conditions != null && !CanMetabolizeEffect(actualEntity, ent, soln.Value, effect.Conditions))
+                        continue;
+
+                    ApplyEffect(effect);
+
+                }
+
+                // TODO: We should have to do this with metabolism. ReagentEffect struct needs refactoring and so does metabolism!
+                void ApplyEffect(EntityEffect effect)
+                {
+                    switch (effect)
+                    {
+                        case ModifyLungGas:
+                            _entityEffects.ApplyEffect(ent, effect, scale);
+                            break;
+                        case AdjustReagent:
+                            _entityEffects.ApplyEffect(soln.Value, effect, scale);
+                            break;
+                        default:
+                            _entityEffects.ApplyEffect(actualEntity, effect, scale);
+                            break;
+                    }
+                }
+            }
+
+            // remove a certain amount of reagent
+            if (mostToRemove > FixedPoint2.Zero)
+            {
+                solution.RemoveReagent(reagent, mostToRemove);
+
+                // We have processed a reagant, so count it towards the cap
+                reagents += 1;
+            }
+        }
+
+        _solutionContainerSystem.UpdateChemicals(soln.Value);
+    }
+
+    /// <summary>
+    /// Public API to check if a certain metabolism effect can be applied to an entity.
+    /// TODO: With metabolism refactor make this logic smarter and unhardcode the old hardcoding entity effects used to have for metabolism!
+    /// </summary>
+    /// <param name="body">The body metabolizing the effects</param>
+    /// <param name="organ">The organ doing the metabolizing</param>
+    /// <param name="solution">The solution we are metabolizing from</param>
+    /// <param name="conditions">The conditions that need to be met to metabolize</param>
+    /// <returns>True if we can metabolize! False if we cannot!</returns>
+    public bool CanMetabolizeEffect(EntityUid body, EntityUid organ, Entity<SolutionComponent> solution, EntityCondition[] conditions)
+    {
+        foreach (var condition in conditions)
+        {
+            switch (condition)
+            {
+                // Need specific handling of specific conditions since Metabolism is funny like that.
+                // TODO: MetabolizerTypes should be handled well before this stage by metabolism itself.
+                case MetabolizerTypeCondition:
+                    if (_entityConditions.TryCondition(organ, condition))
+                        continue;
+                    break;
+                case ReagentCondition:
+                    if (_entityConditions.TryCondition(solution, condition))
+                        continue;
+                    break;
+                default:
+                    if (_entityConditions.TryCondition(body, condition))
+                        continue;
+                    break;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
 }
+
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 63b04adc6a..ca3ee2c9e1 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -2,21 +2,23 @@ using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Chat.Systems;
-using Content.Server.EntityEffects;
 using Content.Shared.Body.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Prototypes;
+using Content.Shared.Chat;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
 using Content.Shared.Database;
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions.Conditions.Body;
 using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.EffectConditions;
 using Content.Shared.EntityEffects.Effects;
+using Content.Shared.EntityEffects.Effects.Body;
 using Content.Shared.Mobs.Systems;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
@@ -29,16 +31,16 @@ public sealed class RespiratorSystem : EntitySystem
 {
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly AlertsSystem _alertsSystem = default!;
     [Dependency] private readonly AtmosphereSystem _atmosSys = default!;
     [Dependency] private readonly BodySystem _bodySystem = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
     [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 SharedEntityConditionsSystem _entityConditions = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly EntityEffectSystem _entityEffect = default!;
 
     private static readonly ProtoId<MetabolismGroupPrototype> GasId = new("Gas");
 
@@ -340,7 +342,6 @@ public sealed class RespiratorSystem : EntitySystem
             }
         }
 
-        // 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(EntityEffect effect)
@@ -348,9 +349,10 @@ public sealed class RespiratorSystem : EntitySystem
             if (effect.Conditions == null)
                 return true;
 
+            // TODO: Use Metabolism Public API to do this instead, once that API has been built.
             foreach (var cond in effect.Conditions)
             {
-                if (cond is OrganType organ && !_entityEffect.OrganCondition(organ, lung))
+                if (cond is MetabolizerTypeCondition organ && !_entityConditions.TryCondition(lung, organ))
                     return false;
             }
 
diff --git a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
index 3ba9e6af31..af7b17643e 100644
--- a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
+++ b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Body.Components;
-using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Temperature.Components;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index ee7ca4f584..253eea2df9 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -1,8 +1,9 @@
 using Content.Server.Botany.Components;
 using Content.Server.Botany.Systems;
-using Content.Server.EntityEffects;
+using Content.Server.EntityEffects.Effects.Botany;
 using Content.Shared.Atmos;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.Random;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -79,9 +80,13 @@ public partial struct SeedChemQuantity
     [DataField("Inherent")] public bool Inherent = true;
 }
 
-// TODO reduce the number of friends to a reasonable level. Requires ECS-ing things like plant holder component.
+// TODO Make Botany ECS and give it a proper API. I removed the limited access of this class because it's egregious how many systems needed access to it due to a lack of an actual API.
+/// <remarks>
+/// SeedData is no longer restricted because the number of friends is absolutely unreasonable.
+/// This entire data definition is unreasonable. I felt genuine fear looking at this, this is horrific. Send help.
+/// </remarks>
+// TODO: Hit Botany with hammers
 [Virtual, DataDefinition]
-[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent), typeof(EntityEffectSystem), typeof(MutationSystem))]
 public partial class SeedData
 {
     #region Tracking
diff --git a/Content.Server/Botany/Systems/BotanySystem.Produce.cs b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
index f6f3f99c09..7d8f8652c7 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Produce.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
@@ -7,6 +7,8 @@ namespace Content.Server.Botany.Systems;
 
 public sealed partial class BotanySystem
 {
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
+
     public void ProduceGrown(EntityUid uid, ProduceComponent produce)
     {
         if (!TryGetSeed(produce, out var seed))
@@ -15,10 +17,7 @@ public sealed partial class BotanySystem
         foreach (var mutation in seed.Mutations)
         {
             if (mutation.AppliesToProduce)
-            {
-                var args = new EntityEffectBaseArgs(uid, EntityManager);
-                mutation.Effect.Effect(args);
-            }
+                _entityEffects.TryApplyEffect(uid, mutation.Effect);
         }
 
         if (!_solutionContainerSystem.EnsureSolution(uid,
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index ee35db48e3..834fd9e8ef 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -13,6 +13,7 @@ public sealed class MutationSystem : EntitySystem
 
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
     private RandomPlantMutationListPrototype _randomMutations = default!;
 
     public override void Initialize()
@@ -32,10 +33,8 @@ public sealed class MutationSystem : EntitySystem
             if (Random(Math.Min(mutation.BaseOdds * severity, 1.0f)))
             {
                 if (mutation.AppliesToPlant)
-                {
-                    var args = new EntityEffectBaseArgs(plantHolder, EntityManager);
-                    mutation.Effect.Effect(args);
-                }
+                    _entityEffects.TryApplyEffect(plantHolder, mutation.Effect);
+
                 // Stat adjustments do not persist by being an attached effect, they just change the stat.
                 if (mutation.Persists && !seed.Mutations.Any(m => m.Name == mutation.Name))
                     seed.Mutations.Add(mutation);
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index caa796efe2..2554f95455 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -24,8 +24,10 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
+using Content.Shared.EntityEffects;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Labels.Components;
 
@@ -48,6 +50,7 @@ public sealed class PlantHolderSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
 
     public const float HydroponicsSpeedMultiplier = 1f;
     public const float HydroponicsConsumptionMultiplier = 2f;
@@ -887,7 +890,7 @@ public sealed class PlantHolderSystem : EntitySystem
             foreach (var entry in _solutionContainerSystem.RemoveEachReagent(component.SoilSolution.Value, amt))
             {
                 var reagentProto = _prototype.Index<ReagentPrototype>(entry.Reagent.Prototype);
-                reagentProto.ReactionPlant(uid, entry, solution, EntityManager, _random, _adminLogger);
+                _entityEffects.ApplyEffects(uid, reagentProto.PlantMetabolisms.ToArray());
             }
         }
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Funds.cs b/Content.Server/Cargo/Systems/CargoSystem.Funds.cs
index 4a3fa5330e..bc6571c0cc 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Funds.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Funds.cs
@@ -56,7 +56,7 @@ public sealed partial class CargoSystem
         if (args.Account == null)
         {
             var stackPrototype = _protoMan.Index(ent.Comp.CashType);
-            _stack.Spawn(args.Amount, stackPrototype, Transform(ent).Coordinates);
+            _stack.SpawnAtPosition(args.Amount, stackPrototype, Transform(ent).Coordinates);
 
             if (!_emag.CheckFlag(ent, EmagType.Interaction))
             {
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index 18ae856fda..9f3a4d5bf3 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -1,20 +1,15 @@
 using Content.Server.Cargo.Components;
 using Content.Server.DeviceLinking.Systems;
 using Content.Server.Popups;
-using Content.Server.Shuttles.Systems;
 using Content.Server.Stack;
 using Content.Server.Station.Systems;
 using Content.Shared.Access.Systems;
 using Content.Shared.Administration.Logs;
 using Content.Server.Radio.EntitySystems;
 using Content.Shared.Cargo;
-using Content.Shared.Cargo.Components;
-using Content.Shared.Cargo.Prototypes;
-using Content.Shared.CCVar;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Paper;
-using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
@@ -76,49 +71,4 @@ public sealed partial class CargoSystem : SharedCargoSystem
         UpdateTelepad(frameTime);
         UpdateBounty();
     }
-
-    public void UpdateBankAccount(
-        Entity<StationBankAccountComponent?> ent,
-        int balanceAdded,
-        ProtoId<CargoAccountPrototype> account,
-        bool dirty = true)
-    {
-        UpdateBankAccount(
-            ent,
-            balanceAdded,
-            new Dictionary<ProtoId<CargoAccountPrototype>, double> { {account, 1} },
-            dirty: dirty);
-    }
-
-    /// <summary>
-    /// Adds or removes funds from the <see cref="StationBankAccountComponent"/>.
-    /// </summary>
-    /// <param name="ent">The station.</param>
-    /// <param name="balanceAdded">The amount of funds to add or remove.</param>
-    /// <param name="accountDistribution">The distribution between individual <see cref="CargoAccountPrototype"/>.</param>
-    /// <param name="dirty">Whether to mark the bank account component as dirty.</param>
-    [PublicAPI]
-    public void UpdateBankAccount(
-        Entity<StationBankAccountComponent?> ent,
-        int balanceAdded,
-        Dictionary<ProtoId<CargoAccountPrototype>, double> accountDistribution,
-        bool dirty = true)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return;
-
-        foreach (var (account, percent) in accountDistribution)
-        {
-            var accountBalancedAdded = (int) Math.Round(percent * balanceAdded);
-            ent.Comp.Accounts[account] += accountBalancedAdded;
-        }
-
-        var ev = new BankBalanceUpdatedEvent(ent, ent.Comp.Accounts);
-        RaiseLocalEvent(ent, ref ev, true);
-
-        if (!dirty)
-            return;
-
-        Dirty(ent);
-    }
 }
diff --git a/Content.Server/Chat/Commands/LOOCCommand.cs b/Content.Server/Chat/Commands/LOOCCommand.cs
index e303b9766d..3737b5d518 100644
--- a/Content.Server/Chat/Commands/LOOCCommand.cs
+++ b/Content.Server/Chat/Commands/LOOCCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Chat;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 
diff --git a/Content.Server/Chat/Commands/MeCommand.cs b/Content.Server/Chat/Commands/MeCommand.cs
index 36acfa7a69..f5b845a2d7 100644
--- a/Content.Server/Chat/Commands/MeCommand.cs
+++ b/Content.Server/Chat/Commands/MeCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Chat;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 
diff --git a/Content.Server/Chat/Commands/SayCommand.cs b/Content.Server/Chat/Commands/SayCommand.cs
index 99ca4660f0..199cd69098 100644
--- a/Content.Server/Chat/Commands/SayCommand.cs
+++ b/Content.Server/Chat/Commands/SayCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Chat;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 
diff --git a/Content.Server/Chat/Commands/WhisperCommand.cs b/Content.Server/Chat/Commands/WhisperCommand.cs
index 0556dd8036..d31b21abb1 100644
--- a/Content.Server/Chat/Commands/WhisperCommand.cs
+++ b/Content.Server/Chat/Commands/WhisperCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Chat;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 
diff --git a/Content.Server/Chat/Systems/AutoEmoteSystem.cs b/Content.Server/Chat/Systems/AutoEmoteSystem.cs
index 3d6bd53540..ebb22f6314 100644
--- a/Content.Server/Chat/Systems/AutoEmoteSystem.cs
+++ b/Content.Server/Chat/Systems/AutoEmoteSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -46,7 +47,11 @@ public sealed class AutoEmoteSystem : EntitySystem
 
                 if (autoEmotePrototype.WithChat)
                 {
-                    _chatSystem.TryEmoteWithChat(uid, autoEmotePrototype.EmoteId, autoEmotePrototype.HiddenFromChatWindow ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal);
+                    _chatSystem.TryEmoteWithChat(uid,
+                        autoEmotePrototype.EmoteId,
+                        autoEmotePrototype.HiddenFromChatWindow ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal,
+                        ignoreActionBlocker: autoEmotePrototype.IgnoreActionBlocker,
+                        forceEmote: autoEmotePrototype.Force);
                 }
                 else
                 {
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 3983907735..438129c24d 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -76,7 +76,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     public override void Initialize()
     {
         base.Initialize();
-        CacheEmotes();
+
         Subs.CVar(_configurationManager, CCVars.LoocEnabled, OnLoocEnabledChanged, true);
         Subs.CVar(_configurationManager, CCVars.DeadLoocEnabled, OnDeadLoocEnabledChanged, true);
         Subs.CVar(_configurationManager, CCVars.CritLoocEnabled, OnCritLoocEnabledChanged, true);
@@ -128,42 +128,24 @@ public sealed partial class ChatSystem : SharedChatSystem
         }
     }
 
-    /// <summary>
-    ///     Sends an in-character chat message to relevant clients.
-    /// </summary>
-    /// <param name="source">The entity that is speaking</param>
-    /// <param name="message">The message being spoken or emoted</param>
-    /// <param name="desiredType">The chat type</param>
-    /// <param name="hideChat">Whether or not this message should appear in the chat window</param>
-    /// <param name="hideLog">Whether or not this message should appear in the adminlog window</param>
-    /// <param name="shell"></param>
-    /// <param name="player">The player doing the speaking</param>
-    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
-    public void TrySendInGameICMessage(
+    /// <inheritdoc />
+    public override void TrySendInGameICMessage(
         EntityUid source,
         string message,
         InGameICChatType desiredType,
-        bool hideChat, bool hideLog = false,
+        bool hideChat,
+        bool hideLog = false,
         IConsoleShell? shell = null,
-        ICommonSession? player = null, string? nameOverride = null,
+        ICommonSession? player = null,
+        string? nameOverride = null,
         bool checkRadioPrefix = true,
         bool ignoreActionBlocker = false)
     {
         TrySendInGameICMessage(source, message, desiredType, hideChat ? ChatTransmitRange.HideChat : ChatTransmitRange.Normal, hideLog, shell, player, nameOverride, checkRadioPrefix, ignoreActionBlocker);
     }
 
-    /// <summary>
-    ///     Sends an in-character chat message to relevant clients.
-    /// </summary>
-    /// <param name="source">The entity that is speaking</param>
-    /// <param name="message">The message being spoken or emoted</param>
-    /// <param name="desiredType">The chat type</param>
-    /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
-    /// <param name="shell"></param>
-    /// <param name="player">The player doing the speaking</param>
-    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
-    /// <param name="ignoreActionBlocker">If set to true, action blocker will not be considered for whether an entity can send this message.</param>
-    public void TrySendInGameICMessage(
+    /// <inheritdoc />
+    public override void TrySendInGameICMessage(
         EntityUid source,
         string message,
         InGameICChatType desiredType,
@@ -260,7 +242,8 @@ public sealed partial class ChatSystem : SharedChatSystem
         }
     }
 
-    public void TrySendInGameOOCMessage(
+    /// <inheritdoc />
+    public override void TrySendInGameOOCMessage(
         EntityUid source,
         string message,
         InGameOOCChatType type,
@@ -309,14 +292,8 @@ public sealed partial class ChatSystem : SharedChatSystem
 
     #region Announcements
 
-    /// <summary>
-    /// Dispatches an announcement to all.
-    /// </summary>
-    /// <param name="message">The contents of the message</param>
-    /// <param name="sender">The sender (Communications Console in Communications Console Announcement)</param>
-    /// <param name="playSound">Play the announcement sound</param>
-    /// <param name="colorOverride">Optional color for the announcement message</param>
-    public void DispatchGlobalAnnouncement(
+    /// <inheritdoc />
+    public override void DispatchGlobalAnnouncement(
         string message,
         string? sender = null,
         bool playSound = true,
@@ -336,17 +313,8 @@ public sealed partial class ChatSystem : SharedChatSystem
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Global station announcement from {sender}: {message}");
     }
 
-    /// <summary>
-    /// Dispatches an announcement to players selected by filter.
-    /// </summary>
-    /// <param name="filter">Filter to select players who will recieve the announcement</param>
-    /// <param name="message">The contents of the message</param>
-    /// <param name="source">The entity making the announcement (used to determine the station)</param>
-    /// <param name="sender">The sender (Communications Console in Communications Console Announcement)</param>
-    /// <param name="playDefaultSound">Play the announcement sound</param>
-    /// <param name="announcementSound">Sound to play</param>
-    /// <param name="colorOverride">Optional color for the announcement message</param>
-    public void DispatchFilteredAnnouncement(
+    /// <inheritdoc />
+    public override void DispatchFilteredAnnouncement(
         Filter filter,
         string message,
         EntityUid? source = null,
@@ -366,15 +334,8 @@ public sealed partial class ChatSystem : SharedChatSystem
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Station Announcement from {sender}: {message}");
     }
 
-    /// <summary>
-    /// Dispatches an announcement on a specific station
-    /// </summary>
-    /// <param name="source">The entity making the announcement (used to determine the station)</param>
-    /// <param name="message">The contents of the message</param>
-    /// <param name="sender">The sender (Communications Console in Communications Console Announcement)</param>
-    /// <param name="playDefaultSound">Play the announcement sound</param>
-    /// <param name="colorOverride">Optional color for the announcement message</param>
-    public void DispatchStationAnnouncement(
+    /// <inheritdoc />
+    public override void DispatchStationAnnouncement(
         EntityUid source,
         string message,
         string? sender = null,
@@ -572,7 +533,7 @@ public sealed partial class ChatSystem : SharedChatSystem
             }
     }
 
-    private void SendEntityEmote(
+    protected override void SendEntityEmote(
         EntityUid source,
         string action,
         ChatTransmitRange range,
@@ -913,91 +874,3 @@ public sealed partial class ChatSystem : SharedChatSystem
 public record ExpandICChatRecipientsEvent(EntityUid Source, float VoiceRange, Dictionary<ICommonSession, ChatSystem.ICChatRecipientData> Recipients)
 {
 }
-
-/// <summary>
-///     Raised broadcast in order to transform speech.transmit
-/// </summary>
-public sealed class TransformSpeechEvent : EntityEventArgs
-{
-    public EntityUid Sender;
-    public string Message;
-
-    public TransformSpeechEvent(EntityUid sender, string message)
-    {
-        Sender = sender;
-        Message = message;
-    }
-}
-
-public sealed class CheckIgnoreSpeechBlockerEvent : EntityEventArgs
-{
-    public EntityUid Sender;
-    public bool IgnoreBlocker;
-
-    public CheckIgnoreSpeechBlockerEvent(EntityUid sender, bool ignoreBlocker)
-    {
-        Sender = sender;
-        IgnoreBlocker = ignoreBlocker;
-    }
-}
-
-/// <summary>
-///     Raised on an entity when it speaks, either through 'say' or 'whisper'.
-/// </summary>
-public sealed class EntitySpokeEvent : EntityEventArgs
-{
-    public readonly EntityUid Source;
-    public readonly string Message;
-    public readonly string OriginalMessage;
-    public readonly string? ObfuscatedMessage; // not null if this was a whisper
-
-    /// <summary>
-    ///     If the entity was trying to speak into a radio, this was the channel they were trying to access. If a radio
-    ///     message gets sent on this channel, this should be set to null to prevent duplicate messages.
-    /// </summary>
-    public RadioChannelPrototype? Channel;
-
-    public EntitySpokeEvent(EntityUid source, string message, string originalMessage, RadioChannelPrototype? channel, string? obfuscatedMessage)
-    {
-        Source = source;
-        Message = message;
-        OriginalMessage = originalMessage; // Corvax-TTS: Spec symbol sanitize
-        Channel = channel;
-        ObfuscatedMessage = obfuscatedMessage;
-    }
-}
-
-/// <summary>
-///     InGame IC chat is for chat that is specifically ingame (not lobby) but is also in character, i.e. speaking.
-/// </summary>
-// ReSharper disable once InconsistentNaming
-public enum InGameICChatType : byte
-{
-    Speak,
-    Emote,
-    Whisper
-}
-
-/// <summary>
-///     InGame OOC chat is for chat that is specifically ingame (not lobby) but is OOC, like deadchat or LOOC.
-/// </summary>
-public enum InGameOOCChatType : byte
-{
-    Looc,
-    Dead
-}
-
-/// <summary>
-///     Controls transmission of chat.
-/// </summary>
-public enum ChatTransmitRange : byte
-{
-    /// Acts normal, ghosts can hear across the map, etc.
-    Normal,
-    /// Normal but ghosts are still range-limited.
-    GhostRangeLimit,
-    /// Hidden from the chat window.
-    HideChat,
-    /// Ghosts can't hear or see it at all. Regular players can if in-range.
-    NoGhosts
-}
diff --git a/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs b/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs
index 878c517d92..4afb885c4c 100644
--- a/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs
+++ b/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs
@@ -1,5 +1,6 @@
 namespace Content.Server.Chat.Systems;
 
+using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Damage;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
index a70c2196ab..58c86f058a 100644
--- a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
+++ b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs
@@ -39,7 +39,7 @@ public sealed class DumpReagentGuideText : LocalizedEntityCommands
         {
             foreach (var effect in entry.Effects)
             {
-                shell.WriteLine(effect.GuidebookEffectDescription(_prototype, EntityManager.EntitySysManager) ??
+                shell.WriteLine(reagent.GuidebookReagentEffectDescription(_prototype, EntityManager.EntitySysManager, effect, entry.MetabolismRate) ??
                                 Loc.GetString($"cmd-dumpreagentguidetext-skipped", ("effect", effect.GetType())));
             }
         }
diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
index 3cba02a599..2d751ba441 100644
--- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
@@ -146,10 +146,10 @@ namespace Content.Server.Chemistry.EntitySystems
             {
                 // force open container, if applicable, to avoid confusing people on why it doesn't dispense
                 _openable.SetOpen(storedContainer, true);
-                _solutionTransferSystem.Transfer(reagentDispenser,
+                _solutionTransferSystem.Transfer(new SolutionTransferData(reagentDispenser,
                         storedContainer, src.Value,
                         outputContainer.Value, dst.Value,
-                        (int)reagentDispenser.Comp.DispenseAmount);
+                        (int)reagentDispenser.Comp.DispenseAmount));
             }
 
             UpdateUiState(reagentDispenser);
diff --git a/Content.Server/Cloning/CloningPodSystem.cs b/Content.Server/Cloning/CloningPodSystem.cs
index 588b0c75a5..f413a1863f 100644
--- a/Content.Server/Cloning/CloningPodSystem.cs
+++ b/Content.Server/Cloning/CloningPodSystem.cs
@@ -11,6 +11,7 @@ using Content.Shared.Atmos;
 using Content.Shared.CCVar;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Cloning;
+using Content.Shared.Chat;
 using Content.Shared.Damage;
 using Content.Shared.DeviceLinking.Events;
 using Content.Shared.Emag.Components;
diff --git a/Content.Server/Cloning/CloningSystem.Subscriptions.cs b/Content.Server/Cloning/CloningSystem.Subscriptions.cs
index 84ef050305..a05c7069f0 100644
--- a/Content.Server/Cloning/CloningSystem.Subscriptions.cs
+++ b/Content.Server/Cloning/CloningSystem.Subscriptions.cs
@@ -60,7 +60,7 @@ public sealed partial class CloningSystem
     {
         // if the clone is a stack as well, adjust the count of the copy
         if (TryComp<StackComponent>(args.CloneUid, out var cloneStackComp))
-            _stack.SetCount(args.CloneUid, ent.Comp.Count, cloneStackComp);
+            _stack.SetCount((args.CloneUid, cloneStackComp), ent.Comp.Count);
     }
 
     private void OnCloneItemLabel(Entity<LabelComponent> ent, ref CloningItemEvent args)
diff --git a/Content.Server/Clothing/Systems/OutfitSystem.cs b/Content.Server/Clothing/Systems/OutfitSystem.cs
index c3fea28bcf..c02a4f1a3b 100644
--- a/Content.Server/Clothing/Systems/OutfitSystem.cs
+++ b/Content.Server/Clothing/Systems/OutfitSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Access.Components;
 using Content.Shared.Clothing;
 using Content.Shared.Hands.Components;
 using Content.Shared.Humanoid;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.Preferences;
@@ -23,7 +24,7 @@ public sealed class OutfitSystem : EntitySystem
     [Dependency] private readonly InventorySystem _invSystem = default!;
     [Dependency] private readonly SharedStationSpawningSystem _spawningSystem = default!;
 
-    public bool SetOutfit(EntityUid target, string gear, Action<EntityUid, EntityUid>? onEquipped = null)
+    public bool SetOutfit(EntityUid target, string gear, Action<EntityUid, EntityUid>? onEquipped = null, bool unremovable = false)
     {
         if (!EntityManager.TryGetComponent(target, out InventoryComponent? inventoryComponent))
             return false;
@@ -60,6 +61,8 @@ public sealed class OutfitSystem : EntitySystem
                 }
 
                 _invSystem.TryEquip(target, equipmentEntity, slot.Name, silent: true, force: true, inventory: inventoryComponent);
+                if (unremovable)
+                    EnsureComp<UnremoveableComponent>(equipmentEntity);
 
                 onEquipped?.Invoke(target, equipmentEntity);
             }
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index 21a15d812f..ab13548e04 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -1,27 +1,26 @@
-using Content.Server.Popups;
-using Content.Shared.Popups;
-using Content.Shared.Mobs;
 using Content.Server.Chat;
 using Content.Server.Chat.Systems;
-using Content.Server.Clothing.Systems;
-using Content.Shared.Chat.Prototypes;
-using Robust.Shared.Random;
-using Content.Shared.Stunnable;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.Damage;
-using Robust.Shared.Prototypes;
 using Content.Server.Emoting.Systems;
+using Content.Server.Clothing.Systems;
+using Content.Server.Popups;
 using Content.Server.Speech.EntitySystems;
-using Content.Shared.Cluwne;
-using Robust.Shared.Audio.Systems;
-using Content.Shared.NameModifier.EntitySystems;
+using Content.Shared.Chat;
+using Content.Shared.Chat.Prototypes;
 using Content.Shared.Clumsy;
+using Content.Shared.Cluwne;
+using Content.Shared.Damage;
+using Content.Shared.Mobs;
+using Content.Shared.NameModifier.EntitySystems;
+using Content.Shared.Popups;
+using Content.Shared.Stunnable;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Cluwne;
 
 public sealed class CluwneSystem : EntitySystem
 {
-    private static readonly ProtoId<DamageGroupPrototype> GeneticDamageGroup = "Genetic";
 
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -48,15 +47,14 @@ public sealed class CluwneSystem : EntitySystem
     /// <summary>
     /// On death removes active comps and gives genetic damage to prevent cloning, reduce this to allow cloning.
     /// </summary>
-    private void OnMobState(EntityUid uid, CluwneComponent component, MobStateChangedEvent args)
+    private void OnMobState(Entity<CluwneComponent> ent, ref MobStateChangedEvent args)
     {
         if (args.NewMobState == MobState.Dead)
         {
-            RemComp<CluwneComponent>(uid);
-            RemComp<ClumsyComponent>(uid);
-            RemComp<AutoEmoteComponent>(uid);
-            var damageSpec = new DamageSpecifier(_prototypeManager.Index(GeneticDamageGroup), 300);
-            _damageableSystem.TryChangeDamage(uid, damageSpec);
+            RemComp<CluwneComponent>(ent.Owner);
+            RemComp<ClumsyComponent>(ent.Owner);
+            RemComp<AutoEmoteComponent>(ent.Owner);
+            _damageableSystem.TryChangeDamage(ent.Owner, ent.Comp.RevertDamage);
         }
     }
 
@@ -65,52 +63,65 @@ public sealed class CluwneSystem : EntitySystem
     /// <summary>
     /// OnStartup gives the cluwne outfit, ensures clumsy, and makes sure emote sounds are laugh.
     /// </summary>
-    private void OnComponentStartup(EntityUid uid, CluwneComponent component, ComponentStartup args)
+    private void OnComponentStartup(Entity<CluwneComponent> ent, ref ComponentStartup args)
     {
-        if (component.EmoteSoundsId == null)
+        if (ent.Comp.EmoteSoundsId == null)
             return;
-        _prototypeManager.TryIndex(component.EmoteSoundsId, out EmoteSounds);
 
-        EnsureComp<AutoEmoteComponent>(uid);
-        _autoEmote.AddEmote(uid, "CluwneGiggle");
-        EnsureComp<ClumsyComponent>(uid);
+        _prototypeManager.TryIndex(ent.Comp.EmoteSoundsId, out EmoteSounds);
 
-        _popupSystem.PopupEntity(Loc.GetString("cluwne-transform", ("target", uid)), uid, PopupType.LargeCaution);
-        _audio.PlayPvs(component.SpawnSound, uid);
 
-        _nameMod.RefreshNameModifiers(uid);
+        if (ent.Comp.RandomEmote && ent.Comp.AutoEmoteId != null)
+        {
+            EnsureComp<AutoEmoteComponent>(ent.Owner);
+            _autoEmote.AddEmote(ent.Owner, ent.Comp.AutoEmoteId);
+        }
 
-        _outfitSystem.SetOutfit(uid, "CluwneGear");
+        EnsureComp<ClumsyComponent>(ent.Owner);
+
+        var transformMessage = Loc.GetString(ent.Comp.TransformMessage, ("target", ent.Owner));
+
+        _popupSystem.PopupEntity(transformMessage, ent.Owner, PopupType.LargeCaution);
+        _audio.PlayPvs(ent.Comp.SpawnSound, ent.Owner);
+
+        _nameMod.RefreshNameModifiers(ent.Owner);
+
+
+        _outfitSystem.SetOutfit(ent.Owner, ent.Comp.OutfitId, unremovable: true);
     }
 
     /// <summary>
     /// Handles the timing on autoemote as well as falling over and honking.
     /// </summary>
-    private void OnEmote(EntityUid uid, CluwneComponent component, ref EmoteEvent args)
+    private void OnEmote(Entity<CluwneComponent> ent, ref EmoteEvent args)
     {
         if (args.Handled)
             return;
-        args.Handled = _chat.TryPlayEmoteSound(uid, EmoteSounds, args.Emote);
 
-        if (_robustRandom.Prob(component.GiggleRandomChance))
+        if (!ent.Comp.RandomEmote)
+            return;
+
+        args.Handled = _chat.TryPlayEmoteSound(ent.Owner, EmoteSounds, args.Emote);
+
+        if (_robustRandom.Prob(ent.Comp.GiggleRandomChance))
         {
-            _audio.PlayPvs(component.SpawnSound, uid);
-            _chat.TrySendInGameICMessage(uid, "honks", InGameICChatType.Emote, ChatTransmitRange.Normal);
+            _audio.PlayPvs(ent.Comp.SpawnSound, ent.Owner);
+            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(ent.Comp.GiggleEmote), InGameICChatType.Emote, ChatTransmitRange.Normal);
         }
 
-        else if (_robustRandom.Prob(component.KnockChance))
+        else if (_robustRandom.Prob(ent.Comp.KnockChance))
         {
-            _audio.PlayPvs(component.KnockSound, uid);
-            _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(component.ParalyzeTime));
-            _chat.TrySendInGameICMessage(uid, "spasms", InGameICChatType.Emote, ChatTransmitRange.Normal);
+            _audio.PlayPvs(ent.Comp.KnockSound, ent.Owner);
+            _stunSystem.TryUpdateParalyzeDuration(ent.Owner, TimeSpan.FromSeconds(ent.Comp.ParalyzeTime));
+            _chat.TrySendInGameICMessage(ent.Owner, Loc.GetString(ent.Comp.KnockEmote), InGameICChatType.Emote, ChatTransmitRange.Normal);
         }
     }
 
     /// <summary>
     /// Applies "Cluwnified" prefix
     /// </summary>
-    private void OnRefreshNameModifiers(Entity<CluwneComponent> entity, ref RefreshNameModifiersEvent args)
+    private void OnRefreshNameModifiers(Entity<CluwneComponent> ent, ref RefreshNameModifiersEvent args)
     {
-        args.AddModifier("cluwne-name-prefix");
+        args.AddModifier(ent.Comp.NamePrefix);
     }
 }
diff --git a/Content.Server/Construction/Completions/GivePrototype.cs b/Content.Server/Construction/Completions/GivePrototype.cs
index f05feb70c0..22c5473c8d 100644
--- a/Content.Server/Construction/Completions/GivePrototype.cs
+++ b/Content.Server/Construction/Completions/GivePrototype.cs
@@ -27,14 +27,14 @@ public sealed partial class GivePrototype : IGraphAction
         if (EntityPrototypeHelpers.HasComponent<StackComponent>(Prototype))
         {
             var stackSystem = entityManager.EntitySysManager.GetEntitySystem<StackSystem>();
-            var stacks = stackSystem.SpawnMultiple(Prototype, Amount, userUid ?? uid);
+            var stacks = stackSystem.SpawnMultipleNextToOrDrop(Prototype, Amount, userUid ?? uid);
 
             if (userUid is null || !entityManager.TryGetComponent(userUid, out HandsComponent? handsComp))
                 return;
 
             foreach (var item in stacks)
             {
-                stackSystem.TryMergeToHands(item, userUid.Value, hands: handsComp);
+                stackSystem.TryMergeToHands(item, (userUid.Value, handsComp));
             }
         }
         else
diff --git a/Content.Server/Construction/Completions/SetStackCount.cs b/Content.Server/Construction/Completions/SetStackCount.cs
index f1e3f9fb9e..409d6abf95 100644
--- a/Content.Server/Construction/Completions/SetStackCount.cs
+++ b/Content.Server/Construction/Completions/SetStackCount.cs
@@ -12,7 +12,7 @@ namespace Content.Server.Construction.Completions
 
         public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager)
         {
-            entityManager.EntitySysManager.GetEntitySystem<StackSystem>().SetCount(uid, Amount);
+            entityManager.EntitySysManager.GetEntitySystem<StackSystem>().SetCount((uid, null), Amount);
         }
     }
 }
diff --git a/Content.Server/Construction/Completions/SpawnPrototype.cs b/Content.Server/Construction/Completions/SpawnPrototype.cs
index c42ecb611f..5aca29edf4 100644
--- a/Content.Server/Construction/Completions/SpawnPrototype.cs
+++ b/Content.Server/Construction/Completions/SpawnPrototype.cs
@@ -28,7 +28,7 @@ namespace Content.Server.Construction.Completions
             {
                 var stackEnt = entityManager.SpawnEntity(Prototype, coordinates);
                 var stack = entityManager.GetComponent<StackComponent>(stackEnt);
-                entityManager.EntitySysManager.GetEntitySystem<StackSystem>().SetCount(stackEnt, Amount, stack);
+                entityManager.EntitySysManager.GetEntitySystem<StackSystem>().SetCount((stackEnt, stack), Amount);
             }
             else
             {
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 3739951a6f..98b1da034e 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -187,7 +187,7 @@ namespace Content.Server.Construction
 
                             // TODO allow taking from several stacks.
                             // Also update crafting steps to check if it works.
-                            var splitStack = _stackSystem.Split(entity, materialStep.Amount, user.ToCoordinates(0, 0), stack);
+                            var splitStack = _stackSystem.Split((entity, stack), materialStep.Amount, user.ToCoordinates(0, 0));
 
                             if (splitStack == null)
                                 continue;
diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs
index 3dd5a5b794..77a1a63e02 100644
--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -13,6 +13,7 @@ using Content.Shared.Prying.Systems;
 using Content.Shared.Radio.EntitySystems;
 using Content.Shared.Stacks;
 using Content.Shared.Temperature;
+using Content.Shared.Temperature.Components;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Construction/ConstructionSystem.Machine.cs b/Content.Server/Construction/ConstructionSystem.Machine.cs
index eb922f198c..ce7f17f9b9 100644
--- a/Content.Server/Construction/ConstructionSystem.Machine.cs
+++ b/Content.Server/Construction/ConstructionSystem.Machine.cs
@@ -49,7 +49,7 @@ public sealed partial class ConstructionSystem
 
         foreach (var (stackType, amount) in machineBoard.StackRequirements)
         {
-            var stack = _stackSystem.Spawn(amount, stackType, xform.Coordinates);
+            var stack = _stackSystem.SpawnAtPosition(amount, stackType, xform.Coordinates);
             if (!_container.Insert(stack, partContainer))
                 throw new Exception($"Couldn't insert machine material of type {stackType} to machine with prototype {Prototype(uid)?.ID ?? "N/A"}");
         }
diff --git a/Content.Server/Construction/MachineFrameSystem.cs b/Content.Server/Construction/MachineFrameSystem.cs
index b8624aeef2..3af1c6ab5f 100644
--- a/Content.Server/Construction/MachineFrameSystem.cs
+++ b/Content.Server/Construction/MachineFrameSystem.cs
@@ -182,7 +182,7 @@ public sealed class MachineFrameSystem : EntitySystem
             return true;
         }
 
-        var splitStack = _stack.Split(used, needed, Transform(uid).Coordinates, stack);
+        var splitStack = _stack.Split((used, stack), needed, Transform(uid).Coordinates);
 
         if (splitStack == null)
             return false;
diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs
deleted file mode 100644
index df20681938..0000000000
--- a/Content.Server/Crayon/CrayonComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Server.UserInterface;
-using Content.Shared.Crayon;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Crayon
-{
-    [RegisterComponent]
-    public sealed partial class CrayonComponent : SharedCrayonComponent
-    {
-        [DataField("useSound")] public SoundSpecifier? UseSound;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("selectableColor")]
-        public bool SelectableColor { get; set; }
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public int Charges { get; set; }
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("capacity")]
-        public int Capacity { get; set; } = 30;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("deleteEmpty")]
-        public bool DeleteEmpty = true;
-    }
-}
diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
index f3abc2bf7a..e6f96c5abe 100644
--- a/Content.Server/Crayon/CrayonSystem.cs
+++ b/Content.Server/Crayon/CrayonSystem.cs
@@ -3,6 +3,7 @@ using System.Numerics;
 using Content.Server.Administration.Logs;
 using Content.Server.Decals;
 using Content.Server.Popups;
+using Content.Shared.Charges.Systems;
 using Content.Shared.Crayon;
 using Content.Shared.Database;
 using Content.Shared.Decals;
@@ -12,7 +13,6 @@ using Content.Shared.Nutrition.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Crayon;
@@ -24,31 +24,36 @@ public sealed class CrayonSystem : SharedCrayonSystem
     [Dependency] private readonly DecalSystem _decals = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedChargesSystem _charges = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<CrayonComponent, ComponentInit>(OnCrayonInit);
+
+        SubscribeLocalEvent<CrayonComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<CrayonComponent, CrayonSelectMessage>(OnCrayonBoundUI);
         SubscribeLocalEvent<CrayonComponent, CrayonColorMessage>(OnCrayonBoundUIColor);
-        SubscribeLocalEvent<CrayonComponent, UseInHandEvent>(OnCrayonUse, before: new[] { typeof(FoodSystem) });
-        SubscribeLocalEvent<CrayonComponent, AfterInteractEvent>(OnCrayonAfterInteract, after: new[] { typeof(FoodSystem) });
+        SubscribeLocalEvent<CrayonComponent, UseInHandEvent>(OnCrayonUse);
+        SubscribeLocalEvent<CrayonComponent, AfterInteractEvent>(OnCrayonAfterInteract, after: [typeof(IngestionSystem)]);
         SubscribeLocalEvent<CrayonComponent, DroppedEvent>(OnCrayonDropped);
-        SubscribeLocalEvent<CrayonComponent, ComponentGetState>(OnCrayonGetState);
     }
 
-    private static void OnCrayonGetState(EntityUid uid, CrayonComponent component, ref ComponentGetState args)
+    private void OnMapInit(Entity<CrayonComponent> ent, ref MapInitEvent args)
     {
-        args.State = new CrayonComponentState(component.Color, component.SelectedState, component.Charges, component.Capacity);
+        // Get the first one from the catalog and set it as default
+        var decal = _prototypeManager.EnumeratePrototypes<DecalPrototype>().FirstOrDefault(x => x.Tags.Contains("crayon"));
+        ent.Comp.SelectedState = decal?.ID ?? string.Empty;
+        Dirty(ent);
     }
 
+    // Runs after IngestionSystem so it doesn't bulldoze force-feeding
     private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, AfterInteractEvent args)
     {
         if (args.Handled || !args.CanReach)
             return;
 
-        if (component.Charges <= 0)
+        if (_charges.IsEmpty(uid))
         {
             if (component.DeleteEmpty)
                 UseUpCrayon(uid, args.User);
@@ -72,17 +77,15 @@ public sealed class CrayonSystem : SharedCrayonSystem
         if (component.UseSound != null)
             _audio.PlayPvs(component.UseSound, uid, AudioParams.Default.WithVariation(0.125f));
 
-        // Decrease "Ammo"
-        component.Charges--;
-        Dirty(uid, component);
+        _charges.TryUseCharge(uid);
 
         _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}");
         args.Handled = true;
 
-        if (component.DeleteEmpty && component.Charges <= 0)
+        if (component.DeleteEmpty && _charges.IsEmpty(uid))
             UseUpCrayon(uid, args.User);
         else
-            _uiSystem.ServerSendUiMessage(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState));
+            _uiSystem.ServerSendUiMessage(uid, CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState));
     }
 
     private void OnCrayonUse(EntityUid uid, CrayonComponent component, UseInHandEvent args)
@@ -91,14 +94,12 @@ public sealed class CrayonSystem : SharedCrayonSystem
         if (args.Handled)
             return;
 
-        if (!_uiSystem.HasUi(uid, SharedCrayonComponent.CrayonUiKey.Key))
-        {
+        if (!_uiSystem.HasUi(uid, CrayonUiKey.Key))
             return;
-        }
 
-        _uiSystem.TryToggleUi(uid, SharedCrayonComponent.CrayonUiKey.Key, args.User);
+        _uiSystem.TryToggleUi(uid, CrayonUiKey.Key, args.User);
 
-        _uiSystem.SetUiState(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonBoundUserInterfaceState(component.SelectedState, component.SelectableColor, component.Color));
+        _uiSystem.SetUiState(uid, CrayonUiKey.Key, new CrayonBoundUserInterfaceState(component.SelectedState, component.SelectableColor, component.Color));
         args.Handled = true;
     }
 
@@ -109,35 +110,23 @@ public sealed class CrayonSystem : SharedCrayonSystem
             return;
 
         component.SelectedState = args.State;
-
         Dirty(uid, component);
     }
 
     private void OnCrayonBoundUIColor(EntityUid uid, CrayonComponent component, CrayonColorMessage args)
     {
-        // you still need to ensure that the given color is a valid color
+        // Ensure that the given color can be changed or already matches
         if (!component.SelectableColor || args.Color == component.Color)
             return;
 
         component.Color = args.Color;
         Dirty(uid, component);
-
-    }
-
-    private void OnCrayonInit(EntityUid uid, CrayonComponent component, ComponentInit args)
-    {
-        component.Charges = component.Capacity;
-
-        // Get the first one from the catalog and set it as default
-        var decal = _prototypeManager.EnumeratePrototypes<DecalPrototype>().FirstOrDefault(x => x.Tags.Contains("crayon"));
-        component.SelectedState = decal?.ID ?? string.Empty;
-        Dirty(uid, component);
     }
 
     private void OnCrayonDropped(EntityUid uid, CrayonComponent component, DroppedEvent args)
     {
         // TODO: Use the existing event.
-        _uiSystem.CloseUi(uid, SharedCrayonComponent.CrayonUiKey.Key, args.User);
+        _uiSystem.CloseUi(uid, CrayonUiKey.Key, args.User);
     }
 
     private void UseUpCrayon(EntityUid uid, EntityUid user)
diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
index 1b7e50c651..a655556d49 100644
--- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
+++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
@@ -87,7 +87,8 @@ public sealed class CriminalRecordsConsoleSystem : SharedCriminalRecordsConsoleS
     {
         // prevent malf client violating wanted/reason nullability
         if (msg.Status == SecurityStatus.Wanted != (msg.Reason != null) &&
-            msg.Status == SecurityStatus.Suspected != (msg.Reason != null))
+            msg.Status == SecurityStatus.Suspected != (msg.Reason != null) &&
+            msg.Status == SecurityStatus.Hostile != (msg.Reason != null))
             return;
 
         if (!CheckSelected(ent, msg.Actor, out var mob, out var key))
@@ -144,6 +145,8 @@ public sealed class CriminalRecordsConsoleSystem : SharedCriminalRecordsConsoleS
         // figure out which radio message to send depending on transition
         var statusString = (oldStatus, msg.Status) switch
         {
+            (_, SecurityStatus.Hostile) => "hostile",
+            (_, SecurityStatus.Eliminated) => "eliminated",
             // person has been detained
             (_, SecurityStatus.Detained) => "detained",
             // person did something sus
@@ -154,6 +157,8 @@ public sealed class CriminalRecordsConsoleSystem : SharedCriminalRecordsConsoleS
             (_, SecurityStatus.Discharged) => "released",
             // going from any other state to wanted, AOS or prisonbreak / lazy secoff never set them to released and they reoffended
             (_, SecurityStatus.Wanted) => "wanted",
+            (SecurityStatus.Hostile, SecurityStatus.None) => "not-hostile",
+            (SecurityStatus.Eliminated, SecurityStatus.None) => "not-eliminated",
             // person is no longer sus
             (SecurityStatus.Suspected, SecurityStatus.None) => "not-suspected",
             // going from wanted to none, must have been a mistake
diff --git a/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs b/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
deleted file mode 100644
index 3123e251af..0000000000
--- a/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Server.Damage.Systems;
-using Content.Shared.Damage;
-
-namespace Content.Server.Damage.Components
-{
-    [Access(typeof(DamageOtherOnHitSystem))]
-    [RegisterComponent]
-    public sealed partial class DamageOtherOnHitComponent : Component
-    {
-        [DataField("ignoreResistances")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool IgnoreResistances = false;
-
-        [DataField("damage", required: true)]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier Damage = default!;
-
-    }
-}
diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
index b1f5365b01..10930ca5c9 100644
--- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -1,72 +1,54 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Damage.Components;
 using Content.Server.Weapons.Ranged.Systems;
-using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Camera;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Events;
+using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Effects;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Throwing;
-using Content.Shared.Wires;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 
-namespace Content.Server.Damage.Systems
+namespace Content.Server.Damage.Systems;
+
+public sealed class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem
 {
-    public sealed class DamageOtherOnHitSystem : EntitySystem
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly GunSystem _guns = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
+    [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
+
+    public override void Initialize()
     {
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly GunSystem _guns = default!;
-        [Dependency] private readonly DamageableSystem _damageable = default!;
-        [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
-        [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
-        [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
+        base.Initialize();
 
-        public override void Initialize()
+        SubscribeLocalEvent<DamageOtherOnHitComponent, ThrowDoHitEvent>(OnDoHit);
+    }
+
+    private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args)
+    {
+        if (TerminatingOrDeleted(args.Target))
+            return;
+
+        var dmg = _damageable.TryChangeDamage(args.Target, component.Damage * _damageable.UniversalThrownDamageModifier, component.IgnoreResistances, origin: args.Component.Thrower);
+
+        // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
+        if (dmg != null && HasComp<MobStateComponent>(args.Target))
+            _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
+
+        if (dmg is { Empty: false })
         {
-            SubscribeLocalEvent<DamageOtherOnHitComponent, ThrowDoHitEvent>(OnDoHit);
-            SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine);
-            SubscribeLocalEvent<DamageOtherOnHitComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
+            _color.RaiseEffect(Color.Red, [args.Target], Filter.Pvs(args.Target, entityManager: EntityManager));
         }
 
-        private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args)
+        _guns.PlayImpactSound(args.Target, dmg, null, false);
+        if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
         {
-            if (TerminatingOrDeleted(args.Target))
-                return;
-
-            var dmg = _damageable.TryChangeDamage(args.Target, component.Damage * _damageable.UniversalThrownDamageModifier, component.IgnoreResistances, origin: args.Component.Thrower);
-
-            // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
-            if (dmg != null && HasComp<MobStateComponent>(args.Target))
-                _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
-
-            if (dmg is { Empty: false })
-            {
-                _color.RaiseEffect(Color.Red, new List<EntityUid>() { args.Target }, Filter.Pvs(args.Target, entityManager: EntityManager));
-            }
-
-            _guns.PlayImpactSound(args.Target, dmg, null, false);
-            if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
-            {
-                var direction = body.LinearVelocity.Normalized();
-                _sharedCameraRecoil.KickCamera(args.Target, direction);
-            }
-        }
-
-        private void OnDamageExamine(EntityUid uid, DamageOtherOnHitComponent component, ref DamageExamineEvent args)
-        {
-            _damageExamine.AddDamageExamine(args.Message, _damageable.ApplyUniversalAllModifiers(component.Damage * _damageable.UniversalThrownDamageModifier), Loc.GetString("damage-throw"));
-        }
-
-        /// <summary>
-        /// Prevent players with the Pacified status effect from throwing things that deal damage.
-        /// </summary>
-        private void OnAttemptPacifiedThrow(Entity<DamageOtherOnHitComponent> ent, ref AttemptPacifiedThrowEvent args)
-        {
-            args.Cancel("pacified-cannot-throw");
+            var direction = body.LinearVelocity.Normalized();
+            _sharedCameraRecoil.KickCamera(args.Target, direction);
         }
     }
 }
diff --git a/Content.Server/Delivery/DeliverySystem.cs b/Content.Server/Delivery/DeliverySystem.cs
index 72d9427dff..496bc61a34 100644
--- a/Content.Server/Delivery/DeliverySystem.cs
+++ b/Content.Server/Delivery/DeliverySystem.cs
@@ -4,6 +4,7 @@ using Content.Server.Station.Systems;
 using Content.Server.StationRecords.Systems;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
+using Content.Shared.Chat;
 using Content.Shared.Delivery;
 using Content.Shared.FingerprintReader;
 using Content.Shared.Labels.EntitySystems;
diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs
index b4a79c6830..682baa04ca 100644
--- a/Content.Server/Destructible/DestructibleSystem.cs
+++ b/Content.Server/Destructible/DestructibleSystem.cs
@@ -6,7 +6,6 @@ using Content.Server.Body.Systems;
 using Content.Server.Construction;
 using Content.Server.Destructible.Thresholds;
 using Content.Server.Destructible.Thresholds.Behaviors;
-using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Stack;
@@ -14,6 +13,7 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Destructible;
+using Content.Shared.Destructible.Thresholds.Triggers;
 using Content.Shared.FixedPoint;
 using Content.Shared.Humanoid;
 using Content.Shared.Trigger.Systems;
@@ -42,24 +42,24 @@ namespace Content.Server.Destructible
         [Dependency] public readonly PuddleSystem PuddleSystem = default!;
         [Dependency] public readonly SharedContainerSystem ContainerSystem = default!;
         [Dependency] public readonly IPrototypeManager PrototypeManager = default!;
-        [Dependency] public readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] public readonly IAdminLogManager AdminLogger = default!;
 
         public override void Initialize()
         {
             base.Initialize();
-            SubscribeLocalEvent<DestructibleComponent, DamageChangedEvent>(Execute);
+            SubscribeLocalEvent<DestructibleComponent, DamageChangedEvent>(OnDamageChanged);
         }
 
         /// <summary>
-        ///     Check if any thresholds were reached. if they were, execute them.
+        /// Check if any thresholds were reached. if they were, execute them.
         /// </summary>
-        public void Execute(EntityUid uid, DestructibleComponent component, DamageChangedEvent args)
+        private void OnDamageChanged(EntityUid uid, DestructibleComponent component, DamageChangedEvent args)
         {
             component.IsBroken = false;
 
             foreach (var threshold in component.Thresholds)
             {
-                if (threshold.Reached(args.Damageable, this))
+                if (Triggered(threshold, (uid, args.Damageable)))
                 {
                     RaiseLocalEvent(uid, new DamageThresholdReached(component, threshold), true);
 
@@ -82,18 +82,18 @@ namespace Content.Server.Destructible
 
                     if (args.Origin != null)
                     {
-                        _adminLogger.Add(LogType.Damaged,
+                        AdminLogger.Add(LogType.Damaged,
                             logImpact,
                             $"{ToPrettyString(args.Origin.Value):actor} caused {ToPrettyString(uid):subject} to trigger [{triggeredBehaviors}]");
                     }
                     else
                     {
-                        _adminLogger.Add(LogType.Damaged,
+                        AdminLogger.Add(LogType.Damaged,
                             logImpact,
                             $"Unknown damage source caused {ToPrettyString(uid):subject} to trigger [{triggeredBehaviors}]");
                     }
 
-                    threshold.Execute(uid, this, EntityManager, args.Origin);
+                    Execute(threshold, uid, args.Origin);
                 }
 
                 if (threshold.OldTriggered)
@@ -108,6 +108,61 @@ namespace Content.Server.Destructible
             }
         }
 
+        /// <summary>
+        /// Check if the given threshold should trigger.
+        /// </summary>
+        public bool Triggered(DamageThreshold threshold, Entity<DamageableComponent> owner)
+        {
+            if (threshold.Trigger == null)
+                return false;
+
+            if (threshold.Triggered && threshold.TriggersOnce)
+                return false;
+
+            if (threshold.OldTriggered)
+            {
+                threshold.OldTriggered = threshold.Trigger.Reached(owner, this);
+                return false;
+            }
+
+            if (!threshold.Trigger.Reached(owner, this))
+                return false;
+
+            threshold.OldTriggered = true;
+            return true;
+        }
+
+        /// <summary>
+        /// Check if the conditions for the given threshold are currently true.
+        /// </summary>
+        public bool Reached(DamageThreshold threshold, Entity<DamageableComponent> owner)
+        {
+            if (threshold.Trigger == null)
+                return false;
+
+            return threshold.Trigger.Reached(owner, this);
+        }
+
+        /// <summary>
+        /// Triggers this threshold.
+        /// </summary>
+        /// <param name="owner">The entity that owns this threshold.</param>
+        /// <param name="cause">The entity that caused this threshold to trigger.</param>
+        public void Execute(DamageThreshold threshold, EntityUid owner, EntityUid? cause = null)
+        {
+            threshold.Triggered = true;
+
+            foreach (var behavior in threshold.Behaviors)
+            {
+                // The owner has been deleted. We stop execution of behaviors here.
+                if (!Exists(owner))
+                    return;
+
+                // TODO: Replace with EntityEffects.
+                behavior.Execute(owner, this, cause);
+            }
+        }
+
         public bool TryGetDestroyedAt(Entity<DestructibleComponent?> ent, [NotNullWhen(true)] out FixedPoint2? destroyedAt)
         {
             destroyedAt = null;
@@ -145,7 +200,7 @@ namespace Content.Server.Destructible
                     if (behavior is DoActsBehavior actBehavior &&
                         actBehavior.HasAct(ThresholdActs.Destruction | ThresholdActs.Breakage))
                     {
-                        damageNeeded = Math.Min(damageNeeded.Float(), trigger.Damage);
+                        damageNeeded = FixedPoint2.Min(damageNeeded, trigger.Damage);
                     }
                 }
             }
diff --git a/Content.Server/Destructible/Thresholds/ActsFlags.cs b/Content.Server/Destructible/Thresholds/ActsFlags.cs
deleted file mode 100644
index 5193499aa9..0000000000
--- a/Content.Server/Destructible/Thresholds/ActsFlags.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Server.Destructible.Thresholds
-{
-    public sealed class ActsFlags { }
-}
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
index bfebae8f92..1086be4958 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
@@ -1,4 +1,6 @@
-namespace Content.Server.Destructible.Thresholds.Behaviors
+using Content.Shared.Destructible;
+
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     [Serializable]
     [DataDefinition]
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/DumpRestockInventory.cs b/Content.Server/Destructible/Thresholds/Behaviors/DumpRestockInventory.cs
index a8448a1b7f..5646ce6d88 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/DumpRestockInventory.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/DumpRestockInventory.cs
@@ -43,7 +43,7 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
                 if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.EntityManager.ComponentFactory))
                 {
                     var spawned = system.EntityManager.SpawnEntity(entityId, xform.Coordinates.Offset(system.Random.NextVector2(-Offset, Offset)));
-                    system.StackSystem.SetCount(spawned, toSpawn);
+                    system.StackSystem.SetCount((spawned, null), toSpawn);
                     system.EntityManager.GetComponent<TransformComponent>(spawned).LocalRotation = system.Random.NextAngle();
                 }
                 else
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 413991515b..13027a31fc 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -58,7 +58,7 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
                         var spawned = SpawnInContainer
                             ? system.EntityManager.SpawnNextToOrDrop(entityId, owner)
                             : system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
-                        system.StackSystem.SetCount(spawned, count);
+                        system.StackSystem.SetCount((spawned, null), count);
 
                         TransferForensics(spawned, system, owner);
                     }
diff --git a/Content.Server/Destructible/Thresholds/DamageThreshold.cs b/Content.Server/Destructible/Thresholds/DamageThreshold.cs
index e180f5c45c..de4362d677 100644
--- a/Content.Server/Destructible/Thresholds/DamageThreshold.cs
+++ b/Content.Server/Destructible/Thresholds/DamageThreshold.cs
@@ -1,96 +1,43 @@
 using Content.Server.Destructible.Thresholds.Behaviors;
-using Content.Server.Destructible.Thresholds.Triggers;
-using Content.Shared.Damage;
+using Content.Shared.Destructible.Thresholds.Triggers;
 
-namespace Content.Server.Destructible.Thresholds
+namespace Content.Server.Destructible.Thresholds;
+
+[DataDefinition]
+public sealed partial class DamageThreshold
 {
-    [DataDefinition]
-    public sealed partial class DamageThreshold
-    {
-        [DataField("behaviors")]
-        private List<IThresholdBehavior> _behaviors = new();
+    /// <summary>
+    /// Whether or not this threshold was triggered in the previous call to
+    /// <see cref="Reached"/>.
+    /// </summary>
+    [ViewVariables] public bool OldTriggered;
 
-        /// <summary>
-        ///     Whether or not this threshold was triggered in the previous call to
-        ///     <see cref="Reached"/>.
-        /// </summary>
-        [ViewVariables] public bool OldTriggered { get; private set; }
+    /// <summary>
+    /// Whether or not this threshold has already been triggered.
+    /// </summary>
+    [DataField]
+    public bool Triggered;
 
-        /// <summary>
-        ///     Whether or not this threshold has already been triggered.
-        /// </summary>
-        [DataField("triggered")]
-        public bool Triggered { get; private set; }
+    /// <summary>
+    /// Whether or not this threshold only triggers once.
+    /// If false, it will trigger again once the entity is healed
+    /// and then damaged to reach this threshold once again.
+    /// It will not repeatedly trigger as damage rises beyond that.
+    /// </summary>
+    [DataField]
+    public bool TriggersOnce;
 
-        /// <summary>
-        ///     Whether or not this threshold only triggers once.
-        ///     If false, it will trigger again once the entity is healed
-        ///     and then damaged to reach this threshold once again.
-        ///     It will not repeatedly trigger as damage rises beyond that.
-        /// </summary>
-        [DataField("triggersOnce")]
-        public bool TriggersOnce { get; set; }
+    /// <summary>
+    /// The condition that decides if this threshold has been reached.
+    /// Gets evaluated each time the entity's damage changes.
+    /// </summary>
+    [DataField]
+    public IThresholdTrigger? Trigger;
 
-        /// <summary>
-        ///     The trigger that decides if this threshold has been reached.
-        /// </summary>
-        [DataField("trigger")]
-        public IThresholdTrigger? Trigger { get; set; }
-
-        /// <summary>
-        ///     Behaviors to activate once this threshold is triggered.
-        /// </summary>
-        [ViewVariables] public IReadOnlyList<IThresholdBehavior> Behaviors => _behaviors;
-
-        public bool Reached(DamageableComponent damageable, DestructibleSystem system)
-        {
-            if (Trigger == null)
-            {
-                return false;
-            }
-
-            if (Triggered && TriggersOnce)
-            {
-                return false;
-            }
-
-            if (OldTriggered)
-            {
-                OldTriggered = Trigger.Reached(damageable, system);
-                return false;
-            }
-
-            if (!Trigger.Reached(damageable, system))
-            {
-                return false;
-            }
-
-            OldTriggered = true;
-            return true;
-        }
-
-        /// <summary>
-        ///     Triggers this threshold.
-        /// </summary>
-        /// <param name="owner">The entity that owns this threshold.</param>
-        /// <param name="system">
-        ///     An instance of <see cref="DestructibleSystem"/> to get dependency and
-        ///     system references from, if relevant.
-        /// </param>
-        /// <param name="entityManager"></param>
-        /// <param name="cause"></param>
-        public void Execute(EntityUid owner, DestructibleSystem system, IEntityManager entityManager, EntityUid? cause)
-        {
-            Triggered = true;
-
-            foreach (var behavior in Behaviors)
-            {
-                // The owner has been deleted. We stop execution of behaviors here.
-                if (!entityManager.EntityExists(owner))
-                    return;
-
-                behavior.Execute(owner, system, cause);
-            }
-        }
-    }
+    /// <summary>
+    /// Behaviors to activate once this threshold is triggered.
+    /// TODO: Replace with EntityEffects.
+    /// </summary>
+    [DataField]
+    public List<IThresholdBehavior> Behaviors = new();
 }
diff --git a/Content.Server/Destructible/Thresholds/ThresholdActs.cs b/Content.Server/Destructible/Thresholds/ThresholdActs.cs
deleted file mode 100644
index d2ecd53742..0000000000
--- a/Content.Server/Destructible/Thresholds/ThresholdActs.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Server.Destructible.Thresholds
-{
-    [Flags, FlagsFor(typeof(ActsFlags))]
-    [Serializable]
-    public enum ThresholdActs
-    {
-        None = 0,
-        Breakage,
-        Destruction
-    }
-}
diff --git a/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs
deleted file mode 100644
index 70e0c3917c..0000000000
--- a/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Server.Destructible.Thresholds.Triggers
-{
-    /// <summary>
-    ///     A trigger that will activate when all of its triggers have activated.
-    /// </summary>
-    [Serializable]
-    [DataDefinition]
-    public sealed partial class AndTrigger : IThresholdTrigger
-    {
-        [DataField("triggers")]
-        public List<IThresholdTrigger> Triggers { get; set; } = new();
-
-        public bool Reached(DamageableComponent damageable, DestructibleSystem system)
-        {
-            foreach (var trigger in Triggers)
-            {
-                if (!trigger.Reached(damageable, system))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/Content.Server/Destructible/Thresholds/Triggers/DamageGroupTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageGroupTrigger.cs
deleted file mode 100644
index 09083105ca..0000000000
--- a/Content.Server/Destructible/Thresholds/Triggers/DamageGroupTrigger.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Content.Shared.Damage.Prototypes;
-
-namespace Content.Server.Destructible.Thresholds.Triggers
-{
-    /// <summary>
-    ///     A trigger that will activate when the amount of damage received
-    ///     of the specified class is above the specified threshold.
-    /// </summary>
-    [Serializable]
-    [DataDefinition]
-    public sealed partial class DamageGroupTrigger : IThresholdTrigger
-    {
-        [DataField("damageGroup", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<DamageGroupPrototype>))]
-        public string DamageGroup { get; set; } = default!;
-
-        /// <summary>
-        ///     The amount of damage at which this threshold will trigger.
-        /// </summary>
-        [DataField("damage", required: true)]
-        public int Damage { get; set; } = default!;
-
-        public bool Reached(DamageableComponent damageable, DestructibleSystem system)
-        {
-            return damageable.DamagePerGroup[DamageGroup] >= Damage;
-        }
-    }
-}
diff --git a/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs
deleted file mode 100644
index ce0106ee2b..0000000000
--- a/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Server.Destructible.Thresholds.Triggers
-{
-    /// <summary>
-    ///     A trigger that will activate when the amount of damage received
-    ///     is above the specified threshold.
-    /// </summary>
-    [Serializable]
-    [DataDefinition]
-    public sealed partial class DamageTrigger : IThresholdTrigger
-    {
-        /// <summary>
-        ///     The amount of damage at which this threshold will trigger.
-        /// </summary>
-        [DataField("damage", required: true)]
-        public int Damage { get; set; } = default!;
-
-        public bool Reached(DamageableComponent damageable, DestructibleSystem system)
-        {
-            return damageable.TotalDamage >= Damage;
-        }
-    }
-}
diff --git a/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
deleted file mode 100644
index ed9fd27ab7..0000000000
--- a/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Content.Shared.Damage.Prototypes;
-
-namespace Content.Server.Destructible.Thresholds.Triggers
-{
-    /// <summary>
-    ///     A trigger that will activate when the amount of damage received
-    ///     of the specified type is above the specified threshold.
-    /// </summary>
-    [Serializable]
-    [DataDefinition]
-    public sealed partial class DamageTypeTrigger : IThresholdTrigger
-    {
-        [DataField("damageType", required:true, customTypeSerializer: typeof(PrototypeIdSerializer<DamageTypePrototype>))]
-        public string DamageType { get; set; } = default!;
-
-        [DataField("damage", required: true)]
-        public int Damage { get; set; } = default!;
-
-        public bool Reached(DamageableComponent damageable, DestructibleSystem system)
-        {
-            return damageable.Damage.DamageDict.TryGetValue(DamageType, out var damageReceived) &&
-                   damageReceived >= Damage;
-        }
-    }
-}
diff --git a/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
deleted file mode 100644
index dfceb31c9b..0000000000
--- a/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Server.Destructible.Thresholds.Triggers
-{
-    public interface IThresholdTrigger
-    {
-        /// <summary>
-        ///     Checks if this trigger has been reached.
-        /// </summary>
-        /// <param name="damageable">The damageable component to check with.</param>
-        /// <param name="system">
-        ///     An instance of <see cref="DestructibleSystem"/> to pull
-        ///     dependencies from, if any.
-        /// </param>
-        /// <returns>true if this trigger has been reached, false otherwise.</returns>
-        bool Reached(DamageableComponent damageable, DestructibleSystem system);
-    }
-}
diff --git a/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs
deleted file mode 100644
index 179141dbf8..0000000000
--- a/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Server.Destructible.Thresholds.Triggers
-{
-    /// <summary>
-    ///     A trigger that will activate when any of its triggers have activated.
-    /// </summary>
-    [Serializable]
-    [DataDefinition]
-    public sealed partial class OrTrigger : IThresholdTrigger
-    {
-        [DataField("triggers")]
-        public List<IThresholdTrigger> Triggers { get; private set; } = new();
-
-        public bool Reached(DamageableComponent damageable, DestructibleSystem system)
-        {
-            foreach (var trigger in Triggers)
-            {
-                if (trigger.Reached(damageable, system))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs b/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs
index b03cceda0f..1cb5091d24 100644
--- a/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs
@@ -98,28 +98,19 @@ public sealed class PowerSensorSystem : EntitySystem
         var nodeContainer = Comp<NodeContainerComponent>(uid);
         var deviceNode = (CableDeviceNode) nodeContainer.Nodes[cable.Node];
 
-        var charge = 0f;
-        var chargingState = false;
-        var dischargingState = false;
-
         // update state based on the power stats retrieved from the selected power network
         var xform = _xformQuery.GetComponent(uid);
         if (!TryComp(xform.GridUid, out MapGridComponent? grid))
             return;
 
-        var cables = deviceNode.GetReachableNodes(xform, _nodeQuery, _xformQuery, grid, EntityManager);
-        foreach (var node in cables)
-        {
-            if (node.NodeGroup == null)
-                continue;
+        if (deviceNode.NodeGroup == null)
+            return;
 
-            var group = (IBasePowerNet) node.NodeGroup;
-            var stats = _powerNet.GetNetworkStatistics(group.NetworkNode);
-            charge = comp.Output ? stats.OutStorageCurrent : stats.InStorageCurrent;
-            chargingState = charge > comp.LastCharge;
-            dischargingState = charge < comp.LastCharge;
-            break;
-        }
+        var group = (IBasePowerNet) deviceNode.NodeGroup;
+        var stats = _powerNet.GetNetworkStatistics(group.NetworkNode);
+        var charge = comp.Output ? stats.OutStorageCurrent : stats.InStorageCurrent;
+        var chargingState = charge > comp.LastCharge;
+        var dischargingState = charge < comp.LastCharge;
 
         comp.LastCharge = charge;
 
diff --git a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
index aef79f1419..39217a8196 100644
--- a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
+++ b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Emoting.Components;
+using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Hands.Components;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
index 743646c92b..82e2d9c30d 100644
--- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
@@ -63,8 +63,8 @@ namespace Content.Server.Engineering.EntitySystems
             if (component.Deleted || !IsTileClear())
                 return;
 
-            if (TryComp(uid, out StackComponent? stackComp)
-                && component.RemoveOnInteract && !_stackSystem.Use(uid, 1, stackComp))
+            if (TryComp<StackComponent>(uid, out var stackComp)
+                && component.RemoveOnInteract && !_stackSystem.TryUse((uid, stackComp), 1))
             {
                 return;
             }
diff --git a/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs b/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
new file mode 100644
index 0000000000..e7b8aaf22b
--- /dev/null
+++ b/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs
@@ -0,0 +1,19 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions.Conditions.Body;
+
+namespace Content.Server.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity is both able to breathe and is currently breathing.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class IsBreathingEntityConditionSystem : EntityConditionSystem<RespiratorComponent, BreathingCondition>
+{
+    [Dependency] private readonly RespiratorSystem _respirator = default!;
+    protected override void Condition(Entity<RespiratorComponent> entity, ref EntityConditionEvent<BreathingCondition> args)
+    {
+        args.Result = _respirator.IsBreathing(entity.AsNullable());
+    }
+}
diff --git a/Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs b/Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs
new file mode 100644
index 0000000000..3b4fb5292b
--- /dev/null
+++ b/Content.Server/EntityConditions/Conditions/MetabolizerTypesEntityConditionSystem.cs
@@ -0,0 +1,21 @@
+using System.Linq;
+using Content.Server.Body.Components;
+using Content.Shared.EntityConditions;
+using Content.Shared.EntityConditions.Conditions.Body;
+
+namespace Content.Server.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity has any of the listed metabolizer types.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class MetabolizerTypeEntityConditionSystem : EntityConditionSystem<MetabolizerComponent, MetabolizerTypeCondition>
+{
+    protected override void Condition(Entity<MetabolizerComponent> entity, ref EntityConditionEvent<MetabolizerTypeCondition> args)
+    {
+        if (entity.Comp.MetabolizerTypes == null)
+            return;
+
+        args.Result = entity.Comp.MetabolizerTypes.Overlaps(args.Condition.Type);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
new file mode 100644
index 0000000000..033704ffcd
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs
@@ -0,0 +1,22 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Atmos;
+
+namespace Content.Server.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// This effect adjusts a gas at the tile this entity is currently on.
+/// The amount changed is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class CreateGasEntityEffectSystem : EntityEffectSystem<TransformComponent, CreateGas>
+{
+    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<CreateGas> args)
+    {
+        var tileMix = _atmosphere.GetContainingMixture(entity.AsNullable(), false, true);
+
+        tileMix?.AdjustMoles(args.Effect.Gas, args.Scale * args.Effect.Moles);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
new file mode 100644
index 0000000000..65c818f143
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs
@@ -0,0 +1,25 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Atmos;
+
+namespace Content.Server.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// Adds a number of FireStacks modified by scale to this entity.
+/// The amount of FireStacks added is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class FlammableEntityEffectSystem : EntityEffectSystem<FlammableComponent, Flammable>
+{
+    [Dependency] private readonly FlammableSystem _flammable = default!;
+
+    protected override void Effect(Entity<FlammableComponent> entity, ref EntityEffectEvent<Flammable> args)
+    {
+        // The multiplier is determined by if the entity is already on fire, and if the multiplier for existing FireStacks has a value.
+        // If both of these are true, we use the MultiplierOnExisting value, otherwise we use the standard Multiplier.
+        var multiplier = entity.Comp.FireStacks == 0f || args.Effect.MultiplierOnExisting == null ? args.Effect.Multiplier : args.Effect.MultiplierOnExisting.Value;
+
+        _flammable.AdjustFireStacks(entity, args.Scale * multiplier, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
new file mode 100644
index 0000000000..de90656c66
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs
@@ -0,0 +1,23 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Atmos;
+
+namespace Content.Server.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// Sets this entity on fire.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class IngiteEntityEffectSystem : EntityEffectSystem<FlammableComponent, Ignite>
+{
+    [Dependency] private readonly FlammableSystem _flammable = default!;
+
+    protected override void Effect(Entity<FlammableComponent> entity, ref EntityEffectEvent<Ignite> args)
+    {
+        // TODO: Proper BodySystem Metabolism Effect relay...
+        // TODO: If this fucks over downstream shitmed, I give you full approval to use whatever shitcode method you need to fix it. Metabolism is awful.
+        _flammable.Ignite(entity, entity, flammable: entity.Comp);
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs b/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
new file mode 100644
index 0000000000..0cbf0b3864
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs
@@ -0,0 +1,20 @@
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Body;
+
+namespace Content.Server.EntityEffects.Effects.Body;
+
+/// <summary>
+/// This effect adjusts a respirator's saturation value.
+/// The saturation adjustment is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class OxygenateEntityEffectsSystem : EntityEffectSystem<RespiratorComponent, Oxygenate>
+{
+    [Dependency] private readonly RespiratorSystem _respirator = default!;
+    protected override void Effect(Entity<RespiratorComponent> entity, ref EntityEffectEvent<Oxygenate> args)
+    {
+        _respirator.UpdateSaturation(entity, args.Scale * args.Effect.Factor, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs
new file mode 100644
index 0000000000..ab656b8aa4
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs
@@ -0,0 +1,20 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustHealthEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustHealth>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustHealth> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.Health += args.Effect.Amount;
+        _plantHolder.CheckHealth(entity, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
new file mode 100644
index 0000000000..4732465098
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs
@@ -0,0 +1,20 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustMutationLevelEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustMutationLevel>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustMutationLevel> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.MutationLevel += args.Effect.Amount * entity.Comp.MutationMod;
+        _plantHolder.CheckHealth(entity, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs
new file mode 100644
index 0000000000..3163ee374c
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationModEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustMutationModEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustMutationMod>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustMutationMod> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.MutationMod += args.Effect.Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs
new file mode 100644
index 0000000000..56c016700d
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustNutritionEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustNutrition>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustNutrition> args)
+    {
+        _plantHolder.AdjustNutrient(entity, args.Effect.Amount, entity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
new file mode 100644
index 0000000000..0495034b38
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPestsEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustPestsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustPests>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustPests> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.PestLevel += args.Effect.Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
new file mode 100644
index 0000000000..ebe5c83181
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs
@@ -0,0 +1,19 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustPotencyEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustPotency>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustPotency> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+        entity.Comp.Seed.Potency = Math.Max(entity.Comp.Seed.Potency + args.Effect.Amount, 1);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
new file mode 100644
index 0000000000..31dc328977
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxinsEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustToxinsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustToxins>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustToxins> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.Toxins += args.Effect.Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs
new file mode 100644
index 0000000000..706eeb2ffe
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustWaterEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustWater>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustWater> args)
+    {
+        _plantHolder.AdjustWater(entity, args.Effect.Amount, entity.Comp);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
new file mode 100644
index 0000000000..34aa51e4ff
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeedsEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustWeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAdjustWeeds>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAdjustWeeds> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        entity.Comp.WeedLevel += args.Effect.Amount;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs
new file mode 100644
index 0000000000..b0faa6255e
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs
@@ -0,0 +1,19 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAffectGrowthEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantAffectGrowth>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantAffectGrowth> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        _plantHolder.AffectGrowth(entity, (int)args.Effect.Amount, entity);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs
new file mode 100644
index 0000000000..3d82f74b11
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs
@@ -0,0 +1,122 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+/// This system mutates an inputted stat for a PlantHolder, only works for floats, integers, and bools.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class PlantChangeStatEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantChangeStat>
+{
+    // TODO: This is awful. I do not have the strength to refactor this. I want it gone.
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantChangeStat> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        var effect = args.Effect;
+        var member = entity.Comp.Seed.GetType().GetField(args.Effect.TargetValue);
+
+        if (member == null)
+        {
+            Log.Error($"{ effect.GetType().Name } Error: Member { args.Effect.TargetValue} not found on { entity.Comp.Seed.GetType().Name }. Did you misspell it?");
+            return;
+        }
+
+        var currentValObj = member.GetValue(entity.Comp.Seed);
+        if (currentValObj == null)
+            return;
+
+        if (member.FieldType == typeof(float))
+        {
+            var floatVal = (float)currentValObj;
+            MutateFloat(ref floatVal, args.Effect.MinValue, args.Effect.MaxValue, args.Effect.Steps);
+            member.SetValue(entity.Comp.Seed, floatVal);
+        }
+        else if (member.FieldType == typeof(int))
+        {
+            var intVal = (int)currentValObj;
+            MutateInt(ref intVal, (int)args.Effect.MinValue, (int)args.Effect.MaxValue, args.Effect.Steps);
+            member.SetValue(entity.Comp.Seed, intVal);
+        }
+        else if (member.FieldType == typeof(bool))
+        {
+            var boolVal = (bool)currentValObj;
+            boolVal = !boolVal;
+            member.SetValue(entity.Comp.Seed, boolVal);
+        }
+    }
+
+    // Mutate reference 'val' between 'min' and 'max' by pretending the value
+    // is representable by a thermometer code with 'bits' number of bits and
+    // randomly flipping some of them.
+    private void MutateFloat(ref float val, float min, float max, int bits)
+    {
+        if (min == max)
+        {
+            val = min;
+            return;
+        }
+
+        // Starting number of bits that are high, between 0 and bits.
+        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
+        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
+        // val may be outside the range of min/max due to starting prototype values, so clamp.
+        valInt = Math.Clamp(valInt, 0, bits);
+
+        // Probability that the bit flip increases n.
+        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasive it it.
+        // In other words, it tends to go to the middle.
+        float probIncrease = 1 - (float)valInt / bits;
+        int valIntMutated;
+        if (_random.Prob(probIncrease))
+        {
+            valIntMutated = valInt + 1;
+        }
+        else
+        {
+            valIntMutated = valInt - 1;
+        }
+
+        // Set value based on mutated thermometer code.
+        float valMutated = Math.Clamp((float)valIntMutated / bits * (max - min) + min, min, max);
+        val = valMutated;
+    }
+
+    private void MutateInt(ref int val, int min, int max, int bits)
+    {
+        if (min == max)
+        {
+            val = min;
+            return;
+        }
+
+        // Starting number of bits that are high, between 0 and bits.
+        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
+        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
+        // val may be outside the range of min/max due to starting prototype values, so clamp.
+        valInt = Math.Clamp(valInt, 0, bits);
+
+        // Probability that the bit flip increases n.
+        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasing it.
+        // In other words, it tends to go to the middle.
+        float probIncrease = 1 - (float)valInt / bits;
+        int valMutated;
+        if (_random.Prob(probIncrease))
+        {
+            valMutated = val + 1;
+        }
+        else
+        {
+            valMutated = val - 1;
+        }
+
+        valMutated = Math.Clamp(valMutated, min, max);
+        val = valMutated;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
new file mode 100644
index 0000000000..710bce24dd
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs
@@ -0,0 +1,30 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantCryoxadoneEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantCryoxadone>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantCryoxadone> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        var deviation = 0;
+        var seed = entity.Comp.Seed;
+        if (seed == null)
+            return;
+        if (entity.Comp.Age > seed.Maturation)
+            deviation = (int) Math.Max(seed.Maturation - 1, entity.Comp.Age - _random.Next(7, 10));
+        else
+            deviation = (int) (seed.Maturation / seed.GrowthStages);
+        entity.Comp.Age -= deviation;
+        entity.Comp.LastProduce = entity.Comp.Age;
+        entity.Comp.SkipAging++;
+        entity.Comp.ForceUpdate = true;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
new file mode 100644
index 0000000000..1661c501be
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Server.Popups;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Content.Shared.Popups;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantDestroySeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantDestroySeeds>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantDestroySeeds> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
+            return;
+
+        if (entity.Comp.Seed.Seedless)
+            return;
+
+        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+        _popup.PopupEntity(
+            Loc.GetString("botany-plant-seedsdestroyed"),
+            entity,
+            PopupType.SmallCaution
+        );
+        entity.Comp.Seed.Seedless = true;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
new file mode 100644
index 0000000000..f6aebde465
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantDiethylamineEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantDiethylamine>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantDiethylamine> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
+            return;
+
+        if (_random.Prob(0.1f))
+        {
+            _plantHolder.EnsureUniqueSeed(entity, entity);
+            entity.Comp.Seed!.Lifespan++;
+        }
+
+        if (_random.Prob(0.1f))
+        {
+            _plantHolder.EnsureUniqueSeed(entity, entity);
+            entity.Comp.Seed!.Endurance++;
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
new file mode 100644
index 0000000000..8a073392e1
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximineEntityEffectSystem.cs
@@ -0,0 +1,16 @@
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantPhalanximineEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantPhalanximine>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantPhalanximine> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
+            return;
+
+        entity.Comp.Seed.Viable = true;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
new file mode 100644
index 0000000000..4d724be244
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs
@@ -0,0 +1,26 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Server.Popups;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantRestoreSeedsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantRestoreSeeds>
+{
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantRestoreSeeds> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead || entity.Comp.Seed.Immutable)
+            return;
+
+        if (!entity.Comp.Seed.Seedless)
+            return;
+
+        _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+        _popup.PopupEntity(Loc.GetString("botany-plant-seedsrestored"), entity);
+        entity.Comp.Seed.Seedless = false;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
new file mode 100644
index 0000000000..68ea3319ef
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs
@@ -0,0 +1,41 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+/// This effect directly increases the potency of a PlantHolder's plant provided it exists and isn't dead.
+/// Potency directly correlates to the size of the plant's produce.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class RobustHarvestEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, RobustHarvest>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<RobustHarvest> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Dead)
+            return;
+
+        if (entity.Comp.Seed.Potency < args.Effect.PotencyLimit)
+        {
+            _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+            entity.Comp.Seed.Potency = Math.Min(entity.Comp.Seed.Potency + args.Effect.PotencyIncrease, args.Effect.PotencyLimit);
+
+            if (entity.Comp.Seed.Potency > args.Effect.PotencySeedlessThreshold)
+            {
+                entity.Comp.Seed.Seedless = true;
+            }
+        }
+        else if (entity.Comp.Seed.Yield > 1 && _random.Prob(0.1f))
+        {
+            // Too much of a good thing reduces yield
+            _plantHolder.EnsureUniqueSeed(entity, entity.Comp);
+            entity.Comp.Seed.Yield--;
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
new file mode 100644
index 0000000000..120ae6e881
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
@@ -0,0 +1,43 @@
+using Content.Server.Botany;
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany;
+
+public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateChemicals>
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateChemicals> args)
+    {
+        if (entity.Comp.Seed == null)
+            return;
+
+        var chemicals = entity.Comp.Seed.Chemicals;
+        var randomChems = _proto.Index(args.Effect.RandomPickBotanyReagent).Fills;
+
+        // Add a random amount of a random chemical to this set of chemicals
+        var pick = _random.Pick(randomChems);
+        var chemicalId = _random.Pick(pick.Reagents);
+        var amount = _random.Next(1, (int)pick.Quantity);
+        var seedChemQuantity = new SeedChemQuantity();
+        if (chemicals.ContainsKey(chemicalId))
+        {
+            seedChemQuantity.Min = chemicals[chemicalId].Min;
+            seedChemQuantity.Max = chemicals[chemicalId].Max + amount;
+        }
+        else
+        {
+            seedChemQuantity.Min = 1;
+            seedChemQuantity.Max = 1 + amount;
+            seedChemQuantity.Inherent = false;
+        }
+        var potencyDivisor = (int)Math.Ceiling(100.0f / seedChemQuantity.Max);
+        seedChemQuantity.PotencyDivisor = potencyDivisor;
+        chemicals[chemicalId] = seedChemQuantity;
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs
new file mode 100644
index 0000000000..e2376ba186
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs
@@ -0,0 +1,53 @@
+using System.Linq;
+using Content.Server.Botany.Components;
+using Content.Shared.Atmos;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany;
+
+public sealed partial class PlantMutateExudeGasesEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateExudeGases>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateExudeGases> args)
+    {
+        if (entity.Comp.Seed == null)
+            return;
+
+        var gasses = entity.Comp.Seed.ExudeGasses;
+
+        // Add a random amount of a random gas to this gas dictionary
+        float amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
+        var gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
+
+        if (!gasses.TryAdd(gas, amount))
+        {
+            gasses[gas] += amount;
+        }
+    }
+}
+
+public sealed partial class PlantMutateConsumeGasesEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateConsumeGases>
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateConsumeGases> args)
+    {
+        if (entity.Comp.Seed == null)
+            return;
+
+        var gasses = entity.Comp.Seed.ConsumeGasses;
+
+        // Add a random amount of a random gas to this gas dictionary
+        var amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
+        var gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
+
+        if (!gasses.TryAdd(gas, amount))
+        {
+            gasses[gas] += amount;
+        }
+    }
+}
+
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
new file mode 100644
index 0000000000..95d7f97bbe
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffectSystem.cs
@@ -0,0 +1,25 @@
+using Content.Server.Botany;
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany;
+
+namespace Content.Server.EntityEffects.Effects.Botany;
+
+public sealed partial class PlantMutateHarvestEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateHarvest>
+{
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateHarvest> args)
+    {
+        if (entity.Comp.Seed == null)
+            return;
+
+        switch (entity.Comp.Seed.HarvestRepeat)
+        {
+            case HarvestType.NoRepeat:
+                entity.Comp.Seed.HarvestRepeat = HarvestType.Repeat;
+                break;
+            case HarvestType.Repeat:
+                entity.Comp.Seed.HarvestRepeat = HarvestType.SelfHarvest;
+                break;
+        }
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs
new file mode 100644
index 0000000000..c26e1e08cf
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Botany;
+using Content.Server.Botany.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Botany;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.EntityEffects.Effects.Botany;
+
+public sealed partial class PlantMutateSpeciesChangeEntityEffectSystem : EntityEffectSystem<PlantHolderComponent, PlantMutateSpeciesChange>
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void Effect(Entity<PlantHolderComponent> entity, ref EntityEffectEvent<PlantMutateSpeciesChange> args)
+    {
+        if (entity.Comp.Seed == null || entity.Comp.Seed.MutationPrototypes.Count == 0)
+            return;
+
+        var targetProto = _random.Pick(entity.Comp.Seed.MutationPrototypes);
+        _proto.TryIndex(targetProto, out SeedPrototype? protoSeed);
+
+        if (protoSeed == null)
+        {
+            Log.Error($"Seed prototype could not be found: {targetProto}!");
+            return;
+        }
+
+        entity.Comp.Seed = entity.Comp.Seed.SpeciesChange(protoSeed);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs
new file mode 100644
index 0000000000..2e2fadff32
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs
@@ -0,0 +1,20 @@
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects;
+using Content.Shared.Explosion.Components;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Makes this entity explode using its <see cref="ExplosiveComponent"/>.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ExplodeEntityEffectSystem : EntityEffectSystem<ExplosiveComponent, Explode>
+{
+    [Dependency] private readonly ExplosionSystem _explosion = default!;
+
+    protected override void Effect(Entity<ExplosiveComponent> entity, ref EntityEffectEvent<Explode> args)
+    {
+        _explosion.TriggerExplosive(entity, entity, args.Effect.Delete, args.Effect.Intensity, args.Effect.Radius, args.User);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
new file mode 100644
index 0000000000..c623b25857
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/MakeSentientEntityEffectSystem.cs
@@ -0,0 +1,42 @@
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.Speech.Components;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects;
+using Content.Shared.Mind.Components;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Makes this entity sentient. Allows ghost to take it over if it's not already occupied.
+/// Optionally also allows this entity to speak.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class MakeSentientEntityEffectSystem : EntityEffectSystem<MetaDataComponent, MakeSentient>
+{
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<MakeSentient> args)
+    {
+        // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
+        // This also works on entities that already have a mind
+        // We call this before the mind check to allow things like player-controlled mice to be able to benefit from the effect
+        if (args.Effect.AllowSpeech)
+        {
+            RemComp<ReplacementAccentComponent>(entity);
+            // TODO: Make MonkeyAccent a replacement accent and remove MonkeyAccent code-smell.
+            RemComp<MonkeyAccentComponent>(entity);
+        }
+
+        // Stops from adding a ghost role to things like people who already have a mind
+        if (TryComp<MindContainerComponent>(entity, out var mindContainer) && mindContainer.HasMind)
+            return;
+
+        // Don't add a ghost role to things that already have ghost roles
+        if (TryComp(entity, out GhostRoleComponent? ghostRole))
+            return;
+
+        ghostRole = AddComp<GhostRoleComponent>(entity);
+        EnsureComp<GhostTakeoverAvailableComponent>(entity);
+
+        ghostRole.RoleName = entity.Comp.EntityName;
+        ghostRole.RoleDescription = Loc.GetString("ghost-role-information-cognizine-description");
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
new file mode 100644
index 0000000000..5f19bcc50b
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs
@@ -0,0 +1,19 @@
+using Content.Server.Polymorph.Components;
+using Content.Server.Polymorph.Systems;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects;
+
+/// <summary>
+/// Polymorphs this entity into another entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class PolymorphEntityEffectSystem : EntityEffectSystem<PolymorphableComponent, Shared.EntityEffects.Effects.Polymorph>
+{
+    [Dependency] private readonly PolymorphSystem _polymorph = default!;
+
+    protected override void Effect(Entity<PolymorphableComponent> entity, ref EntityEffectEvent<Shared.EntityEffects.Effects.Polymorph> args)
+    {
+        _polymorph.PolymorphEntity(entity, args.Effect.Prototype);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
new file mode 100644
index 0000000000..e5ef488de8
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs
@@ -0,0 +1,51 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Server.Spreader;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.EntityEffects;
+using Content.Shared.EntityEffects.Effects.Solution;
+using Content.Shared.Maps;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+
+namespace Content.Server.EntityEffects.Effects.Solution;
+
+/// <summary>
+/// This effect creates smoke at this solution's position.
+/// The amount of smoke created is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AreaReactionEntityEffectsSystem : EntityEffectSystem<SolutionComponent, AreaReactionEffect>
+{
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly SmokeSystem _smoke = default!;
+    [Dependency] private readonly SpreaderSystem _spreader = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+
+    // TODO: A sane way to make Smoke without a solution.
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AreaReactionEffect> args)
+    {
+        var xform = Transform(entity);
+        var mapCoords = _xform.GetMapCoordinates(entity);
+        var spreadAmount = (int) Math.Max(0, Math.Ceiling(args.Scale / args.Effect.OverflowThreshold));
+        var effect = args.Effect;
+
+        if (!_mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
+            !_map.TryGetTileRef(gridUid, grid, xform.Coordinates, out var tileRef))
+            return;
+
+        if (_spreader.RequiresFloorToSpread(effect.PrototypeId.ToString()) && _turf.IsSpace(tileRef))
+            return;
+
+        var coords = _map.MapToGrid(gridUid, mapCoords);
+        var ent = Spawn(args.Effect.PrototypeId, coords.SnapToGrid());
+
+        _smoke.StartSmoke(ent, entity.Comp.Solution, args.Effect.Duration, spreadAmount);
+
+        _audio.PlayPvs(args.Effect.Sound, entity, AudioParams.Default.WithVariation(0.25f));
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
new file mode 100644
index 0000000000..fec56aa2d3
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
@@ -0,0 +1,28 @@
+using Content.Server.Explosion.EntitySystems;
+using Content.Shared.EntityEffects;
+using ExplosionEffect = Content.Shared.EntityEffects.Effects.Transform.Explosion;
+
+namespace Content.Server.EntityEffects.Effects.Transform;
+
+/// <summary>
+/// Creates an explosion at this entity's position.
+/// Intensity is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ExplosionEntityEffectSystem : EntityEffectSystem<TransformComponent, ExplosionEffect>
+{
+    [Dependency] private readonly ExplosionSystem _explosion = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<ExplosionEffect> args)
+    {
+        var intensity = MathF.Min(args.Effect.IntensityPerUnit * args.Scale, args.Effect.MaxTotalIntensity);
+
+        _explosion.QueueExplosion(
+            entity,
+            args.Effect.ExplosionType,
+            intensity,
+            args.Effect.IntensitySlope,
+            args.Effect.MaxIntensity,
+            args.Effect.TileBreakScale);
+    }
+}
diff --git a/Content.Server/EntityEffects/EntityEffectSystem.cs b/Content.Server/EntityEffects/EntityEffectSystem.cs
deleted file mode 100644
index 238ef4849d..0000000000
--- a/Content.Server/EntityEffects/EntityEffectSystem.cs
+++ /dev/null
@@ -1,976 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Server.Botany.Components;
-using Content.Server.Botany.Systems;
-using Content.Server.Botany;
-using Content.Server.Chat.Systems;
-using Content.Server.Emp;
-using Content.Server.Explosion.EntitySystems;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Ghost.Roles.Components;
-using Content.Server.Polymorph.Components;
-using Content.Server.Polymorph.Systems;
-using Content.Server.Speech.Components;
-using Content.Server.Spreader;
-using Content.Server.Temperature.Components;
-using Content.Server.Temperature.Systems;
-using Content.Server.Zombies;
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Body.Components;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.EntityEffects.EffectConditions;
-using Content.Shared.EntityEffects.Effects.PlantMetabolism;
-using Content.Shared.EntityEffects.Effects;
-using Content.Shared.EntityEffects;
-using Content.Shared.Flash;
-using Content.Shared.Maps;
-using Content.Shared.Medical;
-using Content.Shared.Mind.Components;
-using Content.Shared.Popups;
-using Content.Shared.Random;
-using Content.Shared.Traits.Assorted;
-using Content.Shared.Zombies;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-using TemperatureCondition = Content.Shared.EntityEffects.EffectConditions.Temperature; // disambiguate the namespace
-using PolymorphEffect = Content.Shared.EntityEffects.Effects.Polymorph;
-
-namespace Content.Server.EntityEffects;
-
-public sealed class EntityEffectSystem : EntitySystem
-{
-    private static readonly ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
-
-    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly EmpSystem _emp = default!;
-    [Dependency] private readonly ExplosionSystem _explosion = default!;
-    [Dependency] private readonly FlammableSystem _flammable = default!;
-    [Dependency] private readonly SharedFlashSystem _flash = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
-    [Dependency] private readonly MutationSystem _mutation = default!;
-    [Dependency] private readonly NarcolepsySystem _narcolepsy = default!;
-    [Dependency] private readonly PlantHolderSystem _plantHolder = default!;
-    [Dependency] private readonly PolymorphSystem _polymorph = default!;
-    [Dependency] private readonly RespiratorSystem _respirator = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SmokeSystem _smoke = default!;
-    [Dependency] private readonly SpreaderSystem _spreader = default!;
-    [Dependency] private readonly TemperatureSystem _temperature = default!;
-    [Dependency] private readonly SharedTransformSystem _xform = default!;
-    [Dependency] private readonly VomitSystem _vomit = default!;
-    [Dependency] private readonly TurfSystem _turf = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CheckEntityEffectConditionEvent<TemperatureCondition>>(OnCheckTemperature);
-        SubscribeLocalEvent<CheckEntityEffectConditionEvent<Breathing>>(OnCheckBreathing);
-        SubscribeLocalEvent<CheckEntityEffectConditionEvent<OrganType>>(OnCheckOrganType);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustHealth>>(OnExecutePlantAdjustHealth);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustMutationLevel>>(OnExecutePlantAdjustMutationLevel);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustMutationMod>>(OnExecutePlantAdjustMutationMod);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustNutrition>>(OnExecutePlantAdjustNutrition);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustPests>>(OnExecutePlantAdjustPests);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustPotency>>(OnExecutePlantAdjustPotency);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustToxins>>(OnExecutePlantAdjustToxins);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustWater>>(OnExecutePlantAdjustWater);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAdjustWeeds>>(OnExecutePlantAdjustWeeds);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantAffectGrowth>>(OnExecutePlantAffectGrowth);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantChangeStat>>(OnExecutePlantChangeStat);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantCryoxadone>>(OnExecutePlantCryoxadone);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantDestroySeeds>>(OnExecutePlantDestroySeeds);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantDiethylamine>>(OnExecutePlantDiethylamine);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantPhalanximine>>(OnExecutePlantPhalanximine);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantRestoreSeeds>>(OnExecutePlantRestoreSeeds);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<RobustHarvest>>(OnExecuteRobustHarvest);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<AdjustTemperature>>(OnExecuteAdjustTemperature);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<AreaReactionEffect>>(OnExecuteAreaReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<CauseZombieInfection>>(OnExecuteCauseZombieInfection);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ChemCleanBloodstream>>(OnExecuteChemCleanBloodstream);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ChemVomit>>(OnExecuteChemVomit);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<CreateEntityReactionEffect>>(OnExecuteCreateEntityReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<CreateGas>>(OnExecuteCreateGas);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<CureZombieInfection>>(OnExecuteCureZombieInfection);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<Emote>>(OnExecuteEmote);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<EmpReactionEffect>>(OnExecuteEmpReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ExplosionReactionEffect>>(OnExecuteExplosionReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<FlammableReaction>>(OnExecuteFlammableReaction);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<FlashReactionEffect>>(OnExecuteFlashReactionEffect);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<Ignite>>(OnExecuteIgnite);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<MakeSentient>>(OnExecuteMakeSentient);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ModifyBleedAmount>>(OnExecuteModifyBleedAmount);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ModifyBloodLevel>>(OnExecuteModifyBloodLevel);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ModifyLungGas>>(OnExecuteModifyLungGas);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<Oxygenate>>(OnExecuteOxygenate);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateChemicals>>(OnExecutePlantMutateChemicals);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateConsumeGasses>>(OnExecutePlantMutateConsumeGasses);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateExudeGasses>>(OnExecutePlantMutateExudeGasses);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantMutateHarvest>>(OnExecutePlantMutateHarvest);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PlantSpeciesChange>>(OnExecutePlantSpeciesChange);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<PolymorphEffect>>(OnExecutePolymorph);
-        SubscribeLocalEvent<ExecuteEntityEffectEvent<ResetNarcolepsy>>(OnExecuteResetNarcolepsy);
-    }
-
-    private void OnCheckTemperature(ref CheckEntityEffectConditionEvent<TemperatureCondition> args)
-    {
-        args.Result = false;
-        if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
-        {
-            if (temp.CurrentTemperature >= args.Condition.Min && temp.CurrentTemperature <= args.Condition.Max)
-                args.Result = true;
-        }
-    }
-
-    private void OnCheckBreathing(ref CheckEntityEffectConditionEvent<Breathing> args)
-    {
-        if (!TryComp(args.Args.TargetEntity, out RespiratorComponent? respiratorComp))
-        {
-            args.Result = !args.Condition.IsBreathing;
-            return;
-        }
-
-        var breathingState = _respirator.IsBreathing((args.Args.TargetEntity, respiratorComp));
-        args.Result = args.Condition.IsBreathing == breathingState;
-    }
-
-    private void OnCheckOrganType(ref CheckEntityEffectConditionEvent<OrganType> args)
-    {
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.OrganEntity == null)
-            {
-                args.Result = false;
-                return;
-            }
-
-            args.Result = OrganCondition(args.Condition, reagentArgs.OrganEntity.Value);
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    public bool OrganCondition(OrganType condition, Entity<MetabolizerComponent?> metabolizer)
-    {
-        metabolizer.Comp ??= EntityManager.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
-        if (metabolizer.Comp != null
-            && metabolizer.Comp.MetabolizerTypes != null
-            && metabolizer.Comp.MetabolizerTypes.Contains(condition.Type))
-            return condition.ShouldHave;
-        return !condition.ShouldHave;
-    }
-
-    /// <summary>
-    ///     Checks if the plant holder can metabolize the reagent or not. Checks if it has an alive plant by default.
-    /// </summary>
-    /// <param name="plantHolder">The entity holding the plant</param>
-    /// <param name="plantHolderComponent">The plant holder component</param>
-    /// <param name="entityManager">The entity manager</param>
-    /// <param name="mustHaveAlivePlant">Whether to check if it has an alive plant or not</param>
-    /// <returns></returns>
-    private bool CanMetabolizePlant(EntityUid plantHolder, [NotNullWhen(true)] out PlantHolderComponent? plantHolderComponent,
-        bool mustHaveAlivePlant = true, bool mustHaveMutableSeed = false)
-    {
-        plantHolderComponent = null;
-
-        if (!TryComp(plantHolder, out plantHolderComponent))
-            return false;
-
-        if (mustHaveAlivePlant && (plantHolderComponent.Seed == null || plantHolderComponent.Dead))
-            return false;
-
-        if (mustHaveMutableSeed && (plantHolderComponent.Seed == null || plantHolderComponent.Seed.Immutable))
-            return false;
-
-        return true;
-    }
-
-    private void OnExecutePlantAdjustHealth(ref ExecuteEntityEffectEvent<PlantAdjustHealth> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.Health += args.Effect.Amount;
-        _plantHolder.CheckHealth(args.Args.TargetEntity, plantHolderComp);
-    }
-
-    private void OnExecutePlantAdjustMutationLevel(ref ExecuteEntityEffectEvent<PlantAdjustMutationLevel> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.MutationLevel += args.Effect.Amount * plantHolderComp.MutationMod;
-    }
-
-    private void OnExecutePlantAdjustMutationMod(ref ExecuteEntityEffectEvent<PlantAdjustMutationMod> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.MutationMod += args.Effect.Amount;
-    }
-
-    private void OnExecutePlantAdjustNutrition(ref ExecuteEntityEffectEvent<PlantAdjustNutrition> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveAlivePlant: false))
-            return;
-
-        _plantHolder.AdjustNutrient(args.Args.TargetEntity, args.Effect.Amount, plantHolderComp);
-    }
-
-    private void OnExecutePlantAdjustPests(ref ExecuteEntityEffectEvent<PlantAdjustPests> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.PestLevel += args.Effect.Amount;
-    }
-
-    private void OnExecutePlantAdjustPotency(ref ExecuteEntityEffectEvent<PlantAdjustPotency> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        if (plantHolderComp.Seed == null)
-            return;
-
-        _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-        plantHolderComp.Seed.Potency = Math.Max(plantHolderComp.Seed.Potency + args.Effect.Amount, 1);
-    }
-
-    private void OnExecutePlantAdjustToxins(ref ExecuteEntityEffectEvent<PlantAdjustToxins> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.Toxins += args.Effect.Amount;
-    }
-
-    private void OnExecutePlantAdjustWater(ref ExecuteEntityEffectEvent<PlantAdjustWater> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveAlivePlant: false))
-            return;
-
-        _plantHolder.AdjustWater(args.Args.TargetEntity, args.Effect.Amount, plantHolderComp);
-    }
-
-    private void OnExecutePlantAdjustWeeds(ref ExecuteEntityEffectEvent<PlantAdjustWeeds> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        plantHolderComp.WeedLevel += args.Effect.Amount;
-    }
-
-    private void OnExecutePlantAffectGrowth(ref ExecuteEntityEffectEvent<PlantAffectGrowth> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        _plantHolder.AffectGrowth(args.Args.TargetEntity, (int) args.Effect.Amount, plantHolderComp);
-    }
-
-    // Mutate reference 'val' between 'min' and 'max' by pretending the value
-    // is representable by a thermometer code with 'bits' number of bits and
-    // randomly flipping some of them.
-    private void MutateFloat(ref float val, float min, float max, int bits)
-    {
-        if (min == max)
-        {
-            val = min;
-            return;
-        }
-
-        // Starting number of bits that are high, between 0 and bits.
-        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
-        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
-        // val may be outside the range of min/max due to starting prototype values, so clamp.
-        valInt = Math.Clamp(valInt, 0, bits);
-
-        // Probability that the bit flip increases n.
-        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasive it it.
-        // In other words, it tends to go to the middle.
-        float probIncrease = 1 - (float)valInt / bits;
-        int valIntMutated;
-        if (_random.Prob(probIncrease))
-        {
-            valIntMutated = valInt + 1;
-        }
-        else
-        {
-            valIntMutated = valInt - 1;
-        }
-
-        // Set value based on mutated thermometer code.
-        float valMutated = Math.Clamp((float)valIntMutated / bits * (max - min) + min, min, max);
-        val = valMutated;
-    }
-
-    private void MutateInt(ref int val, int min, int max, int bits)
-    {
-        if (min == max)
-        {
-            val = min;
-            return;
-        }
-
-        // Starting number of bits that are high, between 0 and bits.
-        // In other words, it's val mapped linearly from range [min, max] to range [0, bits], and then rounded.
-        int valInt = (int)MathF.Round((val - min) / (max - min) * bits);
-        // val may be outside the range of min/max due to starting prototype values, so clamp.
-        valInt = Math.Clamp(valInt, 0, bits);
-
-        // Probability that the bit flip increases n.
-        // The higher the current value is, the lower the probability of increasing value is, and the higher the probability of decreasing it.
-        // In other words, it tends to go to the middle.
-        float probIncrease = 1 - (float)valInt / bits;
-        int valMutated;
-        if (_random.Prob(probIncrease))
-        {
-            valMutated = val + 1;
-        }
-        else
-        {
-            valMutated = val - 1;
-        }
-
-        valMutated = Math.Clamp(valMutated, min, max);
-        val = valMutated;
-    }
-
-    private void OnExecutePlantChangeStat(ref ExecuteEntityEffectEvent<PlantChangeStat> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        if (plantHolderComp.Seed == null)
-            return;
-
-        var member = plantHolderComp.Seed.GetType().GetField(args.Effect.TargetValue);
-
-        if (member == null)
-        {
-            _mutation.Log.Error(args.Effect.GetType().Name + " Error: Member " + args.Effect.TargetValue + " not found on " + plantHolderComp.Seed.GetType().Name + ". Did you misspell it?");
-            return;
-        }
-
-        var currentValObj = member.GetValue(plantHolderComp.Seed);
-        if (currentValObj == null)
-            return;
-
-        if (member.FieldType == typeof(float))
-        {
-            var floatVal = (float)currentValObj;
-            MutateFloat(ref floatVal, args.Effect.MinValue, args.Effect.MaxValue, args.Effect.Steps);
-            member.SetValue(plantHolderComp.Seed, floatVal);
-        }
-        else if (member.FieldType == typeof(int))
-        {
-            var intVal = (int)currentValObj;
-            MutateInt(ref intVal, (int)args.Effect.MinValue, (int)args.Effect.MaxValue, args.Effect.Steps);
-            member.SetValue(plantHolderComp.Seed, intVal);
-        }
-        else if (member.FieldType == typeof(bool))
-        {
-            var boolVal = (bool)currentValObj;
-            boolVal = !boolVal;
-            member.SetValue(plantHolderComp.Seed, boolVal);
-        }
-    }
-
-    private void OnExecutePlantCryoxadone(ref ExecuteEntityEffectEvent<PlantCryoxadone> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        var deviation = 0;
-        var seed = plantHolderComp.Seed;
-        if (seed == null)
-            return;
-        if (plantHolderComp.Age > seed.Maturation)
-            deviation = (int) Math.Max(seed.Maturation - 1, plantHolderComp.Age - _random.Next(7, 10));
-        else
-            deviation = (int) (seed.Maturation / seed.GrowthStages);
-        plantHolderComp.Age -= deviation;
-        plantHolderComp.LastProduce = plantHolderComp.Age;
-        plantHolderComp.SkipAging++;
-        plantHolderComp.ForceUpdate = true;
-    }
-
-    private void OnExecutePlantDestroySeeds(ref ExecuteEntityEffectEvent<PlantDestroySeeds> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
-            return;
-
-        if (plantHolderComp.Seed!.Seedless == false)
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            _popup.PopupEntity(
-                Loc.GetString("botany-plant-seedsdestroyed"),
-                args.Args.TargetEntity,
-                PopupType.SmallCaution
-            );
-            plantHolderComp.Seed.Seedless = true;
-        }
-    }
-
-    private void OnExecutePlantDiethylamine(ref ExecuteEntityEffectEvent<PlantDiethylamine> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
-            return;
-
-        if (_random.Prob(0.1f))
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed!.Lifespan++;
-        }
-
-        if (_random.Prob(0.1f))
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed!.Endurance++;
-        }
-    }
-
-    private void OnExecutePlantPhalanximine(ref ExecuteEntityEffectEvent<PlantPhalanximine> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
-            return;
-
-        plantHolderComp.Seed!.Viable = true;
-    }
-
-    private void OnExecutePlantRestoreSeeds(ref ExecuteEntityEffectEvent<PlantRestoreSeeds> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp, mustHaveMutableSeed: true))
-            return;
-
-        if (plantHolderComp.Seed!.Seedless)
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            _popup.PopupEntity(Loc.GetString("botany-plant-seedsrestored"), args.Args.TargetEntity);
-            plantHolderComp.Seed.Seedless = false;
-        }
-    }
-
-    private void OnExecuteRobustHarvest(ref ExecuteEntityEffectEvent<RobustHarvest> args)
-    {
-        if (!CanMetabolizePlant(args.Args.TargetEntity, out var plantHolderComp))
-            return;
-
-        if (plantHolderComp.Seed == null)
-            return;
-
-        if (plantHolderComp.Seed.Potency < args.Effect.PotencyLimit)
-        {
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed.Potency = Math.Min(plantHolderComp.Seed.Potency + args.Effect.PotencyIncrease, args.Effect.PotencyLimit);
-
-            if (plantHolderComp.Seed.Potency > args.Effect.PotencySeedlessThreshold)
-            {
-                plantHolderComp.Seed.Seedless = true;
-            }
-        }
-        else if (plantHolderComp.Seed.Yield > 1 && _random.Prob(0.1f))
-        {
-            // Too much of a good thing reduces yield
-            _plantHolder.EnsureUniqueSeed(args.Args.TargetEntity, plantHolderComp);
-            plantHolderComp.Seed.Yield--;
-        }
-    }
-
-    private void OnExecuteAdjustTemperature(ref ExecuteEntityEffectEvent<AdjustTemperature> args)
-    {
-        if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
-        {
-            var amount = args.Effect.Amount;
-
-            if (args.Args is EntityEffectReagentArgs reagentArgs)
-            {
-                amount *= reagentArgs.Scale.Float();
-            }
-
-            _temperature.ChangeHeat(args.Args.TargetEntity, amount, true, temp);
-        }
-    }
-
-    private void OnExecuteAreaReactionEffect(ref ExecuteEntityEffectEvent<AreaReactionEffect> args)
-    {
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.Source == null)
-                return;
-
-            var spreadAmount = (int) Math.Max(0, Math.Ceiling((reagentArgs.Quantity / args.Effect.OverflowThreshold).Float()));
-            var splitSolution = reagentArgs.Source.SplitSolution(reagentArgs.Source.Volume);
-            var transform = Comp<TransformComponent>(reagentArgs.TargetEntity);
-            var mapCoords = _xform.GetMapCoordinates(reagentArgs.TargetEntity, xform: transform);
-
-            if (!_mapManager.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-                !_map.TryGetTileRef(gridUid, grid, transform.Coordinates, out var tileRef))
-            {
-                return;
-            }
-
-            if (_spreader.RequiresFloorToSpread(args.Effect.PrototypeId) && _turf.IsSpace(tileRef))
-                return;
-
-            var coords = _map.MapToGrid(gridUid, mapCoords);
-            var ent = Spawn(args.Effect.PrototypeId, coords.SnapToGrid());
-
-            _smoke.StartSmoke(ent, splitSolution, args.Effect.Duration, spreadAmount);
-
-            _audio.PlayPvs(args.Effect.Sound, reagentArgs.TargetEntity, AudioParams.Default.WithVariation(0.25f));
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    private void OnExecuteCauseZombieInfection(ref ExecuteEntityEffectEvent<CauseZombieInfection> args)
-    {
-        EnsureComp<ZombifyOnDeathComponent>(args.Args.TargetEntity);
-        EnsureComp<PendingZombieComponent>(args.Args.TargetEntity);
-    }
-
-    private void OnExecuteChemCleanBloodstream(ref ExecuteEntityEffectEvent<ChemCleanBloodstream> args)
-    {
-        var cleanseRate = args.Effect.CleanseRate;
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.Source == null || reagentArgs.Reagent == null)
-                return;
-
-            cleanseRate *= reagentArgs.Scale.Float();
-            _bloodstream.FlushChemicals(args.Args.TargetEntity, reagentArgs.Reagent, cleanseRate);
-        }
-        else
-        {
-            _bloodstream.FlushChemicals(args.Args.TargetEntity, null, cleanseRate);
-        }
-    }
-
-    private void OnExecuteChemVomit(ref ExecuteEntityEffectEvent<ChemVomit> args)
-    {
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-            if (reagentArgs.Scale != 1f)
-                return;
-
-        _vomit.Vomit(args.Args.TargetEntity, args.Effect.ThirstAmount, args.Effect.HungerAmount);
-    }
-
-    private void OnExecuteCreateEntityReactionEffect(ref ExecuteEntityEffectEvent<CreateEntityReactionEffect> args)
-    {
-        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
-        var quantity = (int)args.Effect.Number;
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-            quantity *= reagentArgs.Quantity.Int();
-
-        for (var i = 0; i < quantity; i++)
-        {
-            var uid = Spawn(args.Effect.Entity, _xform.GetMapCoordinates(args.Args.TargetEntity, xform: transform));
-            _xform.AttachToGridOrMap(uid);
-
-            // TODO figure out how to properly spawn inside of containers
-            // e.g. cheese:
-            // if the user is holding a bowl milk & enzyme, should drop to floor, not attached to the user.
-            // if reaction happens in a backpack, should insert cheese into backpack.
-            // --> if it doesn't fit, iterate through parent storage until it attaches to the grid (again, DON'T attach to players).
-            // if the reaction happens INSIDE a stomach? the bloodstream? I have no idea how to handle that.
-            // presumably having cheese materialize inside of your blood would have "disadvantages".
-        }
-    }
-
-    private void OnExecuteCreateGas(ref ExecuteEntityEffectEvent<CreateGas> args)
-    {
-        var tileMix = _atmosphere.GetContainingMixture(args.Args.TargetEntity, false, true);
-
-        if (tileMix != null)
-        {
-            if (args.Args is EntityEffectReagentArgs reagentArgs)
-            {
-                tileMix.AdjustMoles(args.Effect.Gas, reagentArgs.Quantity.Float() * args.Effect.Multiplier);
-            }
-            else
-            {
-                tileMix.AdjustMoles(args.Effect.Gas, args.Effect.Multiplier);
-            }
-        }
-    }
-
-    private void OnExecuteCureZombieInfection(ref ExecuteEntityEffectEvent<CureZombieInfection> args)
-    {
-        if (HasComp<IncurableZombieComponent>(args.Args.TargetEntity))
-            return;
-
-        RemComp<ZombifyOnDeathComponent>(args.Args.TargetEntity);
-        RemComp<PendingZombieComponent>(args.Args.TargetEntity);
-
-        if (args.Effect.Innoculate)
-        {
-            EnsureComp<ZombieImmuneComponent>(args.Args.TargetEntity);
-        }
-    }
-
-    private void OnExecuteEmote(ref ExecuteEntityEffectEvent<Emote> args)
-    {
-        if (args.Effect.EmoteId == null)
-            return;
-
-        if (args.Effect.ShowInChat)
-            _chat.TryEmoteWithChat(args.Args.TargetEntity, args.Effect.EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: args.Effect.Force);
-        else
-            _chat.TryEmoteWithoutChat(args.Args.TargetEntity, args.Effect.EmoteId);
-    }
-
-    private void OnExecuteEmpReactionEffect(ref ExecuteEntityEffectEvent<EmpReactionEffect> args)
-    {
-        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
-
-        var range = args.Effect.EmpRangePerUnit;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            range = MathF.Min((float) (reagentArgs.Quantity * args.Effect.EmpRangePerUnit), args.Effect.EmpMaxRange);
-        }
-
-        _emp.EmpPulse(_xform.GetMapCoordinates(args.Args.TargetEntity, xform: transform),
-            range,
-            args.Effect.EnergyConsumption,
-            args.Effect.DisableDuration);
-    }
-
-    private void OnExecuteExplosionReactionEffect(ref ExecuteEntityEffectEvent<ExplosionReactionEffect> args)
-    {
-        var intensity = args.Effect.IntensityPerUnit;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            intensity = MathF.Min((float) reagentArgs.Quantity * args.Effect.IntensityPerUnit, args.Effect.MaxTotalIntensity);
-        }
-
-        _explosion.QueueExplosion(
-            args.Args.TargetEntity,
-            args.Effect.ExplosionType,
-            intensity,
-            args.Effect.IntensitySlope,
-            args.Effect.MaxIntensity,
-            args.Effect.TileBreakScale);
-    }
-
-    private void OnExecuteFlammableReaction(ref ExecuteEntityEffectEvent<FlammableReaction> args)
-    {
-        if (!TryComp(args.Args.TargetEntity, out FlammableComponent? flammable))
-            return;
-
-        // Sets the multiplier for FireStacks to MultiplierOnExisting is 0 or greater and target already has FireStacks
-        var multiplier = flammable.FireStacks != 0f && args.Effect.MultiplierOnExisting >= 0 ? args.Effect.MultiplierOnExisting : args.Effect.Multiplier;
-        var quantity = 1f;
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            quantity = reagentArgs.Quantity.Float();
-            _flammable.AdjustFireStacks(args.Args.TargetEntity, quantity * multiplier, flammable);
-            if (reagentArgs.Reagent != null)
-                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
-        }
-        else
-        {
-            _flammable.AdjustFireStacks(args.Args.TargetEntity, multiplier, flammable);
-        }
-    }
-
-    private void OnExecuteFlashReactionEffect(ref ExecuteEntityEffectEvent<FlashReactionEffect> args)
-    {
-        var transform = Comp<TransformComponent>(args.Args.TargetEntity);
-
-        var range = 1f;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-            range = MathF.Min((float)(reagentArgs.Quantity * args.Effect.RangePerUnit), args.Effect.MaxRange);
-
-        _flash.FlashArea(
-            args.Args.TargetEntity,
-            null,
-            range,
-            args.Effect.Duration,
-            slowTo: args.Effect.SlowTo,
-            sound: args.Effect.Sound);
-
-        if (args.Effect.FlashEffectPrototype == null)
-            return;
-
-        var uid = EntityManager.SpawnEntity(args.Effect.FlashEffectPrototype, _xform.GetMapCoordinates(transform));
-        _xform.AttachToGridOrMap(uid);
-
-        if (!TryComp<PointLightComponent>(uid, out var pointLightComp))
-            return;
-
-        _pointLight.SetRadius(uid, MathF.Max(1.1f, range), pointLightComp);
-    }
-
-    private void OnExecuteIgnite(ref ExecuteEntityEffectEvent<Ignite> args)
-    {
-        if (!TryComp(args.Args.TargetEntity, out FlammableComponent? flammable))
-            return;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            _flammable.Ignite(reagentArgs.TargetEntity, reagentArgs.OrganEntity ?? reagentArgs.TargetEntity, flammable: flammable);
-        }
-        else
-        {
-            _flammable.Ignite(args.Args.TargetEntity, args.Args.TargetEntity, flammable: flammable);
-        }
-    }
-
-    private void OnExecuteMakeSentient(ref ExecuteEntityEffectEvent<MakeSentient> args)
-    {
-        var uid = args.Args.TargetEntity;
-
-        // Let affected entities speak normally to make this effect different from, say, the "random sentience" event
-        // This also works on entities that already have a mind
-        // We call this before the mind check to allow things like player-controlled mice to be able to benefit from the effect
-        RemComp<ReplacementAccentComponent>(uid);
-        RemComp<MonkeyAccentComponent>(uid);
-
-        // Stops from adding a ghost role to things like people who already have a mind
-        if (TryComp<MindContainerComponent>(uid, out var mindContainer) && mindContainer.HasMind)
-        {
-            return;
-        }
-
-        // Don't add a ghost role to things that already have ghost roles
-        if (TryComp(uid, out GhostRoleComponent? ghostRole))
-        {
-            return;
-        }
-
-        ghostRole = AddComp<GhostRoleComponent>(uid);
-        EnsureComp<GhostTakeoverAvailableComponent>(uid);
-
-        var entityData = Comp<MetaDataComponent>(uid);
-        ghostRole.RoleName = entityData.EntityName;
-        ghostRole.RoleDescription = Loc.GetString("ghost-role-information-cognizine-description");
-    }
-
-    private void OnExecuteModifyBleedAmount(ref ExecuteEntityEffectEvent<ModifyBleedAmount> args)
-    {
-        if (TryComp<BloodstreamComponent>(args.Args.TargetEntity, out var blood))
-        {
-            var amt = args.Effect.Amount;
-            if (args.Args is EntityEffectReagentArgs reagentArgs) {
-                if (args.Effect.Scaled)
-                    amt *= reagentArgs.Quantity.Float();
-                amt *= reagentArgs.Scale.Float();
-            }
-
-            _bloodstream.TryModifyBleedAmount((args.Args.TargetEntity, blood), amt);
-        }
-    }
-
-    private void OnExecuteModifyBloodLevel(ref ExecuteEntityEffectEvent<ModifyBloodLevel> args)
-    {
-        if (TryComp<BloodstreamComponent>(args.Args.TargetEntity, out var blood))
-        {
-            var amt = args.Effect.Amount;
-            if (args.Args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (args.Effect.Scaled)
-                    amt *= reagentArgs.Quantity;
-                amt *= reagentArgs.Scale;
-            }
-
-            _bloodstream.TryModifyBloodLevel((args.Args.TargetEntity, blood), amt);
-        }
-    }
-
-    private void OnExecuteModifyLungGas(ref ExecuteEntityEffectEvent<ModifyLungGas> args)
-    {
-        LungComponent? lung;
-        float amount = 1f;
-
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (!TryComp<LungComponent>(reagentArgs.OrganEntity, out var organLung))
-                return;
-            lung = organLung;
-            amount = reagentArgs.Quantity.Float();
-        }
-        else
-        {
-            if (!TryComp<LungComponent>(args.Args.TargetEntity, out var organLung)) //Likely needs to be modified to ensure it works correctly
-                return;
-            lung = organLung;
-        }
-
-        if (lung != null)
-        {
-            foreach (var (gas, ratio) in args.Effect.Ratios)
-            {
-                var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
-                if (quantity < 0)
-                    quantity = Math.Max(quantity, -lung.Air[(int) gas]);
-                lung.Air.AdjustMoles(gas, quantity);
-            }
-        }
-    }
-
-    private void OnExecuteOxygenate(ref ExecuteEntityEffectEvent<Oxygenate> args)
-    {
-        var multiplier = 1f;
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-        {
-            multiplier = reagentArgs.Quantity.Float();
-        }
-
-        if (TryComp<RespiratorComponent>(args.Args.TargetEntity, out var resp))
-        {
-            _respirator.UpdateSaturation(args.Args.TargetEntity, multiplier * args.Effect.Factor, resp);
-        }
-    }
-
-    private void OnExecutePlantMutateChemicals(ref ExecuteEntityEffectEvent<PlantMutateChemicals> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-
-        if (plantholder.Seed == null)
-            return;
-
-        var chemicals = plantholder.Seed.Chemicals;
-        var randomChems = _protoManager.Index(RandomPickBotanyReagent).Fills;
-
-        // Add a random amount of a random chemical to this set of chemicals
-        if (randomChems != null)
-        {
-            var pick = _random.Pick<RandomFillSolution>(randomChems);
-            var chemicalId = _random.Pick(pick.Reagents);
-            var amount = _random.Next(1, (int)pick.Quantity);
-            var seedChemQuantity = new SeedChemQuantity();
-            if (chemicals.ContainsKey(chemicalId))
-            {
-                seedChemQuantity.Min = chemicals[chemicalId].Min;
-                seedChemQuantity.Max = chemicals[chemicalId].Max + amount;
-            }
-            else
-            {
-                seedChemQuantity.Min = 1;
-                seedChemQuantity.Max = 1 + amount;
-                seedChemQuantity.Inherent = false;
-            }
-            var potencyDivisor = (int)Math.Ceiling(100.0f / seedChemQuantity.Max);
-            seedChemQuantity.PotencyDivisor = potencyDivisor;
-            chemicals[chemicalId] = seedChemQuantity;
-        }
-    }
-
-    private void OnExecutePlantMutateConsumeGasses(ref ExecuteEntityEffectEvent<PlantMutateConsumeGasses> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-
-        if (plantholder.Seed == null)
-            return;
-
-        var gasses = plantholder.Seed.ConsumeGasses;
-
-        // Add a random amount of a random gas to this gas dictionary
-        float amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
-        Gas gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
-        if (gasses.ContainsKey(gas))
-        {
-            gasses[gas] += amount;
-        }
-        else
-        {
-            gasses.Add(gas, amount);
-        }
-    }
-
-    private void OnExecutePlantMutateExudeGasses(ref ExecuteEntityEffectEvent<PlantMutateExudeGasses> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-
-        if (plantholder.Seed == null)
-            return;
-
-        var gasses = plantholder.Seed.ExudeGasses;
-
-        // Add a random amount of a random gas to this gas dictionary
-        float amount = _random.NextFloat(args.Effect.MinValue, args.Effect.MaxValue);
-        Gas gas = _random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
-        if (gasses.ContainsKey(gas))
-        {
-            gasses[gas] += amount;
-        }
-        else
-        {
-            gasses.Add(gas, amount);
-        }
-    }
-
-    private void OnExecutePlantMutateHarvest(ref ExecuteEntityEffectEvent<PlantMutateHarvest> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-
-        if (plantholder.Seed == null)
-            return;
-
-        if (plantholder.Seed.HarvestRepeat == HarvestType.NoRepeat)
-            plantholder.Seed.HarvestRepeat = HarvestType.Repeat;
-        else if (plantholder.Seed.HarvestRepeat == HarvestType.Repeat)
-            plantholder.Seed.HarvestRepeat = HarvestType.SelfHarvest;
-    }
-
-    private void OnExecutePlantSpeciesChange(ref ExecuteEntityEffectEvent<PlantSpeciesChange> args)
-    {
-        var plantholder = Comp<PlantHolderComponent>(args.Args.TargetEntity);
-        if (plantholder.Seed == null)
-            return;
-
-        if (plantholder.Seed.MutationPrototypes.Count == 0)
-            return;
-
-        var targetProto = _random.Pick(plantholder.Seed.MutationPrototypes);
-        if (!_protoManager.TryIndex(targetProto, out SeedPrototype? protoSeed))
-        {
-            Log.Error($"Seed prototype could not be found: {targetProto}!");
-            return;
-        }
-
-        plantholder.Seed = plantholder.Seed.SpeciesChange(protoSeed);
-    }
-
-    private void OnExecutePolymorph(ref ExecuteEntityEffectEvent<PolymorphEffect> args)
-    {
-        // Make it into a prototype
-        EnsureComp<PolymorphableComponent>(args.Args.TargetEntity);
-        _polymorph.PolymorphEntity(args.Args.TargetEntity, args.Effect.PolymorphPrototype);
-    }
-
-    private void OnExecuteResetNarcolepsy(ref ExecuteEntityEffectEvent<ResetNarcolepsy> args)
-    {
-        if (args.Args is EntityEffectReagentArgs reagentArgs)
-            if (reagentArgs.Scale != 1f)
-                return;
-
-        _narcolepsy.AdjustNarcolepsyTimer(args.Args.TargetEntity, args.Effect.TimerReset);
-    }
-}
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
deleted file mode 100644
index 245ab8308f..0000000000
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Content.Shared.Fluids.Components;
-
-namespace Content.Server.Fluids.EntitySystems;
-
-public sealed partial class PuddleSystem
-{
-    private static readonly TimeSpan EvaporationCooldown = TimeSpan.FromSeconds(1);
-
-    private void OnEvaporationMapInit(Entity<EvaporationComponent> entity, ref MapInitEvent args)
-    {
-        entity.Comp.NextTick = _timing.CurTime + EvaporationCooldown;
-    }
-
-    private void UpdateEvaporation(EntityUid uid, Solution solution)
-    {
-        if (HasComp<EvaporationComponent>(uid))
-        {
-            return;
-        }
-
-        if (solution.GetTotalPrototypeQuantity(GetEvaporatingReagents(solution)) > FixedPoint2.Zero)
-        {
-            var evaporation = AddComp<EvaporationComponent>(uid);
-            evaporation.NextTick = _timing.CurTime + EvaporationCooldown;
-            return;
-        }
-
-        RemComp<EvaporationComponent>(uid);
-    }
-
-    private void TickEvaporation()
-    {
-        var query = EntityQueryEnumerator<EvaporationComponent, PuddleComponent>();
-        var xformQuery = GetEntityQuery<TransformComponent>();
-        var curTime = _timing.CurTime;
-        while (query.MoveNext(out var uid, out var evaporation, out var puddle))
-        {
-            if (evaporation.NextTick > curTime)
-                continue;
-
-            evaporation.NextTick += EvaporationCooldown;
-
-            if (!_solutionContainerSystem.ResolveSolution(uid, puddle.SolutionName, ref puddle.Solution, out var puddleSolution))
-                continue;
-
-            // Yes, this means that 50u water + 50u holy water evaporates twice as fast as 100u water.
-            foreach ((string evaporatingReagent, FixedPoint2 evaporatingSpeed) in GetEvaporationSpeeds(puddleSolution))
-            {
-                var reagentTick = evaporation.EvaporationAmount * EvaporationCooldown.TotalSeconds * evaporatingSpeed;
-                puddleSolution.SplitSolutionWithOnly(reagentTick, evaporatingReagent);
-            }
-
-            // Despawn if we're done
-            if (puddleSolution.Volume == FixedPoint2.Zero)
-            {
-                // Spawn a *sparkle*
-                Spawn("PuddleSparkle", xformQuery.GetComponent(uid).Coordinates);
-                QueueDel(uid);
-            }
-
-            _solutionContainerSystem.UpdateChemicals(puddle.Solution.Value);
-        }
-    }
-}
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index 880a4395b4..01526d4ee5 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -1,20 +1,8 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry;
-using Content.Shared.Clothing;
-using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Database;
-using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.Popups;
 using Content.Shared.Spillable;
 using Content.Shared.Throwing;
-using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Player;
 
 namespace Content.Server.Fluids.EntitySystems;
 
@@ -26,10 +14,8 @@ public sealed partial class PuddleSystem
 
         SubscribeLocalEvent<SpillableComponent, LandEvent>(SpillOnLand);
         // Openable handles the event if it's closed
-        SubscribeLocalEvent<SpillableComponent, MeleeHitEvent>(SplashOnMeleeHit, after: [typeof(OpenableSystem)]);
         SubscribeLocalEvent<SpillableComponent, SolutionContainerOverflowEvent>(OnOverflow);
         SubscribeLocalEvent<SpillableComponent, SpillDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<SpillableComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
     }
 
     private void OnOverflow(Entity<SpillableComponent> entity, ref SolutionContainerOverflowEvent args)
@@ -41,66 +27,6 @@ public sealed partial class PuddleSystem
         args.Handled = true;
     }
 
-    private void SplashOnMeleeHit(Entity<SpillableComponent> entity, ref MeleeHitEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        // When attacking someone reactive with a spillable entity,
-        // splash a little on them (touch react)
-        // If this also has solution transfer, then assume the transfer amount is how much we want to spill.
-        // Otherwise let's say they want to spill a quarter of its max volume.
-
-        if (!_solutionContainerSystem.TryGetDrainableSolution(entity.Owner, out var soln, out var solution))
-            return;
-
-        var hitCount = args.HitEntities.Count;
-
-        var totalSplit = FixedPoint2.Min(solution.MaxVolume * 0.25, solution.Volume);
-        if (TryComp<SolutionTransferComponent>(entity, out var transfer))
-        {
-            totalSplit = FixedPoint2.Min(transfer.TransferAmount, solution.Volume);
-        }
-
-        // a little lame, but reagent quantity is not very balanced and we don't want people
-        // spilling like 100u of reagent on someone at once!
-        totalSplit = FixedPoint2.Min(totalSplit, entity.Comp.MaxMeleeSpillAmount);
-
-        if (totalSplit == 0)
-            return;
-
-        // Optionally allow further melee handling occur
-        args.Handled = entity.Comp.PreventMelee;
-
-        // First update the hit count so anything that is not reactive wont count towards the total!
-        foreach (var hit in args.HitEntities)
-        {
-            if (!HasComp<ReactiveComponent>(hit))
-                hitCount -= 1;
-        }
-
-        foreach (var hit in args.HitEntities)
-        {
-            if (!HasComp<ReactiveComponent>(hit))
-                continue;
-
-            var splitSolution = _solutionContainerSystem.SplitSolution(soln.Value, totalSplit / hitCount);
-
-            _adminLogger.Add(LogType.MeleeHit, $"{ToPrettyString(args.User)} splashed {SharedSolutionContainerSystem.ToPrettyString(splitSolution):solution} from {ToPrettyString(entity.Owner):entity} onto {ToPrettyString(hit):target}");
-            _reactive.DoEntityReaction(hit, splitSolution, ReactionMethod.Touch);
-
-            _popups.PopupEntity(
-                Loc.GetString("spill-melee-hit-attacker", ("amount", totalSplit / hitCount), ("spillable", entity.Owner),
-                    ("target", Identity.Entity(hit, EntityManager))),
-                hit, args.User);
-
-            _popups.PopupEntity(
-                Loc.GetString("spill-melee-hit-others", ("attacker", args.User), ("spillable", entity.Owner),
-                    ("target", Identity.Entity(hit, EntityManager))),
-                hit, Filter.PvsExcept(args.User), true, PopupType.SmallCaution);
-        }
-    }
-
     private void SpillOnLand(Entity<SpillableComponent> entity, ref LandEvent args)
     {
         if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln, out var solution))
@@ -114,7 +40,7 @@ public sealed partial class PuddleSystem
 
         if (args.User != null)
         {
-            _adminLogger.Add(LogType.Landed,
+            AdminLogger.Add(LogType.Landed,
                 $"{ToPrettyString(entity.Owner):entity} spilled a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution} on landing");
         }
 
@@ -122,22 +48,6 @@ public sealed partial class PuddleSystem
         TrySplashSpillAt(entity.Owner, Transform(entity).Coordinates, drainedSolution, out _);
     }
 
-    /// <summary>
-    /// Prevent Pacified entities from throwing items that can spill liquids.
-    /// </summary>
-    private void OnAttemptPacifiedThrow(Entity<SpillableComponent> ent, ref AttemptPacifiedThrowEvent args)
-    {
-        // Don’t care about closed containers.
-        if (Openable.IsClosed(ent))
-            return;
-
-        // Don’t care about empty containers.
-        if (!_solutionContainerSystem.TryGetSolution(ent.Owner, ent.Comp.SolutionName, out _, out var solution) || solution.Volume <= 0)
-            return;
-
-        args.Cancel("pacified-cannot-throw-spill");
-    }
-
     private void OnDoAfter(Entity<SpillableComponent> entity, ref SpillDoAfterEvent args)
     {
         if (args.Handled || args.Cancelled || args.Args.Target == null)
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs
deleted file mode 100644
index e850f058a8..0000000000
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.DragDrop;
-using Content.Shared.FixedPoint;
-using Content.Shared.Fluids;
-using Content.Shared.Nutrition.EntitySystems;
-
-namespace Content.Server.Fluids.EntitySystems;
-
-public sealed partial class PuddleSystem
-{
-    [Dependency] private readonly OpenableSystem _openable = default!;
-
-    private void InitializeTransfers()
-    {
-        SubscribeLocalEvent<RefillableSolutionComponent, DragDropDraggedEvent>(OnRefillableDragged);
-    }
-
-    private void OnRefillableDragged(Entity<RefillableSolutionComponent> entity, ref DragDropDraggedEvent args)
-    {
-        if (!_actionBlocker.CanComplexInteract(args.User))
-        {
-            _popups.PopupEntity(Loc.GetString("mopping-system-no-hands"), args.User, args.User);
-            return;
-        }
-
-        if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.Solution, out var soln, out var solution) || solution.Volume == FixedPoint2.Zero)
-        {
-            _popups.PopupEntity(Loc.GetString("mopping-system-empty", ("used", entity.Owner)), entity, args.User);
-            return;
-        }
-
-        // Dump reagents into DumpableSolution
-        if (TryComp<DumpableSolutionComponent>(args.Target, out var dump))
-        {
-            if (!_solutionContainerSystem.TryGetDumpableSolution((args.Target, dump, null), out var dumpableSoln, out var dumpableSolution))
-                return;
-
-            if (!_solutionContainerSystem.TryGetDrainableSolution(entity.Owner, out _, out _))
-                return;
-
-            if (_openable.IsClosed(entity))
-                return;
-
-            bool success = true;
-            if (dump.Unlimited)
-            {
-                var split = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume);
-                dumpableSolution.AddSolution(split, _prototypeManager);
-            }
-            else
-            {
-                var split = _solutionContainerSystem.SplitSolution(soln.Value, dumpableSolution.AvailableVolume);
-                success = _solutionContainerSystem.TryAddSolution(dumpableSoln.Value, split);
-            }
-
-            if (success)
-            {
-                _audio.PlayPvs(AbsorbentComponent.DefaultTransferSound, args.Target);
-            }
-            else
-            {
-                _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", args.Target)), args.Target, args.User);
-            }
-
-            return;
-        }
-
-        // Take reagents from target
-        if (!TryComp<DrainableSolutionComponent>(args.Target, out var drainable))
-        {
-            if (!_solutionContainerSystem.TryGetDrainableSolution((args.Target, drainable, null), out var drainableSolution, out _))
-                return;
-
-            var split = _solutionContainerSystem.SplitSolution(drainableSolution.Value, solution.AvailableVolume);
-
-            if (_solutionContainerSystem.TryAddSolution(soln.Value, split))
-            {
-                _audio.PlayPvs(AbsorbentComponent.DefaultTransferSound, entity);
-            }
-            else
-            {
-                _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", entity.Owner)), entity, args.User);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index 63ee75618c..2f966354ec 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -1,38 +1,25 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.Chemistry.TileReactions;
-using Content.Server.DoAfter;
 using Content.Server.Fluids.Components;
 using Content.Server.Spreader;
-using Content.Shared.ActionBlocker;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.Effects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;
 using Content.Shared.Fluids.Components;
-using Content.Shared.Friction;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Maps;
-using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Slippery;
-using Content.Shared.StepTrigger.Components;
-using Content.Shared.StepTrigger.Systems;
-using Robust.Server.Audio;
 using Robust.Shared.Collections;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Fluids.EntitySystems;
 
@@ -41,28 +28,15 @@ namespace Content.Server.Fluids.EntitySystems;
 /// </summary>
 public sealed partial class PuddleSystem : SharedPuddleSystem
 {
-    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly ReactiveSystem _reactive = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-    [Dependency] private readonly SharedPopupSystem _popups = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly StepTriggerSystem _stepTrigger = default!;
-    [Dependency] private readonly SpeedModifierContactsSystem _speedModContacts = default!;
-    [Dependency] private readonly TileFrictionController _tile = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
 
-    // Using local deletion queue instead of the standard queue so that we can easily "undelete" if a puddle
-    // loses & then gains reagents in a single tick.
-    private HashSet<EntityUid> _deletionQueue = [];
-
     private EntityQuery<PuddleComponent> _puddleQuery;
 
     /*
@@ -77,16 +51,11 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
         _puddleQuery = GetEntityQuery<PuddleComponent>();
 
-        // Shouldn't need re-anchoring.
-        SubscribeLocalEvent<PuddleComponent, AnchorStateChangedEvent>(OnAnchorChanged);
         SubscribeLocalEvent<PuddleComponent, SpreadNeighborsEvent>(OnPuddleSpread);
         SubscribeLocalEvent<PuddleComponent, SlipEvent>(OnPuddleSlip);
-
-        SubscribeLocalEvent<EvaporationComponent, MapInitEvent>(OnEvaporationMapInit);
-
-        InitializeTransfers();
     }
 
+    // TODO: This can be predicted once https://github.com/space-wizards/RobustToolbox/pull/5849 is merged
     private void OnPuddleSpread(Entity<PuddleComponent> entity, ref SpreadNeighborsEvent args)
     {
         // Overflow is the source of the overflowing liquid. This contains the excess fluid above overflow limit (20u)
@@ -273,6 +242,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         }
     }
 
+    // TODO: This can be predicted once https://github.com/space-wizards/RobustToolbox/pull/5849 is merged
     private void OnPuddleSlip(Entity<PuddleComponent> entity, ref SlipEvent args)
     {
         // Reactive entities have a chance to get a touch reaction from slipping on a puddle
@@ -289,168 +259,12 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
                 out var solution))
             return;
 
-        _popups.PopupEntity(Loc.GetString("puddle-component-slipped-touch-reaction", ("puddle", entity.Owner)),
+        Popups.PopupEntity(Loc.GetString("puddle-component-slipped-touch-reaction", ("puddle", entity.Owner)),
             args.Slipped, args.Slipped, PopupType.SmallCaution);
 
         // Take 15% of the puddle solution
         var splitSol = _solutionContainerSystem.SplitSolution(entity.Comp.Solution.Value, solution.Volume * 0.15f);
-        _reactive.DoEntityReaction(args.Slipped, splitSol, ReactionMethod.Touch);
-    }
-
-    /// <inheritdoc/>
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-        foreach (var ent in _deletionQueue)
-        {
-            Del(ent);
-        }
-
-        _deletionQueue.Clear();
-
-        TickEvaporation();
-    }
-
-    protected override void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContainerChangedEvent args)
-    {
-        if (args.SolutionId != entity.Comp.SolutionName)
-            return;
-
-        base.OnSolutionUpdate(entity, ref args);
-
-        if (args.Solution.Volume <= 0)
-        {
-            _deletionQueue.Add(entity);
-            return;
-        }
-
-        _deletionQueue.Remove(entity);
-        UpdateSlip((entity, entity.Comp), args.Solution);
-        UpdateSlow(entity, args.Solution);
-        UpdateEvaporation(entity, args.Solution);
-    }
-
-    private void UpdateSlip(Entity<PuddleComponent> entity, Solution solution)
-    {
-        if (!TryComp<StepTriggerComponent>(entity, out var comp))
-            return;
-
-        // Ensure we actually have the component
-        EnsureComp<TileFrictionModifierComponent>(entity);
-
-        EnsureComp<SlipperyComponent>(entity, out var slipComp);
-
-        // This is the base amount of reagent needed before a puddle can be considered slippery. Is defined based on
-        // the sprite threshold for a puddle larger than 5 pixels.
-        var smallPuddleThreshold = FixedPoint2.New(entity.Comp.OverflowVolume.Float() * LowThreshold);
-
-        // Stores how many units of slippery reagents a puddle has
-        var slipperyUnits = FixedPoint2.Zero;
-        // Stores how many units of super slippery reagents a puddle has
-        var superSlipperyUnits = FixedPoint2.Zero;
-
-        // These three values will be averaged later and all start at zero so the calculations work
-        // A cumulative weighted amount of minimum speed to slip values
-        var puddleFriction = FixedPoint2.Zero;
-        // A cumulative weighted amount of minimum speed to slip values
-        var slipStepTrigger = FixedPoint2.Zero;
-        // A cumulative weighted amount of launch multipliers from slippery reagents
-        var launchMult = FixedPoint2.Zero;
-        // A cumulative weighted amount of stun times from slippery reagents
-        var stunTimer = TimeSpan.Zero;
-        // A cumulative weighted amount of knockdown times from slippery reagents
-        var knockdownTimer = TimeSpan.Zero;
-
-        // Check if the puddle is big enough to slip in to avoid doing unnecessary logic
-        if (solution.Volume <= smallPuddleThreshold)
-        {
-            _stepTrigger.SetActive(entity, false, comp);
-            _tile.SetModifier(entity, 1f);
-            slipComp.SlipData.SlipFriction = 1f;
-            slipComp.AffectsSliding = false;
-            Dirty(entity, slipComp);
-            return;
-        }
-
-        slipComp.AffectsSliding = true;
-
-        foreach (var (reagent, quantity) in solution.Contents)
-        {
-            var reagentProto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
-
-            // Calculate the minimum speed needed to slip in the puddle. Average the overall slip thresholds for all reagents
-            var deltaSlipTrigger = reagentProto.SlipData?.RequiredSlipSpeed ?? entity.Comp.DefaultSlippery;
-            slipStepTrigger += quantity * deltaSlipTrigger;
-
-            // Aggregate Friction based on quantity
-            puddleFriction += reagentProto.Friction * quantity;
-
-            if (reagentProto.SlipData == null)
-                continue;
-
-            slipperyUnits += quantity;
-            // Aggregate launch speed based on quantity
-            launchMult += reagentProto.SlipData.LaunchForwardsMultiplier * quantity;
-            // Aggregate stun times based on quantity
-            stunTimer += reagentProto.SlipData.StunTime * (float)quantity;
-            knockdownTimer += reagentProto.SlipData.KnockdownTime * (float)quantity;
-
-            if (reagentProto.SlipData.SuperSlippery)
-                superSlipperyUnits += quantity;
-        }
-
-        // Turn on the step trigger if it's slippery
-        _stepTrigger.SetActive(entity, slipperyUnits > smallPuddleThreshold, comp);
-
-        // This is based of the total volume and not just the slippery volume because there is a default
-        // slippery for all reagents even if they aren't technically slippery.
-        slipComp.SlipData.RequiredSlipSpeed = (float)(slipStepTrigger / solution.Volume);
-        _stepTrigger.SetRequiredTriggerSpeed(entity, slipComp.SlipData.RequiredSlipSpeed);
-
-        // Divide these both by only total amount of slippery reagents.
-        // A puddle with 10 units of lube vs a puddle with 10 of lube and 20 catchup should stun and launch forward the same amount.
-        if (slipperyUnits > 0)
-        {
-            slipComp.SlipData.LaunchForwardsMultiplier = (float)(launchMult/slipperyUnits);
-            slipComp.SlipData.StunTime = (stunTimer/(float)slipperyUnits);
-            slipComp.SlipData.KnockdownTime = (knockdownTimer/(float)slipperyUnits);
-        }
-
-        // Only make it super slippery if there is enough super slippery units for its own puddle
-        slipComp.SlipData.SuperSlippery = superSlipperyUnits >= smallPuddleThreshold;
-
-        // Lower tile friction based on how slippery it is, lets items slide across a puddle of lube
-        slipComp.SlipData.SlipFriction = (float)(puddleFriction / solution.Volume);
-        _tile.SetModifier(entity, slipComp.SlipData.SlipFriction);
-
-        Dirty(entity, slipComp);
-    }
-
-    private void UpdateSlow(EntityUid uid, Solution solution)
-    {
-        var maxViscosity = 0f;
-        foreach (var (reagent, _) in solution.Contents)
-        {
-            var reagentProto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
-            maxViscosity = Math.Max(maxViscosity, reagentProto.Viscosity);
-        }
-
-        if (maxViscosity > 0)
-        {
-            var comp = EnsureComp<SpeedModifierContactsComponent>(uid);
-            var speed = 1 - maxViscosity;
-            _speedModContacts.ChangeSpeedModifiers(uid, speed, comp);
-        }
-        else
-        {
-            RemComp<SpeedModifierContactsComponent>(uid);
-        }
-    }
-
-    private void OnAnchorChanged(Entity<PuddleComponent> entity, ref AnchorStateChangedEvent args)
-    {
-        if (!args.Anchored)
-            QueueDel(entity);
+        Reactive.DoEntityReaction(args.Slipped, splitSol, ReactionMethod.Touch);
     }
 
     /// <summary>
@@ -507,7 +321,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
             return true;
         }
 
-        _audio.PlayPvs(puddleComponent.SpillSound, puddleUid);
+        Audio.PlayPvs(puddleComponent.SpillSound, puddleUid);
         return true;
     }
 
@@ -553,6 +367,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
     #region Spill
 
+    // TODO: This can be predicted once https://github.com/space-wizards/RobustToolbox/pull/5849 is merged
     /// <inheritdoc/>
     public override bool TrySplashSpillAt(EntityUid uid,
         EntityCoordinates coordinates,
@@ -582,13 +397,13 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
             if (user != null)
             {
-                _adminLogger.Add(LogType.Landed,
+                AdminLogger.Add(LogType.Landed,
                     $"{ToPrettyString(user.Value):user} threw {ToPrettyString(uid):entity} which splashed a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution} onto {ToPrettyString(owner):target}");
             }
 
             targets.Add(owner);
-            _reactive.DoEntityReaction(owner, splitSolution, ReactionMethod.Touch);
-            _popups.PopupEntity(
+            Reactive.DoEntityReaction(owner, splitSolution, ReactionMethod.Touch);
+            Popups.PopupEntity(
                 Loc.GetString("spill-land-spilled-on-other", ("spillable", uid),
                     ("target", Identity.Entity(owner, EntityManager))), owner, PopupType.SmallCaution);
         }
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index 13695caff1..7c9d02c561 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -21,7 +21,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Linq;
-
+using Content.Shared.EntityEffects.Effects.Solution;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
 
 namespace Content.Server.Fluids.EntitySystems;
@@ -278,11 +278,10 @@ public sealed class SmokeSystem : EntitySystem
         {
             if (reagentQuantity.Quantity == FixedPoint2.Zero)
                 continue;
-            var reagentProto = _prototype.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
 
-            _reactive.ReactionEntity(entity, ReactionMethod.Touch, reagentProto, reagentQuantity, transferSolution);
+            _reactive.ReactionEntity(entity, ReactionMethod.Touch, reagentQuantity);
             if (!blockIngestion)
-                _reactive.ReactionEntity(entity, ReactionMethod.Ingestion, reagentProto, reagentQuantity, transferSolution);
+                _reactive.ReactionEntity(entity, ReactionMethod.Ingestion, reagentQuantity);
         }
 
         if (blockIngestion)
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index e72e9d5f73..3568f17306 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -170,12 +170,18 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
                     Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp", "#"))));
                 return (code, briefing);
             }
+
+            Log.Error($"MakeTraitor {ToPrettyString(traitor)} failed to generate an uplink code on {ToPrettyString(pda)}.");
         }
         else if (pda is null && uplinked)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is implant");
             briefing += "\n" + Loc.GetString("traitor-role-uplink-implant-short");
         }
+        else
+        {
+            Log.Error($"MakeTraitor failed on {ToPrettyString(traitor)} - No uplink could be added");
+        }
 
         return (null, briefing);
     }
diff --git a/Content.Server/Ghost/SpookySpeakerSystem.cs b/Content.Server/Ghost/SpookySpeakerSystem.cs
index ce3a2705a0..e16c2cf9b3 100644
--- a/Content.Server/Ghost/SpookySpeakerSystem.cs
+++ b/Content.Server/Ghost/SpookySpeakerSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Ghost.Components;
+using Content.Shared.Chat;
 using Content.Shared.Random.Helpers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
diff --git a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
index 5799538ae9..d0ab9ab2b0 100644
--- a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
+++ b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
@@ -5,6 +5,7 @@ using System.Text.Json.Serialization;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
+using Content.Shared.EntityConditions;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
@@ -43,7 +44,7 @@ public sealed class ChemistryJsonGenerator
             Converters =
             {
                 new UniversalJsonConverter<EntityEffect>(),
-                new UniversalJsonConverter<EntityEffectCondition>(),
+                new UniversalJsonConverter<EntityCondition>(),
                 new UniversalJsonConverter<ReagentEffectsEntry>(),
                 new UniversalJsonConverter<DamageSpecifier>(),
                 new FixedPointJsonConverter()
diff --git a/Content.Server/GuideGenerator/ReagentEntry.cs b/Content.Server/GuideGenerator/ReagentEntry.cs
index d193babf98..cf8c0fc5c3 100644
--- a/Content.Server/GuideGenerator/ReagentEntry.cs
+++ b/Content.Server/GuideGenerator/ReagentEntry.cs
@@ -105,7 +105,7 @@ public sealed class ReactionEntry
             proto.Products
                 .Select(x => KeyValuePair.Create(x.Key, x.Value.Float()))
                 .ToDictionary(x => x.Key, x => x.Value);
-        Effects = proto.Effects;
+        Effects = proto.Effects.ToList();
 
         // Corvax-Wiki-Start
         ExportEffects = proto.Effects.Select(x => new ReagentEffectEntry(x)).ToList();
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 4d47ea4a78..7688d14ada 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -160,7 +160,7 @@ namespace Content.Server.Hands.Systems
 
             if (TryComp(throwEnt, out StackComponent? stack) && stack.Count > 1 && stack.ThrowIndividually)
             {
-                var splitStack = _stackSystem.Split(throwEnt.Value, 1, Comp<TransformComponent>(player).Coordinates, stack);
+                var splitStack = _stackSystem.Split((throwEnt.Value, stack), 1, Comp<TransformComponent>(player).Coordinates);
 
                 if (splitStack is not {Valid: true})
                     return false;
diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index 5a4f4d93ce..c634d14f2f 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -4,6 +4,7 @@ using Content.Server.Power.EntitySystems;
 using Content.Server.Telephone;
 using Content.Shared.Access.Systems;
 using Content.Shared.Audio;
+using Content.Shared.Chat;
 using Content.Shared.Chat.TypingIndicator;
 using Content.Shared.Holopad;
 using Content.Shared.IdentityManagement;
@@ -404,6 +405,9 @@ public sealed class HolopadSystem : SharedHolopadSystem
         if (!this.IsPowered(entity, EntityManager))
             return;
 
+        if (HasComp<StationAiCoreComponent>(entity))
+            return;
+
         if (!TryComp<TelephoneComponent>(entity, out var entityTelephone) ||
             _telephoneSystem.IsTelephoneEngaged((entity, entityTelephone)))
             return;
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index c2d2614a0a..e23bea7bb4 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -41,6 +41,7 @@ using Content.Shared.Stacks;
 using Content.Server.Construction.Components;
 using Content.Shared.Chat;
 using Content.Shared.Damage;
+using Content.Shared.Temperature.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Kitchen.EntitySystems
@@ -241,7 +242,7 @@ namespace Content.Server.Kitchen.EntitySystems
                         // If an entity has a stack component, use the stacktype instead of prototype id
                         if (TryComp<StackComponent>(item, out var stackComp))
                         {
-                            itemID = _prototype.Index<StackPrototype>(stackComp.StackTypeId).Spawn;
+                            itemID = _prototype.Index(stackComp.StackTypeId).Spawn;
                         }
                         else
                         {
@@ -264,7 +265,7 @@ namespace Content.Server.Kitchen.EntitySystems
                             {
                                 _container.Remove(item, component.Storage);
                             }
-                            _stack.Use(item, 1, stackComp);
+                            _stack.ReduceCount((item, stackComp), 1);
                             break;
                         }
                         else
diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index cd0ce8f3a6..b850bc87fa 100644
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -118,7 +118,7 @@ namespace Content.Server.Kitchen.EntitySystems
                         scaledSolution.ScaleSolution(fitsCount);
                         solution = scaledSolution;
 
-                        _stackSystem.SetCount(item, stack.Count - fitsCount); // Setting to 0 will QueueDel
+                        _stackSystem.ReduceCount((item, stack), fitsCount); // Setting to 0 will QueueDel
                     }
                     else
                     {
diff --git a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
index f643bec73f..0436ea7d3c 100644
--- a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
@@ -136,13 +136,13 @@ namespace Content.Server.Light.EntitySystems
                 component.StateExpiryTime = (float)component.RefuelMaterialTime.TotalSeconds;
 
                 _nameModifier.RefreshNameModifiers(uid);
-                _stackSystem.SetCount(args.Used, stack.Count - 1, stack);
+                _stackSystem.ReduceCount((args.Used, stack), 1);
                 UpdateVisualizer((uid, component));
                 return;
             }
 
             component.StateExpiryTime += (float)component.RefuelMaterialTime.TotalSeconds;
-            _stackSystem.SetCount(args.Used, stack.Count - 1, stack);
+            _stackSystem.ReduceCount((args.Used, stack), 1);
             args.Handled = true;
         }
 
diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs
index 0fd00fca24..dbc258c02c 100644
--- a/Content.Server/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs
@@ -107,6 +107,8 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
 
     private void OnSelectSlotDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorSelectDoAfterEvent args)
     {
+        component.DoAfter = null;
+
         if (args.Handled || args.Target == null || args.Cancelled)
             return;
 
@@ -185,6 +187,8 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
     }
     private void OnChangeColorDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorChangeColorDoAfterEvent args)
     {
+        component.DoAfter = null;
+
         if (args.Handled || args.Target == null || args.Cancelled)
             return;
 
@@ -265,6 +269,8 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
 
     private void OnRemoveSlotDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorRemoveSlotDoAfterEvent args)
     {
+        component.DoAfter = null;
+
         if (args.Handled || args.Target == null || args.Cancelled)
             return;
 
@@ -342,6 +348,8 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
     }
     private void OnAddSlotDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorAddSlotDoAfterEvent args)
     {
+        component.DoAfter = null;
+
         if (args.Handled || args.Target == null || args.Cancelled || !TryComp(component.Target, out HumanoidAppearanceComponent? humanoid))
             return;
 
diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs
index 3a462dd4d5..f6a1b6c4d8 100644
--- a/Content.Server/Materials/MaterialStorageSystem.cs
+++ b/Content.Server/Materials/MaterialStorageSystem.cs
@@ -73,7 +73,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem
                 return;
 
             var volumePerSheet = composition.MaterialComposition.FirstOrDefault(kvp => kvp.Key == msg.Material).Value;
-            var sheetsToExtract = Math.Min(msg.SheetsToExtract, _stackSystem.GetMaxCount(material.StackEntity));
+            var sheetsToExtract = Math.Min(msg.SheetsToExtract, _stackSystem.GetMaxCount(material.StackEntity.Value));
 
             volume = sheetsToExtract * volumePerSheet;
         }
@@ -183,7 +183,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem
         if (amountToSpawn == 0)
             return new List<EntityUid>();
 
-        return _stackSystem.SpawnMultiple(materialProto.StackEntity, amountToSpawn, coordinates);
+        return _stackSystem.SpawnMultipleAtPosition(materialProto.StackEntity.Value, amountToSpawn, coordinates);
     }
 
     /// <summary>
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 20dc114918..8dab21902d 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -5,12 +5,12 @@ using Content.Server.Medical.Components;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
-using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Medical.Cryogenics;
 using Content.Shared.MedicalScanner;
+using Content.Shared.Temperature.Components;
 using Content.Shared.UserInterface;
 using Robust.Shared.Containers;
 
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index 94d62641ce..1578f11629 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -7,20 +7,17 @@ using Content.Server.Ghost;
 using Content.Server.Popups;
 using Content.Server.PowerCell;
 using Content.Shared.Traits.Assorted;
+using Content.Shared.Chat;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Components;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Item.ItemToggle;
 using Content.Shared.Medical;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.PowerCell;
 using Content.Shared.Timing;
-using Content.Shared.Toggleable;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 11e4ed4fcf..657ac3e636 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Medical.Components;
 using Content.Server.PowerCell;
-using Content.Server.Temperature.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
@@ -13,6 +12,7 @@ using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
+using Content.Shared.Temperature.Components;
 using Content.Shared.Traits.Assorted;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs
index c266037a8f..4a16fa19a3 100644
--- a/Content.Server/Mobs/CritMobActionsSystem.cs
+++ b/Content.Server/Mobs/CritMobActionsSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Administration;
 using Content.Server.Chat.Systems;
 using Content.Server.Popups;
-using Content.Server.Speech.Muting;
+using Content.Shared.Chat;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
diff --git a/Content.Server/Movement/Components/StressTestMovementComponent.cs b/Content.Server/Movement/Components/StressTestMovementComponent.cs
deleted file mode 100644
index 051747a849..0000000000
--- a/Content.Server/Movement/Components/StressTestMovementComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Numerics;
-
-namespace Content.Server.Movement.Components;
-
-[RegisterComponent]
-public sealed partial class StressTestMovementComponent : Component
-{
-    public float Progress { get; set; }
-    public Vector2 Origin { get; set; }
-}
diff --git a/Content.Server/Movement/StressTestMovementSystem.cs b/Content.Server/Movement/StressTestMovementSystem.cs
deleted file mode 100644
index 51916204da..0000000000
--- a/Content.Server/Movement/StressTestMovementSystem.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Numerics;
-using Content.Server.Movement.Components;
-
-namespace Content.Server.Movement;
-
-public sealed class StressTestMovementSystem : EntitySystem
-{
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<StressTestMovementComponent, ComponentStartup>(OnStressStartup);
-    }
-
-    private void OnStressStartup(EntityUid uid, StressTestMovementComponent component, ComponentStartup args)
-    {
-        component.Origin = _transform.GetWorldPosition(uid);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<StressTestMovementComponent, TransformComponent>();
-
-        while (query.MoveNext(out var uid, out var stressTest, out var transform))
-        {
-            if (!transform.ParentUid.IsValid())
-                continue;
-
-            stressTest.Progress += frameTime;
-
-            if (stressTest.Progress > 1)
-            {
-                stressTest.Progress -= 1;
-            }
-
-            var x = MathF.Sin(stressTest.Progress * MathHelper.TwoPi);
-            var y = MathF.Cos(stressTest.Progress * MathHelper.TwoPi);
-
-            _transform.SetWorldPosition((uid, transform), stressTest.Origin + new Vector2(x, y) * 5);
-        }
-    }
-}
diff --git a/Content.Server/NPC/HTN/Preconditions/InFriendlyContainerPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/InFriendlyContainerPrecondition.cs
new file mode 100644
index 0000000000..ffee9adaf3
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/InFriendlyContainerPrecondition.cs
@@ -0,0 +1,50 @@
+using Content.Shared.NPC.Systems;
+using Robust.Shared.Containers;
+using Robust.Server.Containers;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.NPC.HTN.Preconditions;
+
+/// <summary>
+/// Checks if the owner is in a friendly container.
+/// Recursively checks if container's container is friendly.
+/// </summary>
+public sealed partial class InFriendlyContainerPrecondition : HTNPrecondition
+{
+    private ContainerSystem _container = default!;
+    private NpcFactionSystem _npcFaction = default!;
+
+    [DataField] public bool IsInFriendlyContainer = true;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _container = sysManager.GetEntitySystem<ContainerSystem>();
+        _npcFaction = sysManager.GetEntitySystem<NpcFactionSystem>();
+    }
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+
+        if (!_container.TryGetContainingContainer(owner, out var container))
+            return !IsInFriendlyContainer;
+
+        return IsInFriendlyContainer == IsContainerOrParentFriendly(owner, container.Owner);
+    }
+
+    /// <summary>
+    /// Recursively check if a container or any parent container is friendly.
+    /// </summary>
+    /// <returns>True if any container is friendly.</returns>
+    private bool IsContainerOrParentFriendly(EntityUid owner, EntityUid containerOwner)
+    {
+        if (_npcFaction.IsEntityFriendly(owner, containerOwner))
+            return true;
+
+        if (!_container.TryGetContainingContainer(containerOwner, out var nextContainer))
+            return false;
+
+        return IsContainerOrParentFriendly(owner, nextContainer.Owner);
+    }
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
new file mode 100644
index 0000000000..fe76968f34
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/IsEmaggedPrecondition.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Emag.Systems;
+
+namespace Content.Server.NPC.HTN.Preconditions;
+
+/// <summary>
+/// A precondition which is met if the NPC is emagged with <see cref="EmagType"/>, as computed by
+/// <see cref="EmagSystem.CheckFlag"/>. This is useful for changing NPC behavior in the case that the NPC is emagged,
+/// eg. like a helper NPC bot turning evil.
+/// </summary>
+public sealed partial class IsEmaggedPrecondition : HTNPrecondition
+{
+    private EmagSystem _emag;
+
+    /// <summary>
+    /// The type of emagging to check for.
+    /// </summary>
+    [DataField]
+    public EmagType EmagType = EmagType.Interaction;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _emag = sysManager.GetEntitySystem<EmagSystem>();
+    }
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+        return _emag.CheckFlag(owner, EmagType);
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
new file mode 100644
index 0000000000..a1440acb2e
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs
@@ -0,0 +1,70 @@
+using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions;
+using Content.Shared.CombatMode;
+using Content.Shared.Weapons.Melee;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Melee;
+
+/// <summary>
+/// Something between <see cref="MeleeOperator"/> and <see cref="InteractWithOperator"/>, this operator causes the NPC
+/// to attempt a SINGLE <see cref="SharedMeleeWeaponSystem.AttemptLightAttack">melee attack</see> on the specified
+/// <see cref="TargetKey">target</see>.
+/// </summary>
+public sealed partial class MeleeAttackOperator : HTNOperator
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    private SharedMeleeWeaponSystem _melee;
+
+    /// <summary>
+    /// Key that contains the target entity.
+    /// </summary>
+    [DataField(required: true)]
+    public string TargetKey = default!;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _melee = sysManager.GetEntitySystem<SharedMeleeWeaponSystem>();
+    }
+
+    public override void TaskShutdown(NPCBlackboard blackboard, HTNOperatorStatus status)
+    {
+        base.TaskShutdown(blackboard, status);
+
+        ExitCombatMode(blackboard);
+    }
+
+    public override void PlanShutdown(NPCBlackboard blackboard)
+    {
+        base.PlanShutdown(blackboard);
+
+        ExitCombatMode(blackboard);
+    }
+
+    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+
+        if (!_entManager.TryGetComponent<CombatModeComponent>(owner, out var combatMode) ||
+            !_melee.TryGetWeapon(owner, out var weaponUid, out var weapon))
+        {
+            return HTNOperatorStatus.Failed;
+        }
+
+        _entManager.System<SharedCombatModeSystem>().SetInCombatMode(owner, true, combatMode);
+
+
+        if (!blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entManager) ||
+            !_melee.AttemptLightAttack(owner, weaponUid, weapon, target))
+        {
+            return HTNOperatorStatus.Continuing;
+        }
+
+        return HTNOperatorStatus.Finished;
+    }
+
+    private void ExitCombatMode(NPCBlackboard blackboard)
+    {
+        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+        _entManager.System<SharedCombatModeSystem>().SetInCombatMode(owner, false);
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
index 558b1fc04d..99227492af 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
@@ -1,4 +1,5 @@
 using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
 
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
index 8a4c655a39..f3b977518b 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
@@ -1,13 +1,22 @@
 using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
+using Content.Shared.Dataset;
+using Content.Shared.Random.Helpers;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using static Content.Server.NPC.HTN.PrimitiveTasks.Operators.SpeakOperator.SpeakOperatorSpeech;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
 
 public sealed partial class SpeakOperator : HTNOperator
 {
     private ChatSystem _chat = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
 
     [DataField(required: true)]
-    public string Speech = string.Empty;
+    public SpeakOperatorSpeech Speech;
 
     /// <summary>
     /// Whether to hide message from chat window and logs.
@@ -18,15 +27,51 @@ public sealed partial class SpeakOperator : HTNOperator
     public override void Initialize(IEntitySystemManager sysManager)
     {
         base.Initialize(sysManager);
-
         _chat = sysManager.GetEntitySystem<ChatSystem>();
     }
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
     {
+        LocId speechLocId;
+        switch (Speech)
+        {
+            case LocalizedSetSpeakOperatorSpeech localizedDataSet:
+                if (!_proto.TryIndex(localizedDataSet.LineSet, out var speechSet))
+                    return HTNOperatorStatus.Failed;
+                speechLocId = _random.Pick(speechSet);
+                break;
+            case SingleSpeakOperatorSpeech single:
+                speechLocId = single.Line;
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(Speech));
+        }
+
         var speaker = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-        _chat.TrySendInGameICMessage(speaker, Loc.GetString(Speech), InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
+        _chat.TrySendInGameICMessage(
+            speaker,
+            Loc.GetString(speechLocId),
+            InGameICChatType.Speak,
+            hideChat: Hidden,
+            hideLog: Hidden
+        );
 
         return base.Update(blackboard, frameTime);
     }
+
+    [ImplicitDataDefinitionForInheritors, MeansImplicitUse]
+    public abstract partial class SpeakOperatorSpeech
+    {
+        public sealed partial class SingleSpeakOperatorSpeech : SpeakOperatorSpeech
+        {
+            [DataField(required: true)]
+            public string Line;
+        }
+
+        public sealed partial class LocalizedSetSpeakOperatorSpeech : SpeakOperatorSpeech
+        {
+            [DataField(required: true)]
+            public ProtoId<LocalizedDatasetPrototype> LineSet;
+        }
+    }
 }
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
index bac9cfcf40..20e3daec53 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
@@ -1,10 +1,7 @@
 using Content.Server.Chat.Systems;
-using Content.Shared.NPC.Components;
+using Content.Shared.Chat;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Damage;
-using Content.Shared.Emag.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
 using Content.Shared.Silicons.Bots;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
new file mode 100644
index 0000000000..4bbdbb3473
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs
@@ -0,0 +1,47 @@
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
+
+/// <summary>
+/// Raises an <see cref="HTNRaisedEvent"/> on the <see cref="NPCBlackboard.Owner">owner</see>. The event will contain
+/// the specified <see cref="Args"/>, and if not null, the value of <see cref="TargetKey"/>.
+/// </summary>
+public sealed partial class RaiseEventForOwnerOperator : HTNOperator
+{
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
+    /// <summary>
+    /// The conceptual "target" of this event. Note that this is NOT the entity for which the event is raised. If null,
+    /// <see cref="HTNRaisedEvent.Target"/> will be null.
+    /// </summary>
+    [DataField]
+    public string? TargetKey;
+
+    /// <summary>
+    /// The data contained in the raised event. Since <see cref="HTNRaisedEvent"/> is itself pretty meaningless, this is
+    /// included to give some context of what the event is actually supposed to mean.
+    /// </summary>
+    [DataField(required: true)]
+    public EntityEventArgs Args;
+
+    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+    {
+        _entMan.EventBus.RaiseLocalEvent(
+            blackboard.GetValue<EntityUid>(NPCBlackboard.Owner),
+            new HTNRaisedEvent(
+                blackboard.GetValue<EntityUid>(NPCBlackboard.Owner),
+                TargetKey is { } targetKey ? blackboard.GetValue<EntityUid>(targetKey) : null,
+                Args
+            )
+        );
+
+        return HTNOperatorStatus.Finished;
+    }
+}
+
+public sealed partial class HTNRaisedEvent(EntityUid owner, EntityUid? target, EntityEventArgs args) : EntityEventArgs
+{
+    // Owner and target are both included here in case we want to add a "RaiseEventForTargetOperator" in the future
+    // while reusing this event.
+    public EntityUid Owner = owner;
+    public EntityUid? Target = target;
+    public EntityEventArgs Args = args;
+}
diff --git a/Content.Server/NPC/Queries/Queries/ComponentFilter.cs b/Content.Server/NPC/Queries/Queries/ComponentFilter.cs
index 0df4bd902f..5ba63bf6f7 100644
--- a/Content.Server/NPC/Queries/Queries/ComponentFilter.cs
+++ b/Content.Server/NPC/Queries/Queries/ComponentFilter.cs
@@ -9,4 +9,11 @@ public sealed partial class ComponentFilter : UtilityQueryFilter
     /// </summary>
     [DataField("components", required: true)]
     public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// If true, this filter retains entities with ALL of the specified components. If false, this filter removes
+    /// entities with ANY of the specified components.
+    /// </summary>
+    [DataField]
+    public bool RetainWithComp = true;
 }
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 813626a1c4..bc82e72692 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -5,7 +5,6 @@ using Content.Server.NPC.Queries.Considerations;
 using Content.Server.NPC.Queries.Curves;
 using Content.Server.NPC.Queries.Queries;
 using Content.Server.Nutrition.Components;
-using Content.Server.Temperature.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.Examine;
@@ -30,6 +29,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using Content.Shared.Atmos.Components;
 using System.Linq;
+using Content.Shared.Temperature.Components;
 
 namespace Content.Server.NPC.Systems;
 
@@ -185,7 +185,7 @@ public sealed class NPCUtilitySystem : EntitySystem
                     return 0f;
 
                 var nutrition = _ingestion.TotalNutrition(targetUid, owner);
-                if (nutrition <= 1.0f)
+                if (nutrition == 0.0f)
                     return 0f;
 
                 return 1f;
@@ -512,11 +512,12 @@ public sealed class NPCUtilitySystem : EntitySystem
                 {
                     foreach (var comp in compFilter.Components)
                     {
-                        if (HasComp(ent, comp.Value.Component.GetType()))
-                            continue;
-
-                        _entityList.Add(ent);
-                        break;
+                        var hasComp = HasComp(ent, comp.Value.Component.GetType());
+                        if (!compFilter.RetainWithComp == hasComp)
+                        {
+                            _entityList.Add(ent);
+                            break;
+                        }
                     }
                 }
 
diff --git a/Content.Server/Nutrition/Components/BadFoodComponent.cs b/Content.Server/Nutrition/Components/BadFoodComponent.cs
index 16f90533cb..40a805e437 100644
--- a/Content.Server/Nutrition/Components/BadFoodComponent.cs
+++ b/Content.Server/Nutrition/Components/BadFoodComponent.cs
@@ -6,7 +6,5 @@ namespace Content.Server.Nutrition.Components;
 /// This component prevents NPC mobs like mice from wanting to eat something that is edible but is not exactly food.
 /// Including but not limited to: uranium, death pills, insulation
 /// </summary>
-[RegisterComponent, Access(typeof(FoodSystem))]
-public sealed partial class BadFoodComponent : Component
-{
-}
+[RegisterComponent]
+public sealed partial class BadFoodComponent : Component;
diff --git a/Content.Server/Nutrition/Components/IgnoreBadFoodComponent.cs b/Content.Server/Nutrition/Components/IgnoreBadFoodComponent.cs
index f5b3c326f3..c0f2fefce4 100644
--- a/Content.Server/Nutrition/Components/IgnoreBadFoodComponent.cs
+++ b/Content.Server/Nutrition/Components/IgnoreBadFoodComponent.cs
@@ -6,7 +6,5 @@ namespace Content.Server.Nutrition.Components;
 /// This component allows NPC mobs to eat food with BadFoodComponent.
 /// See MobMouseAdmeme for usage.
 /// </summary>
-[RegisterComponent, Access(typeof(FoodSystem))]
-public sealed partial class IgnoreBadFoodComponent : Component
-{
-}
+[RegisterComponent]
+public sealed partial class IgnoreBadFoodComponent : Component;
diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
index 7164c701f5..33b619732d 100644
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -33,8 +33,6 @@ namespace Content.Server.Nutrition.EntitySystems
         {
             base.Initialize();
 
-            // activate BEFORE entity is deleted and trash is spawned
-            SubscribeLocalEvent<CreamPieComponent, ConsumeDoAfterEvent>(OnConsume, before: [typeof(FoodSystem)]);
             SubscribeLocalEvent<CreamPieComponent, SliceFoodEvent>(OnSlice);
 
             SubscribeLocalEvent<CreamPiedComponent, RejuvenateEvent>(OnRejuvenate);
@@ -59,10 +57,10 @@ namespace Content.Server.Nutrition.EntitySystems
             QueueDel(entity);
         }
 
-        private void OnConsume(Entity<CreamPieComponent> entity, ref ConsumeDoAfterEvent args)
-        {
-            ActivatePayload(entity);
-        }
+        // TODO
+        // A regression occured here. Previously creampies would activate their hidden payload if you tried to eat them.
+        // However, the refactor to IngestionSystem caused the event to not be reached,
+        // because eating is blocked if an item is inside the food.
 
         private void OnSlice(Entity<CreamPieComponent> entity, ref SliceFoodEvent args)
         {
diff --git a/Content.Server/Nutrition/Events/DrinkEvents.cs b/Content.Server/Nutrition/Events/DrinkEvents.cs
deleted file mode 100644
index b7a7403105..0000000000
--- a/Content.Server/Nutrition/Events/DrinkEvents.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Chemistry.Components;
-
-namespace Content.Server.Nutrition.Events;
-
-/// <summary>
-/// Raised on the entity drinking. This is right before they actually transfer the solution into the stomach.
-/// </summary>
-/// <param name="Drink">The drink that is being drank.</param>
-/// <param name="Solution">The solution that will be digested.</param>
-/// <param name="Forced">Whether the target was forced to drink the solution by somebody else.</param>
-[ByRefEvent]
-public record struct BeforeIngestDrinkEvent(EntityUid Drink, Solution Solution, bool Forced);
diff --git a/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs b/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
index 9983b35969..d6309ccdd3 100644
--- a/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
+++ b/Content.Server/Objectives/Components/SpiderChargeConditionComponent.cs
@@ -1,5 +1,6 @@
 using Content.Server.Ninja.Systems;
 using Content.Server.Objectives.Systems;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Objectives.Components;
 
@@ -14,4 +15,11 @@ public sealed partial class SpiderChargeConditionComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? Target;
+
+    /// <summary>
+    /// Tags that should be used to exclude Warp Points
+    /// from the list of valid bombing targets
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
 }
diff --git a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
index db78816503..4c19a64ab1 100644
--- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
+++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Objectives.Components;
 using Content.Shared.Objectives.Components;
-using Content.Shared.Ninja.Components;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
 using Content.Shared.Warps;
+using Content.Shared.Whitelist;
 using Robust.Shared.Random;
 
 namespace Content.Server.Objectives.Systems;
@@ -14,6 +14,7 @@ namespace Content.Server.Objectives.Systems;
 /// </summary>
 public sealed class NinjaConditionsSystem : EntitySystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly NumberObjectiveSystem _number = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -53,10 +54,13 @@ public sealed class NinjaConditionsSystem : EntitySystem
 
         // choose spider charge detonation point
         var warps = new List<EntityUid>();
-        var query = EntityQueryEnumerator<BombingTargetComponent, WarpPointComponent>();
-        while (query.MoveNext(out var warpUid, out _, out var warp))
+        var allEnts = EntityQueryEnumerator<WarpPointComponent>();
+        var bombingBlacklist = comp.Blacklist;
+
+        while (allEnts.MoveNext(out var warpUid, out var warp))
         {
-            if (warp.Location != null)
+            if (_whitelist.IsBlacklistFail(bombingBlacklist, warpUid)
+                && !string.IsNullOrWhiteSpace(warp.Location))
             {
                 warps.Add(warpUid);
             }
diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs
index 289b74b258..7fd58f1572 100644
--- a/Content.Server/PAI/PAISystem.cs
+++ b/Content.Server/PAI/PAISystem.cs
@@ -2,27 +2,22 @@ using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Instruments;
 using Content.Server.Kitchen.Components;
-using Content.Server.Store.Systems;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind.Components;
 using Content.Shared.PAI;
 using Content.Shared.Popups;
-using Content.Shared.Store;
-using Content.Shared.Store.Components;
 using Content.Shared.Instruments;
 using Robust.Shared.Random;
-using Robust.Shared.Prototypes;
 using System.Text;
 
 namespace Content.Server.PAI;
 
-public sealed class PAISystem : SharedPAISystem
+public sealed class PAISystem : EntitySystem
 {
     [Dependency] private readonly InstrumentSystem _instrumentSystem = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly StoreSystem _store = default!;
     [Dependency] private readonly ToggleableGhostRoleSystem _toggleableGhostRole = default!;
 
     /// <summary>
@@ -38,8 +33,6 @@ public sealed class PAISystem : SharedPAISystem
         SubscribeLocalEvent<PAIComponent, MindAddedMessage>(OnMindAdded);
         SubscribeLocalEvent<PAIComponent, MindRemovedMessage>(OnMindRemoved);
         SubscribeLocalEvent<PAIComponent, BeingMicrowavedEvent>(OnMicrowaved);
-
-        SubscribeLocalEvent<PAIComponent, PAIShopActionEvent>(OnShop);
     }
 
     private void OnUseInHand(EntityUid uid, PAIComponent component, UseInHandEvent args)
@@ -106,15 +99,6 @@ public sealed class PAISystem : SharedPAISystem
         var val = Loc.GetString("pai-system-pai-name-raw", ("name", name.ToString()));
         _metaData.SetEntityName(uid, val);
     }
-
-    private void OnShop(Entity<PAIComponent> ent, ref PAIShopActionEvent args)
-    {
-        if (!TryComp<StoreComponent>(ent, out var store))
-            return;
-
-        _store.ToggleUi(args.Performer, ent, store);
-    }
-
     public void PAITurningOff(EntityUid uid)
     {
         //  Close the instrument interface if it was open
diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index 28b14f6925..c49a2f0f6b 100644
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -171,7 +171,7 @@ namespace Content.Server.Power.EntitySystems
             if (!Resolve(uid, ref battery))
                 return 0;
 
-            var newValue = Math.Clamp(0, battery.CurrentCharge + value, battery.MaxCharge);
+            var newValue = Math.Clamp(battery.CurrentCharge + value, 0, battery.MaxCharge);
             var delta = newValue - battery.CurrentCharge;
             battery.CurrentCharge = newValue;
 
diff --git a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
index 79ea6b5285..d6fe1a8f85 100644
--- a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
+++ b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
@@ -49,7 +49,7 @@ public sealed partial class CableSystem
                 return;
         }
 
-        if (TryComp<StackComponent>(placer, out var stack) && !_stack.Use(placer, 1, stack))
+        if (TryComp<StackComponent>(placer, out var stack) && !_stack.TryUse((placer.Owner, stack), 1))
             return;
 
         var newCable = Spawn(component.CablePrototypeId, _map.GridTileToLocal(gridUid, grid, snapPos));
diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index 2bf9046cc3..d1071d3e38 100644
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Chat.Systems;
+using Content.Server.Chat.Systems;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -66,7 +66,7 @@ namespace Content.Server.PowerSink
                 if (!transform.Anchored)
                     continue;
 
-                _battery.SetCharge(entity, battery.CurrentCharge + networkLoad.NetworkLoad.ReceivingPower / 1000, battery);
+                _battery.ChangeCharge(entity, networkLoad.NetworkLoad.ReceivingPower * frameTime, battery);
 
                 var currentBatteryThreshold = battery.CurrentCharge / battery.MaxCharge;
 
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.cs b/Content.Server/Radiation/Systems/RadiationSystem.cs
index 34dbec6f86..4a4d0f8930 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.cs
@@ -49,9 +49,9 @@ public sealed partial class RadiationSystem : EntitySystem
         _accumulator = 0f;
     }
 
-    public void IrradiateEntity(EntityUid uid, float radsPerSecond, float time)
+    public void IrradiateEntity(EntityUid uid, float radsPerSecond, float time, EntityUid? origin = null)
     {
-        var msg = new OnIrradiatedEvent(time, radsPerSecond, uid);
+        var msg = new OnIrradiatedEvent(time, radsPerSecond, origin);
         RaiseLocalEvent(uid, msg);
     }
 
diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
index 4d29e2f413..7d16687d5f 100644
--- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
+++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index b0f38c92fa..68067ae6f5 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -3,16 +3,16 @@ using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
-using Content.Shared.Radio.Components;
+using Content.Shared.Chat;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Power;
 using Content.Shared.Radio;
+using Content.Shared.Radio.Components;
+using Content.Shared.Radio.EntitySystems;
 using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
-using Content.Shared.Chat;
 using Robust.Shared.Prototypes;
-using Content.Shared.Radio.EntitySystems;
 
 namespace Content.Server.Radio.EntitySystems;
 
diff --git a/Content.Server/RatKing/RatKingSystem.cs b/Content.Server/RatKing/RatKingSystem.cs
index eb3bef6c02..a7d6ecfd47 100644
--- a/Content.Server/RatKing/RatKingSystem.cs
+++ b/Content.Server/RatKing/RatKingSystem.cs
@@ -6,6 +6,7 @@ using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
 using Content.Server.Popups;
 using Content.Shared.Atmos;
+using Content.Shared.Chat;
 using Content.Shared.Dataset;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
@@ -13,7 +14,6 @@ using Content.Shared.Pointing;
 using Content.Shared.Random.Helpers;
 using Content.Shared.RatKing;
 using Robust.Shared.Map;
-using Robust.Shared.Random;
 
 namespace Content.Server.RatKing
 {
diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index c3425f347a..6d2219bae1 100644
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -1,108 +1,5 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Doors.Systems;
-using Content.Server.Power.EntitySystems;
-using Content.Shared.Access.Components;
-using Content.Shared.Database;
-using Content.Shared.Doors.Components;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Remotes.Components;
 using Content.Shared.Remotes.EntitySystems;
 
-namespace Content.Shared.Remotes
-{
-    public sealed class DoorRemoteSystem : SharedDoorRemoteSystem
-    {
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly AirlockSystem _airlock = default!;
-        [Dependency] private readonly DoorSystem _doorSystem = default!;
-        [Dependency] private readonly ExamineSystemShared _examine = default!;
+namespace Content.Server.Remotes;
 
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<DoorRemoteComponent, BeforeRangedInteractEvent>(OnBeforeInteract);
-        }
-
-        private void OnBeforeInteract(Entity<DoorRemoteComponent> entity, ref BeforeRangedInteractEvent args)
-        {
-            bool isAirlock = TryComp<AirlockComponent>(args.Target, out var airlockComp);
-
-            if (args.Handled
-                || args.Target == null
-                || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
-                // Only able to control doors if they are within your vision and within your max range.
-                // Not affected by mobs or machines anymore.
-                || !_examine.InRangeUnOccluded(args.User,
-                    args.Target.Value,
-                    SharedInteractionSystem.MaxRaycastRange,
-                    null))
-
-            {
-                return;
-            }
-
-            args.Handled = true;
-
-            if (!this.IsPowered(args.Target.Value, EntityManager))
-            {
-                Popup.PopupEntity(Loc.GetString("door-remote-no-power"), args.User, args.User);
-                return;
-            }
-
-            var accessTarget = args.Used;
-            // This covers the accesses the REMOTE has, and is not effected by the user's ID card.
-            if (entity.Comp.IncludeUserAccess) // Allows some door remotes to inherit the user's access.
-            {
-                accessTarget = args.User;
-                // This covers the accesses the USER has, which always includes the remote's access since holding a remote acts like holding an ID card.
-            }
-
-            if (TryComp<AccessReaderComponent>(args.Target, out var accessComponent)
-                && !_doorSystem.HasAccess(args.Target.Value, accessTarget, doorComp, accessComponent))
-            {
-                if (isAirlock)
-                    _doorSystem.Deny(args.Target.Value, doorComp, accessTarget);
-                Popup.PopupEntity(Loc.GetString("door-remote-denied"), args.User, args.User);
-                return;
-            }
-
-            switch (entity.Comp.Mode)
-            {
-                case OperatingMode.OpenClose:
-                    if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, accessTarget))
-                        _adminLogger.Add(LogType.Action,
-                            LogImpact.Medium,
-                            $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
-                    break;
-                case OperatingMode.ToggleBolts:
-                    if (TryComp<DoorBoltComponent>(args.Target, out var boltsComp))
-                    {
-                        if (!boltsComp.BoltWireCut)
-                        {
-                            _doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, accessTarget);
-                            _adminLogger.Add(LogType.Action,
-                                LogImpact.Medium,
-                                $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
-                        }
-                    }
-
-                    break;
-                case OperatingMode.ToggleEmergencyAccess:
-                    if (airlockComp != null)
-                    {
-                        _airlock.SetEmergencyAccess((args.Target.Value, airlockComp), !airlockComp.EmergencyAccess);
-                        _adminLogger.Add(LogType.Action,
-                            LogImpact.Medium,
-                            $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to set emergency access {(airlockComp.EmergencyAccess ? "on" : "off")}");
-                    }
-
-                    break;
-                default:
-                    throw new InvalidOperationException(
-                        $"{nameof(DoorRemoteComponent)} had invalid mode {entity.Comp.Mode}");
-            }
-        }
-    }
-}
+public sealed class DoorRemoteSystem : SharedDoorRemoteSystem;
diff --git a/Content.Server/Research/Systems/ResearchSystem.Client.cs b/Content.Server/Research/Systems/ResearchSystem.Client.cs
index 3f75982425..509d1d20de 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Client.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Client.cs
@@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Research.Components;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Research.Systems;
 
@@ -62,10 +63,8 @@ public sealed partial class ResearchSystem
 
     private void OnClientMapInit(EntityUid uid, ResearchClientComponent component, MapInitEvent args)
     {
-        var allServers = GetServers(uid).ToList();
-
-        if (allServers.Count > 0)
-            RegisterClient(uid, allServers[0], component, allServers[0]);
+        if (GetServers(uid).FirstOrNull() is { } server)
+            RegisterClient(uid, server, component, server);
     }
 
     private void OnClientShutdown(EntityUid uid, ResearchClientComponent component, ComponentShutdown args)
@@ -85,10 +84,8 @@ public sealed partial class ResearchSystem
             if (ent.Comp.Server is not null)
                 return;
 
-            var allServers = GetServers(ent).ToList();
-
-            if (allServers.Count > 0)
-                RegisterClient(ent, allServers[0], ent, allServers[0]);
+            if (GetServers(ent).FirstOrNull() is { } server)
+                RegisterClient(ent, server, ent, server);
         }
         else
         {
diff --git a/Content.Server/Research/Systems/ResearchSystem.cs b/Content.Server/Research/Systems/ResearchSystem.cs
index 5cad4d51ba..c6a2a0125d 100644
--- a/Content.Server/Research/Systems/ResearchSystem.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.cs
@@ -23,8 +23,6 @@ namespace Content.Server.Research.Systems
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly RadioSystem _radio = default!;
 
-        private static readonly HashSet<Entity<ResearchServerComponent>> ClientLookup = new();
-
         public override void Initialize()
         {
             base.Initialize();
@@ -49,7 +47,7 @@ namespace Content.Server.Research.Systems
             serverUid = null;
             serverComponent = null;
 
-            var query = GetServers(client).ToList();
+            var query = GetServers(client);
             foreach (var (uid, server) in query)
             {
                 if (server.Id != id)
@@ -67,15 +65,7 @@ namespace Content.Server.Research.Systems
         /// <returns></returns>
         public string[] GetServerNames(EntityUid client)
         {
-            var allServers = GetServers(client).ToArray();
-            var list = new string[allServers.Length];
-
-            for (var i = 0; i < allServers.Length; i++)
-            {
-                list[i] = allServers[i].Comp.ServerName;
-            }
-
-            return list;
+            return GetServers(client).Select(x => x.Comp.ServerName).ToArray();
         }
 
         /// <summary>
@@ -84,27 +74,18 @@ namespace Content.Server.Research.Systems
         /// <returns></returns>
         public int[] GetServerIds(EntityUid client)
         {
-            var allServers = GetServers(client).ToArray();
-            var list = new int[allServers.Length];
-
-            for (var i = 0; i < allServers.Length; i++)
-            {
-                list[i] = allServers[i].Comp.Id;
-            }
-
-            return list;
+            return GetServers(client).Select(x => x.Comp.Id).ToArray();
         }
 
         public HashSet<Entity<ResearchServerComponent>> GetServers(EntityUid client)
         {
-            ClientLookup.Clear();
-
             var clientXform = Transform(client);
             if (clientXform.GridUid is not { } grid)
-                return ClientLookup;
+                return [];
 
-            _lookup.GetGridEntities(grid, ClientLookup);
-            return ClientLookup;
+            var set = new HashSet<Entity<ResearchServerComponent>>();
+            _lookup.GetGridEntities(grid, set);
+            return set;
         }
 
         public override void Update(float frameTime)
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index b89f10934d..6c8972be58 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -1,7 +1,6 @@
 using System.Numerics;
 using Content.Server.Actions;
 using Content.Server.GameTicking;
-using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Damage;
@@ -21,7 +20,6 @@ using Content.Shared.Store.Components;
 using Content.Shared.Stunnable;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
 namespace Content.Server.Revenant.EntitySystems;
@@ -46,17 +44,12 @@ public sealed partial class RevenantSystem : EntitySystem
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly VisibilitySystem _visibility = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
-
-    private static readonly EntProtoId RevenantShopId = "ActionRevenantShop";
-
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<RevenantComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<RevenantComponent, MapInitEvent>(OnMapInit);
 
-        SubscribeLocalEvent<RevenantComponent, RevenantShopActionEvent>(OnShop);
         SubscribeLocalEvent<RevenantComponent, DamageChangedEvent>(OnDamage);
         SubscribeLocalEvent<RevenantComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<RevenantComponent, StatusEffectAddedEvent>(OnStatusAdded);
@@ -94,11 +87,6 @@ public sealed partial class RevenantSystem : EntitySystem
         _eye.RefreshVisibilityMask(uid);
     }
 
-    private void OnMapInit(EntityUid uid, RevenantComponent component, MapInitEvent args)
-    {
-        _action.AddAction(uid, ref component.Action, RevenantShopId);
-    }
-
     private void OnStatusAdded(EntityUid uid, RevenantComponent component, StatusEffectAddedEvent args)
     {
         if (args.Key == "Stun")
@@ -182,13 +170,6 @@ public sealed partial class RevenantSystem : EntitySystem
         return true;
     }
 
-    private void OnShop(EntityUid uid, RevenantComponent component, RevenantShopActionEvent args)
-    {
-        if (!TryComp<StoreComponent>(uid, out var store))
-            return;
-        _store.ToggleUi(uid, uid, store);
-    }
-
     public void MakeVisible(bool visible)
     {
         var query = EntityQueryEnumerator<RevenantComponent, VisibilityComponent>();
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index a63359077f..4ca0b53035 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -801,11 +801,7 @@ public sealed partial class ShuttleSystem
         while (iteration < FTLProximityIterations)
         {
             grids.Clear();
-            // We pass in an expanded offset here so we can safely do a random offset later.
-            // We don't include this in the actual targetAABB because then we would be double-expanding it.
-            // Once in this loop, then again when placing the shuttle later.
-            // Note that targetAABB already has expansionAmount factored in already.
-            _mapManager.FindGridsIntersecting(mapId, targetAABB.Enlarged(maxOffset), ref grids);
+            _mapManager.FindGridsIntersecting(mapId, targetAABB, ref grids);
 
             foreach (var grid in grids)
             {
@@ -838,6 +834,10 @@ public sealed partial class ShuttleSystem
                 if (nearbyGrids.Contains(uid))
                     continue;
 
+                // We pass in an expanded offset here so we can safely do a random offset later.
+                // We don't include this in the actual targetAABB because then we would be double-expanding it.
+                // Once in this loop, then again when placing the shuttle later.
+                // Note that targetAABB already has expansionAmount factored in already.
                 targetAABB = targetAABB.Union(
                     _transform.GetWorldMatrix(uid)
                     .TransformBox(Comp<MapGridComponent>(uid).LocalAABB.Enlarged(expansionAmount)));
@@ -857,7 +857,7 @@ public sealed partial class ShuttleSystem
 
         // TODO: This should prefer the position's angle instead.
         // TODO: This is pretty crude for multiple landings.
-        if (nearbyGrids.Count > 1 || !HasComp<MapComponent>(targetXform.GridUid))
+        if (nearbyGrids.Count >= 1)
         {
             // Pick a random angle
             var offsetAngle = _random.NextAngle();
@@ -866,13 +866,9 @@ public sealed partial class ShuttleSystem
             var minRadius = MathF.Max(targetAABB.Width / 2f, targetAABB.Height / 2f);
             spawnPos = targetAABB.Center + offsetAngle.RotateVec(new Vector2(_random.NextFloat(minRadius + minOffset, minRadius + maxOffset), 0f));
         }
-        else if (shuttleBody != null)
-        {
-            (spawnPos, angle) = _transform.GetWorldPositionRotation(targetXform);
-        }
         else
         {
-            spawnPos = _transform.GetWorldPosition(targetXform);
+            spawnPos = _transform.ToWorldPosition(targetCoordinates);
         }
 
         var offset = Vector2.Zero;
@@ -893,10 +889,10 @@ public sealed partial class ShuttleSystem
         }
 
         // Rotate our localcenter around so we spawn exactly where we "think" we should (center of grid on the dot).
-        var transform = new Transform(spawnPos, angle);
-        spawnPos = Robust.Shared.Physics.Transform.Mul(transform, offset);
+        var transform = new Transform(_transform.ToWorldPosition(xform.Coordinates), angle);
+        var adjustedOffset = Robust.Shared.Physics.Transform.Mul(transform, offset);
 
-        coordinates = new EntityCoordinates(targetXform.MapUid.Value, spawnPos - offset);
+        coordinates = new EntityCoordinates(targetXform.MapUid.Value, spawnPos + adjustedOffset);
         return true;
     }
 
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index cea7fbfc09..e96ceffd16 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -104,7 +104,12 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
             return;
 
         EnsureComp<ShuttleComponent>(ev.EntityUid);
-        EnsureComp<ImplicitRoofComponent>(ev.EntityUid);
+
+        // This and RoofComponent should be mutually exclusive, so ImplicitRoof should be removed if the grid has RoofComponent
+        if (HasComp<RoofComponent>(ev.EntityUid))
+            RemComp<ImplicitRoofComponent>(ev.EntityUid);
+        else
+            EnsureComp<ImplicitRoofComponent>(ev.EntityUid);
     }
 
     private void OnShuttleStartup(EntityUid uid, ShuttleComponent component, ComponentStartup args)
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 88d484b846..6ae61acc57 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -349,7 +349,6 @@ public sealed partial class BorgSystem : SharedBorgSystem
 
     /// <summary>
     /// Checks that a player has fulfilled the requirements for the borg job.
-    /// If they don't have enough hours, they cannot be placed into a chassis.
     /// </summary>
     public bool CanPlayerBeBorged(ICommonSession session)
     {
diff --git a/Content.Server/Silicons/Bots/HugBotSystem.cs b/Content.Server/Silicons/Bots/HugBotSystem.cs
new file mode 100644
index 0000000000..4be948f434
--- /dev/null
+++ b/Content.Server/Silicons/Bots/HugBotSystem.cs
@@ -0,0 +1,65 @@
+using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
+using Content.Shared.Silicons.Bots;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Silicons.Bots;
+
+/// <summary>
+/// Beyond what <see cref="SharedHugBotSystem"/> does, this system manages the "lifecycle" of
+/// <see cref="RecentlyHuggedByHugBotComponent"/>.
+/// </summary>
+public sealed class HugBotSystem : SharedHugBotSystem
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HugBotComponent, HTNRaisedEvent>(OnHtnRaisedEvent);
+    }
+
+    private void OnHtnRaisedEvent(Entity<HugBotComponent> entity, ref HTNRaisedEvent args)
+    {
+        if (args.Args is not HugBotDidHugEvent ||
+            args.Target is not {} target)
+            return;
+
+        var ev = new HugBotHugEvent(GetNetEntity(entity));
+        RaiseLocalEvent(target, ev);
+
+        ApplyHugBotCooldown(entity, target);
+    }
+
+    /// <summary>
+    /// Applies <see cref="RecentlyHuggedByHugBotComponent"/> to <paramref name="target"/> based on the configuration of
+    /// <paramref name="hugBot"/>.
+    /// </summary>
+    public void ApplyHugBotCooldown(Entity<HugBotComponent> hugBot, EntityUid target)
+    {
+        var hugged = EnsureComp<RecentlyHuggedByHugBotComponent>(target);
+        hugged.CooldownCompleteAfter = _gameTiming.CurTime + hugBot.Comp.HugCooldown;
+    }
+
+    public override void Update(float frameTime)
+    {
+        // Iterate through all RecentlyHuggedByHugBot entities...
+        var huggedEntities = AllEntityQuery<RecentlyHuggedByHugBotComponent>();
+        while (huggedEntities.MoveNext(out var huggedEnt, out var huggedComp))
+        {
+            // ... and if their cooldown is complete...
+            if (huggedComp.CooldownCompleteAfter <= _gameTiming.CurTime)
+            {
+                // ... remove it, allowing them to receive the blessing of hugs once more.
+                RemCompDeferred<RecentlyHuggedByHugBotComponent>(huggedEnt);
+            }
+        }
+    }
+}
+
+/// <summary>
+/// This event is indirectly raised (by being <see cref="HTNRaisedEvent.Args"/>) on a HugBot when it hugs (or emaggedly
+/// punches) an entity.
+/// </summary>
+[Serializable, DataDefinition]
+public sealed partial class HugBotDidHugEvent : EntityEventArgs;
diff --git a/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs b/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
new file mode 100644
index 0000000000..c6c7d47e8d
--- /dev/null
+++ b/Content.Server/Silicons/Bots/RecentlyHuggedByHugBotComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Silicons.Bots;
+
+namespace Content.Server.Silicons.Bots;
+
+/// <summary>
+/// This marker component indicates that its entity has been recently hugged by a HugBot and should not be hugged again
+/// before <see cref="CooldownCompleteAfter">a cooldown period</see> in order to prevent hug spam.
+/// </summary>
+/// <see cref="SharedHugBotSystem"/>
+[RegisterComponent, AutoGenerateComponentPause]
+public sealed partial class RecentlyHuggedByHugBotComponent : Component
+{
+    [DataField, AutoPausedField]
+    public TimeSpan CooldownCompleteAfter = TimeSpan.MinValue;
+}
diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
index 6f2137b0d0..bf639746ba 100644
--- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
@@ -73,9 +73,6 @@ public sealed class GravityWellSystem : SharedGravityWellSystem
     /// <param name="frameTime">The time elapsed since the last set of updates.</param>
     public override void Update(float frameTime)
     {
-        if(!_timing.IsFirstTimePredicted)
-            return;
-
         var query = EntityQueryEnumerator<GravityWellComponent, TransformComponent>();
         while (query.MoveNext(out var uid, out var gravWell, out var xform))
         {
diff --git a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
index 4b31d5f814..099b2d89b0 100644
--- a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
@@ -36,9 +36,6 @@ public sealed class SingularityAttractorSystem : EntitySystem
     /// <param name="frameTime">The time elapsed since the last set of updates.</param>
     public override void Update(float frameTime)
     {
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
         var query = EntityQueryEnumerator<SingularityAttractorComponent, TransformComponent>();
         var now = _timing.CurTime;
         while (query.MoveNext(out var uid, out var attractor, out var xform))
diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
index 8e33410561..884d625045 100644
--- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
@@ -176,9 +176,10 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste
 
         foreach (var result in rayCastResults)
         {
-            if (genQuery.HasComponent(result.HitEntity))
-                closestResult = result;
+            if (!genQuery.HasComponent(result.HitEntity))
+                continue;
 
+            closestResult = result;
             break;
         }
 
diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
index f86faf9ee4..81612153cc 100644
--- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
@@ -5,11 +5,8 @@ using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
 using Content.Shared.Singularity.Events;
 using Robust.Server.GameStates;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.GameStates;
-using Robust.Shared.Player;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Singularity.EntitySystems;
 
@@ -22,7 +19,6 @@ namespace Content.Server.Singularity.EntitySystems;
 public sealed class SingularitySystem : SharedSingularitySystem
 {
 #region Dependencies
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly PvsOverrideSystem _pvs = default!;
 #endregion Dependencies
@@ -70,9 +66,6 @@ public sealed class SingularitySystem : SharedSingularitySystem
     /// <param name="frameTime">The amount of time since the last set of updates.</param>
     public override void Update(float frameTime)
     {
-        if(!_timing.IsFirstTimePredicted)
-            return;
-
         var query = EntityQueryEnumerator<SingularityComponent>();
         while (query.MoveNext(out var uid, out var singularity))
         {
diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs
index 11493b65b3..f6477a7c8b 100644
--- a/Content.Server/Species/Systems/NymphSystem.cs
+++ b/Content.Server/Species/Systems/NymphSystem.cs
@@ -4,15 +4,13 @@ using Content.Shared.Body.Events;
 using Content.Shared.Zombies;
 using Content.Server.Zombies;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Species.Systems;
 
 public sealed partial class NymphSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _protoManager= default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly MindSystem _mindSystem = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly ZombieSystem _zombie = default!;
 
     public override void Initialize()
@@ -24,9 +22,6 @@ public sealed partial class NymphSystem : EntitySystem
 
     private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, ref OrganRemovedFromBodyEvent args)
     {
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
         if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.OldBody))
             return;
 
diff --git a/Content.Server/Speech/AccentSystem.cs b/Content.Server/Speech/AccentSystem.cs
index e413dd52f8..275a4175c8 100644
--- a/Content.Server/Speech/AccentSystem.cs
+++ b/Content.Server/Speech/AccentSystem.cs
@@ -1,5 +1,5 @@
 using System.Text.RegularExpressions;
-using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
 using Content.Shared.Speech;
 
 namespace Content.Server.Speech;
diff --git a/Content.Server/Speech/EmotesMenuSystem.cs b/Content.Server/Speech/EmotesMenuSystem.cs
index 5f91742eb1..6571587b91 100644
--- a/Content.Server/Speech/EmotesMenuSystem.cs
+++ b/Content.Server/Speech/EmotesMenuSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.Chat.Systems;
-using Content.Shared.Chat;
+using Content.Shared.Chat;
+using Content.Server.Chat.Systems;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Speech;
diff --git a/Content.Server/Speech/EntitySystems/ListeningSystem.cs b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
index 17513d80e7..35cb7f0eb4 100644
--- a/Content.Server/Speech/EntitySystems/ListeningSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
 using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
 
diff --git a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
index 27679c9134..868e5b73c1 100644
--- a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech.Components;
+using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
index c285063d2d..60b531caa5 100644
--- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -128,7 +128,7 @@ namespace Content.Server.Speech.EntitySystems
                     var firstLoc = _loc.GetString(first);
                     var replaceLoc = _loc.GetString(replace);
 
-                    var regex = new Regex($@"(?<!\w){firstLoc}(?!\w)", RegexOptions.IgnoreCase);
+                    var regex = new Regex($@"(?<![\w']){firstLoc}(?![\w'])", RegexOptions.IgnoreCase);
 
                     return (regex, replaceLoc);
 
diff --git a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
index d685edc38b..2f67bfad08 100644
--- a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
@@ -2,6 +2,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
 using Content.Shared.Speech;
+using Content.Shared.StatusEffectNew;
 using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems
@@ -15,6 +16,7 @@ namespace Content.Server.Speech.EntitySystems
         public override void Initialize()
         {
             SubscribeLocalEvent<ScrambledAccentComponent, AccentGetEvent>(OnAccent);
+            SubscribeLocalEvent<ScrambledAccentComponent, StatusEffectRelayedEvent<AccentGetEvent>>(OnAccentRelayed);
         }
 
         public string Accentuate(string message)
@@ -41,9 +43,14 @@ namespace Content.Server.Speech.EntitySystems
             return msg;
         }
 
-        private void OnAccent(EntityUid uid, ScrambledAccentComponent component, AccentGetEvent args)
+        private void OnAccent(Entity<ScrambledAccentComponent> entity, ref AccentGetEvent args)
         {
             args.Message = Accentuate(args.Message);
         }
+
+        private void OnAccentRelayed(Entity<ScrambledAccentComponent> entity, ref StatusEffectRelayedEvent<AccentGetEvent> args)
+        {
+            args.Args.Message = Accentuate(args.Args.Message);
+        }
     }
 }
diff --git a/Content.Server/Speech/EntitySystems/SlurredSystem.cs b/Content.Server/Speech/EntitySystems/SlurredSystem.cs
index 94e83a8d00..a5db28cb2e 100644
--- a/Content.Server/Speech/EntitySystems/SlurredSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SlurredSystem.cs
@@ -15,6 +15,16 @@ public sealed class SlurredSystem : SharedSlurredSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
+    /// <summary>
+    /// Divisor applied to total seconds used to get the odds of slurred speech occuring.
+    /// </summary>
+    private const float SlurredModifier = 1100f;
+
+    /// <summary>
+    /// Minimum amount of time on the slurred accent for it to start taking effect.
+    /// </summary>
+    private const float SlurredThreshold = 80f;
+
     public override void Initialize()
     {
         SubscribeLocalEvent<SlurredAccentComponent, AccentGetEvent>(OnAccent);
@@ -23,23 +33,18 @@ public sealed class SlurredSystem : SharedSlurredSystem
     }
 
     /// <summary>
-    ///     Slur chance scales with "drunkeness", which is just measured using the time remaining on the status effect.
+    ///     Slur chance scales with the time remaining on any status effect with the SlurredAccentComponent.
+    ///     Typically, this is equivalent to "drunkenness" on the DrunkStatusEffect
     /// </summary>
     private float GetProbabilityScale(EntityUid uid)
     {
-        if (!_status.TryGetMaxTime<DrunkStatusEffectComponent>(uid, out var time))
+        if (!_status.TryGetMaxTime<SlurredAccentComponent>(uid, out var time))
             return 0;
 
         // This is a magic number. Why this value? No clue it was made 3 years before I refactored this.
-        var magic = SharedDrunkSystem.MagicNumber;
+        var magic = time.Item2 == null ? SlurredModifier : (float) (time.Item2 - _timing.CurTime).Value.TotalSeconds - SlurredThreshold;
 
-        if (time.Item2 != null)
-        {
-            var curTime = _timing.CurTime;
-            magic = (float) (time.Item2 - curTime).Value.TotalSeconds - 80f;
-        }
-
-        return Math.Clamp(magic / SharedDrunkSystem.MagicNumber, 0f, 1f);
+        return Math.Clamp(magic / SlurredModifier, 0f, 1f);
     }
 
     private void OnAccent(Entity<SlurredAccentComponent> entity, ref AccentGetEvent args)
diff --git a/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs b/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs
index ba7043e10c..6b52e69d7a 100644
--- a/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs
@@ -1,10 +1,10 @@
 using Content.Server.Chat.Systems;
-using Content.Shared.Speech.Components;
+using Content.Shared.Actions.Events;
+using Content.Shared.Chat;
 using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Speech.EntitySystems;
 using Content.Shared.Speech.Muting;
-using Content.Shared.Actions.Events;
-
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/UnblockableSpeechSystem.cs b/Content.Server/Speech/EntitySystems/UnblockableSpeechSystem.cs
index 35a77c31f6..6d5f165d6c 100644
--- a/Content.Server/Speech/EntitySystems/UnblockableSpeechSystem.cs
+++ b/Content.Server/Speech/EntitySystems/UnblockableSpeechSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.Chat.Systems;
 using Content.Server.Speech.Components;
+using Content.Shared.Chat;
 
 namespace Content.Server.Speech.EntitySystems
 {
diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs
index 275140ff5b..2c83108898 100644
--- a/Content.Server/Speech/EntitySystems/VocalSystem.cs
+++ b/Content.Server/Speech/EntitySystems/VocalSystem.cs
@@ -1,12 +1,10 @@
 using Content.Server.Actions;
 using Content.Server.Chat.Systems;
-using Content.Server.Speech.Components;
+using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
-using Content.Shared.Cloning.Events;
 using Content.Shared.Humanoid;
 using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs
index f588e2238d..9e2a0602a4 100644
--- a/Content.Server/Speech/Muting/MutingSystem.cs
+++ b/Content.Server/Speech/Muting/MutingSystem.cs
@@ -1,8 +1,7 @@
-using Content.Shared.Abilities.Mime;
-using Content.Server.Chat.Systems;
 using Content.Server.Popups;
-using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
+using Content.Shared.Abilities.Mime;
+using Content.Shared.Chat;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Puppet;
 using Content.Shared.Speech;
diff --git a/Content.Server/Speech/SpeechNoiseSystem.cs b/Content.Server/Speech/SpeechNoiseSystem.cs
index 5530f3fe57..cc9d5feb60 100644
--- a/Content.Server/Speech/SpeechNoiseSystem.cs
+++ b/Content.Server/Speech/SpeechNoiseSystem.cs
@@ -1,12 +1,10 @@
-using Robust.Shared.Audio;
-using Content.Server.Chat;
-using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
 using Content.Shared.Speech;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Speech
 {
diff --git a/Content.Server/SprayPainter/SprayPainterSystem.cs b/Content.Server/SprayPainter/SprayPainterSystem.cs
index 24ab5e0ea2..f00ae1d7dd 100644
--- a/Content.Server/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Server/SprayPainter/SprayPainterSystem.cs
@@ -56,7 +56,7 @@ public sealed class SprayPainterSystem : SharedSprayPainterSystem
             return;
 
         args.Handled = true;
-        if (TryComp(ent, out LimitedChargesComponent? charges) && charges.LastCharges < ent.Comp.DecalChargeCost)
+        if (TryComp(ent, out LimitedChargesComponent? charges) && _charges.GetCurrentCharges((ent, charges)) < ent.Comp.DecalChargeCost)
         {
             _popup.PopupEntity(Loc.GetString("spray-painter-interact-no-charges"), args.User, args.User);
             return;
@@ -165,7 +165,7 @@ public sealed class SprayPainterSystem : SharedSprayPainterSystem
             return;
 
         if (TryComp<LimitedChargesComponent>(args.Used, out var charges)
-            && charges.LastCharges < painter.PipeChargeCost)
+            && _charges.GetCurrentCharges((args.Used, charges)) < painter.PipeChargeCost)
         {
             var msg = Loc.GetString("spray-painter-interact-no-charges");
             _popup.PopupEntity(msg, args.User, args.User);
diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs
index aac5a23902..a0d923dd1e 100644
--- a/Content.Server/Stack/StackSystem.cs
+++ b/Content.Server/Stack/StackSystem.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
-using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -8,148 +7,246 @@ using Robust.Shared.Prototypes;
 namespace Content.Server.Stack
 {
     /// <summary>
-    ///     Entity system that handles everything relating to stacks.
-    ///     This is a good example for learning how to code in an ECS manner.
+    /// Entity system that handles everything relating to stacks.
+    /// This is a good example for learning how to code in an ECS manner.
     /// </summary>
     [UsedImplicitly]
     public sealed class StackSystem : SharedStackSystem
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        public override void Initialize()
-        {
-            base.Initialize();
-        }
-
-        public override void SetCount(EntityUid uid, int amount, StackComponent? component = null)
-        {
-            if (!Resolve(uid, ref component, false))
-                return;
-
-            base.SetCount(uid, amount, component);
-
-            // Queue delete stack if count reaches zero.
-            if (component.Count <= 0)
-                QueueDel(uid);
-        }
+        #region Spawning
 
         /// <summary>
-        ///     Try to split this stack into two. Returns a non-null <see cref="Robust.Shared.GameObjects.EntityUid"/> if successful.
+        /// Spawns a new entity and moves an amount to it from the stack.
+        /// Moves nothing if amount is greater than ent's stack count.
         /// </summary>
-        public EntityUid? Split(EntityUid uid, int amount, EntityCoordinates spawnPosition, StackComponent? stack = null)
+        /// <param name="amount"> How much to move to the new entity. </param>
+        /// <returns>Null if StackComponent doesn't resolve, or amount to move is greater than ent has available.</returns>
+        [PublicAPI]
+        public EntityUid? Split(Entity<StackComponent?> ent, int amount, EntityCoordinates spawnPosition)
         {
-            if (!Resolve(uid, ref stack))
+            if (!Resolve(ent.Owner, ref ent.Comp))
                 return null;
 
             // Try to remove the amount of things we want to split from the original stack...
-            if (!Use(uid, amount, stack))
+            if (!TryUse(ent, amount))
                 return null;
 
-            // 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.ToString()
-                : Prototype(uid)?.ID;
+            if (!_prototypeManager.Resolve(ent.Comp.StackTypeId, out var stackType))
+                return null;
 
             // Set the output parameter in the event instance to the newly split stack.
-            var entity = Spawn(prototype, spawnPosition);
+            var newEntity = SpawnAtPosition(stackType.Spawn, spawnPosition);
 
-            if (TryComp(entity, out StackComponent? stackComp))
-            {
-                // Set the split stack's count.
-                SetCount(entity, amount, stackComp);
-                // Don't let people dupe unlimited stacks
-                stackComp.Unlimited = false;
-            }
+            // There should always be a StackComponent
+            var stackComp = Comp<StackComponent>(newEntity);
 
-            var ev = new StackSplitEvent(entity);
-            RaiseLocalEvent(uid, ref ev);
+            SetCount((newEntity, stackComp), amount);
+            stackComp.Unlimited = false; // Don't let people dupe unlimited stacks
+            Dirty(newEntity, stackComp);
 
+            var ev = new StackSplitEvent(newEntity);
+            RaiseLocalEvent(ent, ref ev);
+
+            return newEntity;
+        }
+
+        #region SpawnAtPosition
+
+        /// <summary>
+        /// Spawns a stack of a certain stack type and sets its count. Won't set the stack over its max.
+        /// </summary>
+        /// <param name="count">The amount to set the spawned stack to.</param>
+        [PublicAPI]
+        public EntityUid SpawnAtPosition(int count, StackPrototype prototype, EntityCoordinates spawnPosition)
+        {
+            var entity = SpawnAtPosition(prototype.Spawn, spawnPosition); // The real SpawnAtPosition
+
+            SetCount((entity, null), count);
             return entity;
         }
 
-        /// <summary>
-        ///     Spawns a stack of a certain stack type. See <see cref="StackPrototype"/>.
-        /// </summary>
-        public EntityUid Spawn(int amount, ProtoId<StackPrototype> id, EntityCoordinates spawnPosition)
+        /// <inheritdoc cref="SpawnAtPosition(int, StackPrototype, EntityCoordinates)"/>
+        [PublicAPI]
+        public EntityUid SpawnAtPosition(int count, ProtoId<StackPrototype> id, EntityCoordinates spawnPosition)
         {
             var proto = _prototypeManager.Index(id);
-            return Spawn(amount, proto, spawnPosition);
+            return SpawnAtPosition(count, proto, spawnPosition);
         }
 
         /// <summary>
-        ///     Spawns a stack of a certain stack type. See <see cref="StackPrototype"/>.
+        /// Say you want to spawn 97 units of something that has a max stack count of 30.
+        /// This would spawn 3 stacks of 30 and 1 stack of 7.
         /// </summary>
-        public EntityUid Spawn(int amount, StackPrototype prototype, EntityCoordinates spawnPosition)
+        /// <returns>The entities spawned.</returns>
+        /// <remarks> If the entity to spawn doesn't have stack component this will spawn a bunch of single items. </remarks>
+        private List<EntityUid> SpawnMultipleAtPosition(EntProtoId entityPrototype,
+                                                        List<int> amounts,
+                                                        EntityCoordinates spawnPosition)
         {
-            // Set the output result parameter to the new stack entity...
-            var entity = SpawnAtPosition(prototype.Spawn, spawnPosition);
-            var stack = Comp<StackComponent>(entity);
+            if (amounts.Count <= 0)
+            {
+                Log.Error(
+                    $"Attempted to spawn stacks of nothing: {entityPrototype}, {amounts}. Trace: {Environment.StackTrace}");
+                return new();
+            }
 
-            // And finally, set the correct amount!
-            SetCount(entity, amount, stack);
+            var spawnedEnts = new List<EntityUid>();
+            foreach (var count in amounts)
+            {
+                var entity = SpawnAtPosition(entityPrototype, spawnPosition); // The real SpawnAtPosition
+                spawnedEnts.Add(entity);
+                if (TryComp<StackComponent>(entity, out var stackComp)) // prevent errors from the Resolve
+                    SetCount((entity, stackComp), count);
+            }
+
+            return spawnedEnts;
+        }
+
+        /// <inheritdoc cref="SpawnMultipleAtPosition(EntProtoId, List{int}, EntityCoordinates)"/>
+        [PublicAPI]
+        public List<EntityUid> SpawnMultipleAtPosition(EntProtoId entityPrototypeId,
+                                                       int amount,
+                                                       EntityCoordinates spawnPosition)
+        {
+            return SpawnMultipleAtPosition(entityPrototypeId,
+                                            CalculateSpawns(entityPrototypeId, amount),
+                                            spawnPosition);
+        }
+
+        /// <inheritdoc cref="SpawnMultipleAtPosition(EntProtoId, List{int}, EntityCoordinates)"/>
+        [PublicAPI]
+        public List<EntityUid> SpawnMultipleAtPosition(EntityPrototype entityProto,
+                                                       int amount,
+                                                       EntityCoordinates spawnPosition)
+        {
+            return SpawnMultipleAtPosition(entityProto.ID,
+                                            CalculateSpawns(entityProto, amount),
+                                            spawnPosition);
+        }
+
+        /// <inheritdoc cref="SpawnMultipleAtPosition(EntProtoId, List{int}, EntityCoordinates)"/>
+        [PublicAPI]
+        public List<EntityUid> SpawnMultipleAtPosition(StackPrototype stack,
+                                                       int amount,
+                                                       EntityCoordinates spawnPosition)
+        {
+            return SpawnMultipleAtPosition(stack.Spawn,
+                                            CalculateSpawns(stack, amount),
+                                            spawnPosition);
+        }
+
+        /// <inheritdoc cref="SpawnMultipleAtPosition(EntProtoId, List{int}, EntityCoordinates)"/>
+        [PublicAPI]
+        public List<EntityUid> SpawnMultipleAtPosition(ProtoId<StackPrototype> stackId,
+                                                       int amount,
+                                                       EntityCoordinates spawnPosition)
+        {
+            var stackProto = _prototypeManager.Index(stackId);
+            return SpawnMultipleAtPosition(stackProto.Spawn,
+                                            CalculateSpawns(stackProto, amount),
+                                            spawnPosition);
+        }
+
+        #endregion
+        #region SpawnNextToOrDrop
+
+        /// <inheritdoc cref="SpawnAtPosition(int, StackPrototype, EntityCoordinates)"/>
+        [PublicAPI]
+        public EntityUid SpawnNextToOrDrop(int amount, StackPrototype prototype, EntityUid source)
+        {
+            var entity = SpawnNextToOrDrop(prototype.Spawn, source); // The real SpawnNextToOrDrop
+            SetCount((entity, null), amount);
             return entity;
         }
 
-        /// <summary>
-        ///     Say you want to spawn 97 units of something that has a max stack count of 30.
-        ///     This would spawn 3 stacks of 30 and 1 stack of 7.
-        /// </summary>
-        public List<EntityUid> SpawnMultiple(string entityPrototype, int amount, EntityCoordinates spawnPosition)
+        /// <inheritdoc cref="SpawnNextToOrDrop(int, StackPrototype, EntityUid)"/>
+        [PublicAPI]
+        public EntityUid SpawnNextToOrDrop(int amount, ProtoId<StackPrototype> id, EntityUid source)
         {
-            if (amount <= 0)
+            var proto = _prototypeManager.Index(id);
+            return SpawnNextToOrDrop(amount, proto, source);
+        }
+
+        /// <inheritdoc cref="SpawnMultipleAtPosition(EntProtoId, List{int}, EntityCoordinates)"/>
+        private List<EntityUid> SpawnMultipleNextToOrDrop(EntProtoId entityPrototype,
+                                                          List<int> amounts,
+                                                          EntityUid target)
+        {
+            if (amounts.Count <= 0)
             {
                 Log.Error(
-                    $"Attempted to spawn an invalid stack: {entityPrototype}, {amount}. Trace: {Environment.StackTrace}");
+                    $"Attempted to spawn stacks of nothing: {entityPrototype}, {amounts}. Trace: {Environment.StackTrace}");
                 return new();
             }
 
-            var spawns = CalculateSpawns(entityPrototype, amount);
-
             var spawnedEnts = new List<EntityUid>();
-            foreach (var count in spawns)
+            foreach (var count in amounts)
             {
-                var entity = SpawnAtPosition(entityPrototype, spawnPosition);
+                var entity = SpawnNextToOrDrop(entityPrototype, target); // The real SpawnNextToOrDrop
                 spawnedEnts.Add(entity);
-                SetCount(entity, count);
+                if (TryComp<StackComponent>(entity, out var stackComp)) // prevent errors from the Resolve
+                    SetCount((entity, stackComp), count);
             }
 
             return spawnedEnts;
         }
 
-        /// <inheritdoc cref="SpawnMultiple(string,int,EntityCoordinates)"/>
-        public List<EntityUid> SpawnMultiple(string entityPrototype, int amount, EntityUid target)
+        /// <inheritdoc cref="SpawnMultipleNextToOrDrop(EntProtoId, List{int}, EntityUid)"/>
+        [PublicAPI]
+        public List<EntityUid> SpawnMultipleNextToOrDrop(EntProtoId stack,
+                                                         int amount,
+                                                         EntityUid target)
         {
-            if (amount <= 0)
-            {
-                Log.Error(
-                    $"Attempted to spawn an invalid stack: {entityPrototype}, {amount}. Trace: {Environment.StackTrace}");
-                return new();
-            }
-
-            var spawns = CalculateSpawns(entityPrototype, amount);
-
-            var spawnedEnts = new List<EntityUid>();
-            foreach (var count in spawns)
-            {
-                var entity = SpawnNextToOrDrop(entityPrototype, target);
-                spawnedEnts.Add(entity);
-                SetCount(entity, count);
-            }
-
-            return spawnedEnts;
+            return SpawnMultipleNextToOrDrop(stack,
+                                             CalculateSpawns(stack, amount),
+                                             target);
         }
 
+        /// <inheritdoc cref="SpawnMultipleNextToOrDrop(EntProtoId, List{int}, EntityUid)"/>
+        [PublicAPI]
+        public List<EntityUid> SpawnMultipleNextToOrDrop(EntityPrototype stack,
+                                                         int amount,
+                                                         EntityUid target)
+        {
+            return SpawnMultipleNextToOrDrop(stack.ID,
+                                             CalculateSpawns(stack, amount),
+                                             target);
+        }
+
+        /// <inheritdoc cref="SpawnMultipleNextToOrDrop(EntProtoId, List{int}, EntityUid)"/>
+        [PublicAPI]
+        public List<EntityUid> SpawnMultipleNextToOrDrop(StackPrototype stack,
+                                                         int amount,
+                                                         EntityUid target)
+        {
+            return SpawnMultipleNextToOrDrop(stack.Spawn,
+                                             CalculateSpawns(stack, amount),
+                                             target);
+        }
+
+        /// <inheritdoc cref="SpawnMultipleNextToOrDrop(EntProtoId, List{int}, EntityUid)"/>
+        [PublicAPI]
+        public List<EntityUid> SpawnMultipleNextToOrDrop(ProtoId<StackPrototype> stackId,
+                                                         int amount,
+                                                         EntityUid target)
+        {
+            var stackProto = _prototypeManager.Index(stackId);
+            return SpawnMultipleNextToOrDrop(stackProto.Spawn,
+                                             CalculateSpawns(stackProto, amount),
+                                             target);
+        }
+
+        #endregion
+        #region Calculate
+
         /// <summary>
         /// Calculates how many stacks to spawn that total up to <paramref name="amount"/>.
         /// </summary>
-        /// <param name="entityPrototype">The stack to spawn.</param>
-        /// <param name="amount">The amount of pieces across all stacks.</param>
         /// <returns>The list of stack counts per entity.</returns>
-        private List<int> CalculateSpawns(string entityPrototype, int amount)
+        private List<int> CalculateSpawns(int maxCountPerStack, int amount)
         {
-            var proto = _prototypeManager.Index<EntityPrototype>(entityPrototype);
-            proto.TryGetComponent<StackComponent>(out var stack, EntityManager.ComponentFactory);
-            var maxCountPerStack = GetMaxCount(stack);
             var amounts = new List<int>();
             while (amount > 0)
             {
@@ -161,28 +258,47 @@ namespace Content.Server.Stack
             return amounts;
         }
 
-        protected override void UserSplit(EntityUid uid, EntityUid userUid, int amount,
-            StackComponent? stack = null,
-            TransformComponent? userTransform = null)
+        /// <inheritdoc cref="CalculateSpawns(int, int)"/>
+        private List<int> CalculateSpawns(StackPrototype stackProto, int amount)
         {
-            if (!Resolve(uid, ref stack))
-                return;
+            return CalculateSpawns(GetMaxCount(stackProto), amount);
+        }
 
-            if (!Resolve(userUid, ref userTransform))
+        /// <inheritdoc cref="CalculateSpawns(int, int)"/>
+        private List<int> CalculateSpawns(EntityPrototype entityPrototype, int amount)
+        {
+            return CalculateSpawns(GetMaxCount(entityPrototype), amount);
+        }
+
+        /// <inheritdoc cref="CalculateSpawns(int, int)"/>
+        private List<int> CalculateSpawns(EntProtoId entityId, int amount)
+        {
+            return CalculateSpawns(GetMaxCount(entityId), amount);
+        }
+
+        #endregion
+        #endregion
+        #region Event Handlers
+
+        /// <inheritdoc />
+        protected override void UserSplit(Entity<StackComponent> stack, Entity<TransformComponent?> user, int amount)
+        {
+            if (!Resolve(user.Owner, ref user.Comp, false))
                 return;
 
             if (amount <= 0)
             {
-                Popup.PopupCursor(Loc.GetString("comp-stack-split-too-small"), userUid, PopupType.Medium);
+                Popup.PopupCursor(Loc.GetString("comp-stack-split-too-small"), user.Owner, PopupType.Medium);
                 return;
             }
 
-            if (Split(uid, amount, userTransform.Coordinates, stack) is not {} split)
+            if (Split(stack.AsNullable(), amount, user.Comp.Coordinates) is not { } split)
                 return;
 
-            Hands.PickupOrDrop(userUid, split);
+            Hands.PickupOrDrop(user.Owner, split);
 
-            Popup.PopupCursor(Loc.GetString("comp-stack-split"), userUid);
+            Popup.PopupCursor(Loc.GetString("comp-stack-split"), user.Owner);
         }
+        #endregion
     }
 }
diff --git a/Content.Server/Station/Commands/BankCommand.cs b/Content.Server/Station/Commands/BankCommand.cs
new file mode 100644
index 0000000000..c24cacdffb
--- /dev/null
+++ b/Content.Server/Station/Commands/BankCommand.cs
@@ -0,0 +1,93 @@
+using System.Linq;
+using Content.Server.Administration;
+using Content.Server.Cargo.Systems;
+using Content.Shared.Administration;
+using Content.Shared.Cargo.Components;
+using Content.Shared.Cargo.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Toolshed;
+
+namespace Content.Server.Station.Commands;
+
+[ToolshedCommand, AdminCommand(AdminFlags.Admin)]
+public sealed class BankCommand : ToolshedCommand
+{
+    private CargoSystem? _cargo;
+
+    [CommandImplementation("accounts")]
+    public IEnumerable<BankAccount> Accounts([PipedArgument] EntityUid station)
+    {
+        _cargo ??= GetSys<CargoSystem>();
+
+        foreach (var (account, _) in _cargo.GetAccounts(station))
+        {
+            yield return new BankAccount(account.Id, station, _cargo, EntityManager);
+        }
+    }
+
+    [CommandImplementation("accounts")]
+    public IEnumerable<BankAccount> Accounts([PipedArgument] IEnumerable<EntityUid> stations)
+        => stations.SelectMany(Accounts);
+
+    [CommandImplementation("account")]
+    public BankAccount Account([PipedArgument] EntityUid station, ProtoId<CargoAccountPrototype> account)
+    {
+        _cargo ??= GetSys<CargoSystem>();
+
+        return new BankAccount(account.Id, station, _cargo, EntityManager);
+    }
+
+    [CommandImplementation("account")]
+    public IEnumerable<BankAccount> Account([PipedArgument] IEnumerable<EntityUid> stations, ProtoId<CargoAccountPrototype> account)
+        => stations.Select(x => Account(x, account));
+
+    [CommandImplementation("adjust")]
+    public IEnumerable<BankAccount> Adjust([PipedArgument] IEnumerable<BankAccount> @ref, int by)
+    {
+        _cargo ??= GetSys<CargoSystem>();
+        var bankAccounts = @ref.ToList();
+        foreach (var bankAccount in bankAccounts.ToList())
+        {
+            _cargo.TryAdjustBankAccount(bankAccount.Station, bankAccount.Account, by, true);
+        }
+        return bankAccounts;
+    }
+
+    [CommandImplementation("set")]
+    public IEnumerable<BankAccount> Set([PipedArgument] IEnumerable<BankAccount> @ref, int by)
+    {
+        _cargo ??= GetSys<CargoSystem>();
+        var bankAccounts = @ref.ToList();
+        foreach (var bankAccount in bankAccounts.ToList())
+        {
+            _cargo.TrySetBankAccount(bankAccount.Station, bankAccount.Account, by, true);
+        }
+        return bankAccounts;
+    }
+
+    [CommandImplementation("amount")]
+    public IEnumerable<int> Amount([PipedArgument] IEnumerable<BankAccount> @ref)
+    {
+        _cargo ??= GetSys<CargoSystem>();
+        return @ref.Select(bankAccount => (success: _cargo.TryGetAccount(bankAccount.Station, bankAccount.Account, out var money), money))
+        .Where(result => result.success)
+        .Select(result => result.money);
+    }
+}
+
+public readonly record struct BankAccount(
+    string Account,
+    Entity<StationBankAccountComponent?> Station,
+    CargoSystem Cargo,
+    IEntityManager EntityManager)
+{
+    public override string ToString()
+    {
+        if (!Cargo.TryGetAccount(Station, Account, out var money))
+        {
+            return $"{EntityManager.ToPrettyString(Station)} Account {Account} : (not a account)";
+        }
+
+        return $"{EntityManager.ToPrettyString(Station)} Account {Account} : {money}";
+    }
+}
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 742434ff23..c3d37a74b8 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -313,7 +313,7 @@ public sealed partial class StoreSystem
         {
             var cashId = proto.Cash[value];
             var amountToSpawn = (int) MathF.Floor((float) (amountRemaining / value));
-            var ents = _stack.SpawnMultiple(cashId, amountToSpawn, coordinates);
+            var ents = _stack.SpawnMultipleAtPosition(cashId, amountToSpawn, coordinates);
             if (ents.FirstOrDefault() is {} ent)
                 _hands.PickupOrDrop(buyer, ent);
             amountRemaining -= value * amountToSpawn;
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 0625ced087..279026c873 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -1,17 +1,16 @@
+using System.Linq;
 using Content.Server.Store.Components;
-using Content.Shared.UserInterface;
 using Content.Shared.FixedPoint;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Content.Shared.Store.Components;
-using JetBrains.Annotations;
+using Content.Shared.Store.Events;
+using Content.Shared.UserInterface;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-using System.Linq;
 using Robust.Shared.Timing;
-using Content.Shared.Mind;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Store.Systems;
 
@@ -37,6 +36,7 @@ public sealed partial class StoreSystem : EntitySystem
         SubscribeLocalEvent<StoreComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<StoreComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<StoreComponent, OpenUplinkImplantEvent>(OnImplantActivate);
+        SubscribeLocalEvent<StoreComponent, IntrinsicStoreActionEvent>(OnIntrinsicStoreAction);
 
         InitializeUi();
         InitializeCommand();
@@ -153,7 +153,7 @@ public sealed partial class StoreSystem : EntitySystem
         // same tick
         currency.Comp.Price.Clear();
         if (stack != null)
-            _stack.SetCount(currency.Owner, 0, stack);
+            _stack.SetCount((currency.Owner, stack), 0);
 
         QueueDel(currency);
         return true;
@@ -187,6 +187,12 @@ public sealed partial class StoreSystem : EntitySystem
         UpdateUserInterface(null, uid, store);
         return true;
     }
+
+    private void OnIntrinsicStoreAction(Entity<StoreComponent> ent, ref IntrinsicStoreActionEvent args)
+    {
+        ToggleUi(args.Performer, ent.Owner, ent.Comp);
+    }
+
 }
 
 public sealed class CurrencyInsertAttemptEvent : CancellableEntityEventArgs
diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
index c1757b1c2d..09e42966c7 100644
--- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
@@ -27,6 +27,7 @@ internal sealed class StunOnCollideSystem : EntitySystem
         if (ent.Comp.Refresh)
         {
             _stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount);
+
             _movementMod.TryUpdateMovementSpeedModDuration(
                 target,
                 MovementModStatusSystem.TaserSlowdown,
diff --git a/Content.Server/Teleportation/TeleportLocationsSystem.cs b/Content.Server/Teleportation/TeleportLocationsSystem.cs
index 14211d9672..edda0859ee 100644
--- a/Content.Server/Teleportation/TeleportLocationsSystem.cs
+++ b/Content.Server/Teleportation/TeleportLocationsSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
 using Content.Shared.Teleportation;
 using Content.Shared.Teleportation.Components;
 using Content.Shared.Teleportation.Systems;
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 6290e8231a..f6a7536994 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -10,14 +10,14 @@ using Content.Shared.Database;
 using Content.Shared.Inventory;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Physics.Events;
 using Content.Shared.Projectiles;
+using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.Systems;
 
 namespace Content.Server.Temperature.Systems;
 
-public sealed class TemperatureSystem : EntitySystem
+public sealed class TemperatureSystem : SharedTemperatureSystem
 {
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
@@ -125,8 +125,7 @@ public sealed class TemperatureSystem : EntitySystem
             true);
     }
 
-    public void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false,
-        TemperatureComponent? temperature = null)
+    public override void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
     {
         if (!Resolve(uid, ref temperature, false))
             return;
@@ -161,16 +160,6 @@ public sealed class TemperatureSystem : EntitySystem
         ChangeHeat(uid, heat * temperature.AtmosTemperatureTransferEfficiency, temperature: temperature);
     }
 
-    public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
-    {
-        if (!Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
-        {
-            return Atmospherics.MinimumHeatCapacity;
-        }
-
-        return comp.SpecificHeat * physics.FixturesMass;
-    }
-
     private void OnInit(EntityUid uid, InternalTemperatureComponent comp, MapInitEvent args)
     {
         if (!TryComp<TemperatureComponent>(uid, out var temp))
diff --git a/Content.Server/Tiles/TileEntityEffectComponent.cs b/Content.Server/Tiles/TileEntityEffectComponent.cs
index 4201af47f9..70f11bb060 100644
--- a/Content.Server/Tiles/TileEntityEffectComponent.cs
+++ b/Content.Server/Tiles/TileEntityEffectComponent.cs
@@ -14,6 +14,6 @@ public sealed partial class TileEntityEffectComponent : Component
     /// <summary>
     /// List of effects that should be applied.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public List<EntityEffect> Effects = default!;
 }
diff --git a/Content.Server/Tiles/TileEntityEffectSystem.cs b/Content.Server/Tiles/TileEntityEffectSystem.cs
index 4d866cb254..1123781e7b 100644
--- a/Content.Server/Tiles/TileEntityEffectSystem.cs
+++ b/Content.Server/Tiles/TileEntityEffectSystem.cs
@@ -1,13 +1,11 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
 using Content.Shared.StepTrigger.Systems;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.EntityEffects;
 
 namespace Content.Server.Tiles;
 
 public sealed class TileEntityEffectSystem : EntitySystem
 {
+    [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
 
     public override void Initialize()
     {
@@ -23,11 +21,7 @@ public sealed class TileEntityEffectSystem : EntitySystem
     private void OnTileStepTriggered(Entity<TileEntityEffectComponent> ent, ref StepTriggeredOffEvent args)
     {
         var otherUid = args.Tripper;
-        var effectArgs = new EntityEffectBaseArgs(otherUid, EntityManager);
 
-        foreach (var effect in ent.Comp.Effects)
-        {
-            effect.Effect(effectArgs);
-        }
+        _entityEffects.ApplyEffects(otherUid, ent.Comp.Effects.ToArray(), user: otherUid);
     }
 }
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index e4aa7b5ec1..e8ed868dfb 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -102,7 +102,10 @@ public sealed class UplinkSystem : EntitySystem
         var implant = _subdermalImplant.AddImplant(user, FallbackUplinkImplant);
 
         if (!HasComp<StoreComponent>(implant))
+        {
+            Log.Error($"Implant does not have the store component {implant}");
             return false;
+        }
 
         SetUplink(user, implant.Value, balance, giveDiscounts);
         return true;
@@ -117,20 +120,19 @@ public sealed class UplinkSystem : EntitySystem
         // Try to find PDA in inventory
         if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator))
         {
-            while (containerSlotEnumerator.MoveNext(out var pdaUid))
+            while (containerSlotEnumerator.MoveNext(out var containerSlot))
             {
-                if (!pdaUid.ContainedEntity.HasValue)
-                    continue;
+                var pdaUid = containerSlot.ContainedEntity;
 
-                if (HasComp<PdaComponent>(pdaUid.ContainedEntity.Value) || HasComp<StoreComponent>(pdaUid.ContainedEntity.Value))
-                    return pdaUid.ContainedEntity.Value;
+                if (HasComp<PdaComponent>(pdaUid) && HasComp<StoreComponent>(pdaUid))
+                    return pdaUid;
             }
         }
 
         // Also check hands
         foreach (var item in _handsSystem.EnumerateHeld(user))
         {
-            if (HasComp<PdaComponent>(item) || HasComp<StoreComponent>(item))
+            if (HasComp<PdaComponent>(item) && HasComp<StoreComponent>(item))
                 return item;
         }
 
diff --git a/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
index 1e08587ce7..48ead11161 100644
--- a/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Chat.Systems;
+using Content.Shared.Chat;
 using Content.Shared.Trigger;
 using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/TurretController/DeployableTurretControllerSystem.cs b/Content.Server/TurretController/DeployableTurretControllerSystem.cs
index f0b6881431..fbb802b679 100644
--- a/Content.Server/TurretController/DeployableTurretControllerSystem.cs
+++ b/Content.Server/TurretController/DeployableTurretControllerSystem.cs
@@ -9,6 +9,8 @@ using Content.Shared.Turrets;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Shared.Database;
 
 namespace Content.Server.TurretController;
 
@@ -17,6 +19,7 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
 {
     [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
 
     /// Keys for the device network. See <see cref="DeviceNetworkConstants"/> for further examples.
     public const string CmdSetArmamemtState = "set_armament_state";
@@ -109,6 +112,8 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
             [CmdSetArmamemtState] = armamentState,
         };
 
+        _adminLogger.Add(LogType.ItemConfigure, LogImpact.Medium, $"{ToPrettyString(user)} set {ToPrettyString(ent)} to {armamentState}");
+
         _deviceNetwork.QueuePacket(ent, null, payload, device: device);
     }
 
@@ -132,6 +137,11 @@ public sealed partial class DeployableTurretControllerSystem : SharedDeployableT
             [CmdSetAccessExemptions] = turretTargetingSettings.ExemptAccessLevels,
         };
 
+        foreach (var exemption in exemptions)
+        {
+            _adminLogger.Add(LogType.ItemConfigure, LogImpact.Medium, $"{ToPrettyString(user)} set {ToPrettyString(ent)} authorization of {exemption} to {enabled}");
+        }
+
         _deviceNetwork.QueuePacket(ent, null, payload, device: device);
     }
 
diff --git a/Content.Server/Vocalization/Systems/VocalizationSystem.cs b/Content.Server/Vocalization/Systems/VocalizationSystem.cs
index 49dfaf4281..8801e057b7 100644
--- a/Content.Server/Vocalization/Systems/VocalizationSystem.cs
+++ b/Content.Server/Vocalization/Systems/VocalizationSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Chat.Systems;
 using Content.Server.Power.Components;
 using Content.Server.Vocalization.Components;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Chat;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
index 468bfdc0f8..0dd1540933 100644
--- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
+++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
@@ -456,7 +456,7 @@ namespace Content.Server.Voting.Managers
                     (Loc.GetString("ui-vote-votekick-abstain"), "abstain")
                 },
                 Duration = TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VotekickTimer)),
-                InitiatorTimeout = TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.VotekickTimeout)),
+                InitiatorTimeout = TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VotekickTimeout)),
                 VoterEligibility = voterEligibility,
                 DisplayVotes = false,
                 TargetEntity = targetNetEntity
@@ -471,7 +471,7 @@ namespace Content.Server.Voting.Managers
             var webhookState = _voteWebhooks.CreateWebhookIfConfigured(options, _cfg.GetCVar(CCVars.DiscordVotekickWebhook), Loc.GetString("votekick-webhook-name"), options.Title + "\n" + Loc.GetString("votekick-webhook-description", ("initiator", initiatorName), ("target", targetSession)));
 
             // Time out the vote now that we know it will happen
-            TimeoutStandardVote(StandardVoteType.Votekick);
+            TimeoutStandardVote(StandardVoteType.Votekick, TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VotekickTimeout)));
 
             vote.OnFinished += (_, eventArgs) =>
             {
@@ -578,9 +578,9 @@ namespace Content.Server.Voting.Managers
             }
         }
 
-        private void TimeoutStandardVote(StandardVoteType type)
+        private void TimeoutStandardVote(StandardVoteType type, TimeSpan? timeoutOverride = null)
         {
-            var timeout = TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VoteSameTypeTimeout));
+            var timeout = timeoutOverride ?? TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VoteSameTypeTimeout));
             _standardVoteTimeout[type] = _timing.RealTime + timeout;
             DirtyCanCallVoteAll();
         }
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 1e8f3334ac..2efe94c20e 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Movement.Systems;
-using Content.Shared.Damage.Events;
-using Content.Shared.Damage.Systems;
+using Content.Shared.Chat;
 using Content.Shared.Effects;
 using Content.Shared.Speech.Components;
 using Content.Shared.Weapons.Melee;
@@ -16,28 +15,14 @@ namespace Content.Server.Weapons.Melee;
 public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
 {
     [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
     [Dependency] private readonly LagCompensationSystem _lag = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
 
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<MeleeSpeechComponent, MeleeHitEvent>(OnSpeechHit);
-        SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage);
-    }
-
-    private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component, ref DamageExamineEvent args)
-    {
-        if (component.Hidden)
-            return;
-
-        var damageSpec = GetDamage(uid, args.User, component);
-
-        if (damageSpec.Empty)
-            return;
-
-        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), Loc.GetString("damage-melee"));
     }
 
     protected override bool ArcRaySuccessful(EntityUid targetUid,
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
index d697e2bef1..700a15e1b0 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
@@ -1,12 +1,7 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Events;
 using Content.Shared.Power;
 using Content.Shared.PowerCell.Components;
-using Content.Shared.Projectiles;
-using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
@@ -19,13 +14,11 @@ public sealed partial class GunSystem
         // Hitscan
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, ComponentStartup>(OnBatteryStartup);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, ChargeChangedEvent>(OnBatteryChargeChange);
-        SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, PowerCellChangedEvent>(OnPowerCellChanged);
 
         // Projectile
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ComponentStartup>(OnBatteryStartup);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ChargeChangedEvent>(OnBatteryChargeChange);
-        SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, PowerCellChangedEvent>(OnPowerCellChanged);
     }
 
@@ -73,50 +66,6 @@ public sealed partial class GunSystem
         RaiseLocalEvent(uid, ref updateAmmoEv);
     }
 
-    private void OnBatteryDamageExamine<T>(Entity<T> entity, ref DamageExamineEvent args) where T : BatteryAmmoProviderComponent
-    {
-        var damageSpec = GetDamage(entity.Comp);
-
-        if (damageSpec == null)
-            return;
-
-        var damageType = entity.Comp switch
-        {
-            HitscanBatteryAmmoProviderComponent => Loc.GetString("damage-hitscan"),
-            ProjectileBatteryAmmoProviderComponent => Loc.GetString("damage-projectile"),
-            _ => throw new ArgumentOutOfRangeException(),
-        };
-
-        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), damageType);
-    }
-
-    private DamageSpecifier? GetDamage(BatteryAmmoProviderComponent component)
-    {
-        if (component is ProjectileBatteryAmmoProviderComponent battery)
-        {
-            if (ProtoManager.Index<EntityPrototype>(battery.Prototype).Components
-                .TryGetValue(Factory.GetComponentName<ProjectileComponent>(), out var projectile))
-            {
-                var p = (ProjectileComponent) projectile.Component;
-
-                if (!p.Damage.Empty)
-                {
-                    return p.Damage * Damageable.UniversalProjectileDamageModifier;
-                }
-            }
-
-            return null;
-        }
-
-        if (component is HitscanBatteryAmmoProviderComponent hitscan)
-        {
-            var dmg = ProtoManager.Index<HitscanPrototype>(hitscan.Prototype).Damage;
-            return dmg == null ? dmg : dmg * Damageable.UniversalHitscanDamageModifier;
-        }
-
-        return null;
-    }
-
     protected override void TakeCharge(Entity<BatteryAmmoProviderComponent> entity)
     {
         var ev = new ChangeChargeEvent(-entity.Comp.FireCost);
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index e04fa9b64c..dcfa3e6654 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -1,27 +1,22 @@
-using System.Linq;
 using System.Numerics;
 using Content.Server.Cargo.Systems;
 using Content.Server.Weapons.Ranged.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
-using Content.Shared.Database;
-using Content.Shared.Effects;
 using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
-using Content.Shared.Weapons.Reflect;
-using Content.Shared.Damage.Components;
+using Content.Shared.Weapons.Hitscan.Components;
+using Content.Shared.Weapons.Hitscan.Events;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
-using Robust.Shared.Physics;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using Robust.Shared.Containers;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
@@ -29,9 +24,6 @@ public sealed partial class GunSystem : SharedGunSystem
 {
     [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
     [Dependency] private readonly PricingSystem _pricing = default!;
-    [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-    [Dependency] private readonly SharedStaminaSystem _stamina = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
 
     private const float DamagePitchVariation = 0.05f;
@@ -103,6 +95,7 @@ public sealed partial class GunSystem : SharedGunSystem
                 continue;
             }
 
+            // TODO: Clean this up in a gun refactor at some point - too much copy pasting
             switch (shootable)
             {
                 // Cartridge shoots something else
@@ -141,107 +134,21 @@ public sealed partial class GunSystem : SharedGunSystem
                     CreateAndFireProjectiles(ent.Value, newAmmo);
 
                     break;
-                case HitscanPrototype hitscan:
+                case HitscanAmmoComponent:
+                    if (ent == null)
+                        break;
 
-                    EntityUid? lastHit = null;
-
-                    var from = fromMap;
-                    // can't use map coords above because funny FireEffects
-                    var fromEffect = fromCoordinates;
-                    var dir = mapDirection.Normalized();
-
-                    //in the situation when user == null, means that the cannon fires on its own (via signals). And we need the gun to not fire by itself in this case
-                    var lastUser = user ?? gunUid;
-
-                    if (hitscan.Reflective != ReflectType.None)
+                    var hitscanEv = new HitscanTraceEvent
                     {
-                        for (var reflectAttempt = 0; reflectAttempt < 3; reflectAttempt++)
-                        {
-                            var ray = new CollisionRay(from.Position, dir, hitscan.CollisionMask);
-                            var rayCastResults =
-                                Physics.IntersectRay(from.MapId, ray, hitscan.MaxLength, lastUser, false).ToList();
-                            if (!rayCastResults.Any())
-                                break;
+                        FromCoordinates = fromCoordinates,
+                        ShotDirection = mapDirection.Normalized(),
+                        Gun = gunUid,
+                        Shooter = user,
+                        Target = gun.Target,
+                    };
+                    RaiseLocalEvent(ent.Value, ref hitscanEv);
 
-                            var result = rayCastResults[0];
-
-                            // Check if laser is shot from in a container
-                            if (!_container.IsEntityOrParentInContainer(lastUser))
-                            {
-                                // Checks if the laser should pass over unless targeted by its user
-                                foreach (var collide in rayCastResults)
-                                {
-                                    if (collide.HitEntity != gun.Target &&
-                                        CompOrNull<RequireProjectileTargetComponent>(collide.HitEntity)?.Active == true)
-                                    {
-                                        continue;
-                                    }
-
-                                    result = collide;
-                                    break;
-                                }
-                            }
-
-                            var hit = result.HitEntity;
-                            lastHit = hit;
-
-                            FireEffects(fromEffect, result.Distance, dir.Normalized().ToAngle(), hitscan, hit);
-
-                            var ev = new HitScanReflectAttemptEvent(user, gunUid, hitscan.Reflective, dir, false);
-                            RaiseLocalEvent(hit, ref ev);
-
-                            if (!ev.Reflected)
-                                break;
-
-                            fromEffect = Transform(hit).Coordinates;
-                            from = TransformSystem.ToMapCoordinates(fromEffect);
-                            dir = ev.Direction;
-                            lastUser = hit;
-                        }
-                    }
-
-                    if (lastHit != null)
-                    {
-                        var hitEntity = lastHit.Value;
-                        if (hitscan.StaminaDamage > 0f)
-                            _stamina.TakeStaminaDamage(hitEntity, hitscan.StaminaDamage, source: user);
-
-                        var dmg = hitscan.Damage;
-
-                        var hitName = ToPrettyString(hitEntity);
-                        if (dmg != null)
-                            dmg = Damageable.TryChangeDamage(hitEntity, dmg * Damageable.UniversalHitscanDamageModifier, origin: user);
-
-                        // check null again, as TryChangeDamage returns modified damage values
-                        if (dmg != null)
-                        {
-                            if (!Deleted(hitEntity))
-                            {
-                                if (dmg.AnyPositive())
-                                {
-                                    _color.RaiseEffect(Color.Red, new List<EntityUid>() { hitEntity }, Filter.Pvs(hitEntity, entityManager: EntityManager));
-                                }
-
-                                // TODO get fallback position for playing hit sound.
-                                PlayImpactSound(hitEntity, dmg, hitscan.Sound, hitscan.ForceSound);
-                            }
-
-                            if (user != null)
-                            {
-                                Logs.Add(LogType.HitScanHit,
-                                    $"{ToPrettyString(user.Value):user} hit {hitName:target} using hitscan and dealt {dmg.GetTotal():damage} damage");
-                            }
-                            else
-                            {
-                                Logs.Add(LogType.HitScanHit,
-                                    $"{hitName:target} hit by hitscan dealing {dmg.GetTotal():damage} damage");
-                            }
-                        }
-                    }
-                    else
-                    {
-                        FireEffects(fromEffect, hitscan.MaxLength, dir.ToAngle(), hitscan);
-                    }
+                    Del(ent);
 
                     Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
                     break;
@@ -353,7 +260,7 @@ public sealed partial class GunSystem : SharedGunSystem
         RaiseNetworkEvent(message, filter);
     }
 
-    public void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound)
+    public override void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound)
     {
         DebugTools.Assert(!Deleted(otherEntity), "Impact sound entity was deleted");
 
@@ -384,69 +291,4 @@ public sealed partial class GunSystem : SharedGunSystem
             Audio.PlayPvs(weaponSound, otherEntity);
         }
     }
-
-    // TODO: Pseudo RNG so the client can predict these.
-    #region Hitscan effects
-
-    private void FireEffects(EntityCoordinates fromCoordinates, float distance, Angle angle, HitscanPrototype hitscan, EntityUid? hitEntity = null)
-    {
-        // Lord
-        // Forgive me for the shitcode I am about to do
-        // Effects tempt me not
-        var sprites = new List<(NetCoordinates coordinates, Angle angle, SpriteSpecifier sprite, float scale)>();
-        var fromXform = Transform(fromCoordinates.EntityId);
-
-        // We'll get the effects relative to the grid / map of the firer
-        // Look you could probably optimise this a bit with redundant transforms at this point.
-
-        var gridUid = fromXform.GridUid;
-        if (gridUid != fromCoordinates.EntityId && TryComp(gridUid, out TransformComponent? gridXform))
-        {
-            var (_, gridRot, gridInvMatrix) = TransformSystem.GetWorldPositionRotationInvMatrix(gridXform);
-            var map = TransformSystem.ToMapCoordinates(fromCoordinates);
-            fromCoordinates = new EntityCoordinates(gridUid.Value, Vector2.Transform(map.Position, gridInvMatrix));
-            angle -= gridRot;
-        }
-        else
-        {
-            angle -= TransformSystem.GetWorldRotation(fromXform);
-        }
-
-        if (distance >= 1f)
-        {
-            if (hitscan.MuzzleFlash != null)
-            {
-                var coords = fromCoordinates.Offset(angle.ToVec().Normalized() / 2);
-                var netCoords = GetNetCoordinates(coords);
-
-                sprites.Add((netCoords, angle, hitscan.MuzzleFlash, 1f));
-            }
-
-            if (hitscan.TravelFlash != null)
-            {
-                var coords = fromCoordinates.Offset(angle.ToVec() * (distance + 0.5f) / 2);
-                var netCoords = GetNetCoordinates(coords);
-
-                sprites.Add((netCoords, angle, hitscan.TravelFlash, distance - 1.5f));
-            }
-        }
-
-        if (hitscan.ImpactFlash != null)
-        {
-            var coords = fromCoordinates.Offset(angle.ToVec() * distance);
-            var netCoords = GetNetCoordinates(coords);
-
-            sprites.Add((netCoords, angle.FlipPositive(), hitscan.ImpactFlash, 1f));
-        }
-
-        if (sprites.Count > 0)
-        {
-            RaiseNetworkEvent(new HitscanEvent
-            {
-                Sprites = sprites,
-            }, Filter.Pvs(fromCoordinates, entityMan: EntityManager));
-        }
-    }
-
-    #endregion
 }
diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs
index acc36f0f8d..2de5dd0bfe 100644
--- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs
+++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs
@@ -25,9 +25,6 @@ public sealed class XAEPortalSystem : BaseXAESystem<XAEPortalComponent>
     /// <inheritdoc />
     protected override void OnActivated(Entity<XAEPortalComponent> ent, ref XenoArtifactNodeActivatedEvent args)
     {
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
         var map = Transform(ent).MapID;
         var validMinds = new ValueList<EntityUid>();
         var mindQuery = EntityQueryEnumerator<MindContainerComponent, MobStateComponent, TransformComponent, MetaDataComponent>();
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 885186f79c..a2cd1eb715 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -1,87 +1,25 @@
 using Content.Server.Body.Systems;
-using Content.Server.Popups;
-using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Body.Components;
-using Content.Shared.Damage;
-using Content.Shared.Power;
 using Content.Shared.Storage.Components;
-using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
 using Content.Shared.Xenoarchaeology.Equipment;
 using Content.Shared.Xenoarchaeology.Equipment.Components;
 using Robust.Shared.Collections;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Xenoarchaeology.Equipment.Systems;
 
 /// <inheritdoc/>
 public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly BodySystem _body = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly StackSystem _stack = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ArtifactCrusherComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerbs);
-        SubscribeLocalEvent<ArtifactCrusherComponent, PowerChangedEvent>(OnPowerChanged);
-    }
-
-    private void OnGetVerbs(Entity<ArtifactCrusherComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null || ent.Comp.Crushing)
-            return;
-
-        if (!TryComp<EntityStorageComponent>(ent, out var entityStorageComp) ||
-            entityStorageComp.Contents.ContainedEntities.Count == 0)
-            return;
-
-        if (!this.IsPowered(ent, EntityManager))
-            return;
-
-        var verb = new AlternativeVerb
-        {
-            Text = Loc.GetString("artifact-crusher-verb-start-crushing"),
-            Priority = 2,
-            Act = () => StartCrushing((ent, ent.Comp, entityStorageComp))
-        };
-        args.Verbs.Add(verb);
-    }
-
-    private void OnPowerChanged(Entity<ArtifactCrusherComponent> ent, ref PowerChangedEvent args)
-    {
-        if (!args.Powered)
-            StopCrushing(ent);
-    }
-
-    public void StartCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent)
-    {
-        var (uid, crusher, _) = ent;
-
-        if (crusher.Crushing)
-            return;
-
-        if (crusher.AutoLock)
-            _popup.PopupEntity(Loc.GetString("artifact-crusher-autolocks-enable"), uid);
-
-        crusher.Crushing = true;
-        crusher.NextSecond = _timing.CurTime + TimeSpan.FromSeconds(1);
-        crusher.CrushEndTime = _timing.CurTime + crusher.CrushDuration;
-        crusher.CrushingSoundEntity = AudioSystem.PlayPvs(crusher.CrushingSound, ent);
-        Appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, true);
-        Dirty(ent, ent.Comp1);
-    }
-
-    public void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent)
+    // TODO: Move to shared once StackSystem spawning is in Shared and we have RandomPredicted
+    public override void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent)
     {
         var (_, crusher, storage) = ent;
         StopCrushing((ent, ent.Comp1), false);
@@ -96,7 +34,7 @@ public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
             if (_whitelistSystem.IsWhitelistPass(crusher.CrushingWhitelist, contained))
             {
                 var amount = _random.Next(crusher.MinFragments, crusher.MaxFragments);
-                var stacks = _stack.SpawnMultiple(crusher.FragmentStackProtoId, amount, coords);
+                var stacks = _stack.SpawnMultipleAtPosition(crusher.FragmentStackProtoId, amount, coords);
                 foreach (var stack in stacks)
                 {
                     ContainerSystem.Insert((stack, null, null, null), crusher.OutputContainer);
@@ -113,32 +51,4 @@ public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
             }
         }
     }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<ArtifactCrusherComponent, EntityStorageComponent>();
-        while (query.MoveNext(out var uid, out var crusher, out var storage))
-        {
-            if (!crusher.Crushing)
-                continue;
-
-            if (crusher.NextSecond < _timing.CurTime)
-            {
-                var contents = new ValueList<EntityUid>(storage.Contents.ContainedEntities);
-                foreach (var contained in contents)
-                {
-                    _damageable.TryChangeDamage(contained, crusher.CrushingDamage);
-                }
-                crusher.NextSecond += TimeSpan.FromSeconds(1);
-                Dirty(uid, crusher);
-            }
-
-            if (crusher.CrushEndTime < _timing.CurTime)
-            {
-                FinishCrushing((uid, crusher, storage));
-            }
-        }
-    }
 }
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 5ad1f27d25..f5b94deee4 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -13,7 +13,6 @@ using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Server.Speech.Components;
-using Content.Server.Temperature.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Chat;
 using Content.Shared.CombatMode;
@@ -45,6 +44,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Content.Shared.NPC.Prototypes;
 using Content.Shared.Roles;
+using Content.Shared.Temperature.Components;
 
 namespace Content.Server.Zombies;
 
@@ -157,7 +157,6 @@ public sealed partial class ZombieSystem
         var combat = EnsureComp<CombatModeComponent>(target);
         RemComp<PacifiedComponent>(target);
         _combat.SetCanDisarm(target, false, combat);
-        _combat.SetInCombatMode(target, true, combat);
 
         //This is the actual damage of the zombie. We assign the visual appearance
         //and range here because of stuff we'll find out later
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index 5107a87c2a..d4f86fa96c 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -10,6 +10,7 @@ using Content.Shared.Anomaly.Components;
 using Content.Shared.Armor;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Cloning.Events;
+using Content.Shared.Chat;
 using Content.Shared.Damage;
 using Content.Shared.Humanoid;
 using Content.Shared.Inventory;
@@ -235,43 +236,47 @@ namespace Content.Server.Zombies
             return MathF.Max(chance, zombieComponent.MinZombieInfectionChance);
         }
 
-        private void OnMeleeHit(EntityUid uid, ZombieComponent component, MeleeHitEvent args)
+        private void OnMeleeHit(Entity<ZombieComponent> entity, ref MeleeHitEvent args)
         {
-            if (!TryComp<ZombieComponent>(args.User, out _))
+            if (!args.IsHit)
                 return;
 
-            if (!args.HitEntities.Any())
-                return;
+            var cannotSpread = HasComp<NonSpreaderZombieComponent>(args.User);
 
-            foreach (var entity in args.HitEntities)
+            foreach (var uid in args.HitEntities)
             {
-                if (args.User == entity)
+                if (args.User == uid)
                     continue;
 
-                if (!TryComp<MobStateComponent>(entity, out var mobState))
+                if (!TryComp<MobStateComponent>(uid, out var mobState))
                     continue;
 
-                if (HasComp<ZombieComponent>(entity))
+                if (HasComp<ZombieComponent>(uid) || HasComp<IncurableZombieComponent>(uid))
                 {
-                    args.BonusDamage = -args.BaseDamage;
+                    // Don't infect, don't deal damage, do not heal from bites, don't pass go!
+                    args.Handled = true;
+                    continue;
+                }
+
+                if (_mobState.IsAlive(uid, mobState))
+                {
+                    _damageable.TryChangeDamage(args.User, entity.Comp.HealingOnBite, true, false);
+
+                    // If we cannot infect the living target, the zed will just heal itself.
+                    if (HasComp<ZombieImmuneComponent>(uid) || cannotSpread || _random.Prob(GetZombieInfectionChance(uid, entity.Comp)))
+                        continue;
+
+                    EnsureComp<PendingZombieComponent>(uid);
+                    EnsureComp<ZombifyOnDeathComponent>(uid);
                 }
                 else
                 {
-                    if (!HasComp<ZombieImmuneComponent>(entity) && !HasComp<NonSpreaderZombieComponent>(args.User) && _random.Prob(GetZombieInfectionChance(entity, component)))
-                    {
-                        EnsureComp<PendingZombieComponent>(entity);
-                        EnsureComp<ZombifyOnDeathComponent>(entity);
-                    }
-                }
+                    if (HasComp<ZombieImmuneComponent>(uid) || cannotSpread)
+                        continue;
 
-                if (_mobState.IsIncapacitated(entity, mobState) && !HasComp<ZombieComponent>(entity) && !HasComp<ZombieImmuneComponent>(entity))
-                {
-                    ZombifyEntity(entity);
-                    args.BonusDamage = -args.BaseDamage;
-                }
-                else if (mobState.CurrentState == MobState.Alive) //heals when zombies bite live entities
-                {
-                    _damageable.TryChangeDamage(uid, component.HealingOnBite, true, false);
+                    // If the target is dead and can be infected, infect.
+                    ZombifyEntity(uid);
+                    args.Handled = true;
                 }
             }
         }
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index 58a41a5f7a..d905cc03ae 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -81,9 +81,9 @@ public enum LogType
     ChemicalReaction = 17,
 
     /// <summary>
-    /// Reagent effects related interactions.
+    /// EntityEffect related interactions.
     /// </summary>
-    ReagentEffect = 18,
+    EntityEffect = 18,
 
     /// <summary>
     /// Canister valve was opened or closed.
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 801bfd4b1d..f8c6d49244 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -10,6 +10,7 @@ using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
 using Content.Shared.Localizations;
+using Content.Shared.Lock;
 using Content.Shared.NameIdentifier;
 using Content.Shared.PDA;
 using Content.Shared.StationRecords;
@@ -44,6 +45,8 @@ public sealed class AccessReaderSystem : EntitySystem
         SubscribeLocalEvent<AccessReaderComponent, GotEmaggedEvent>(OnEmagged);
         SubscribeLocalEvent<AccessReaderComponent, LinkAttemptEvent>(OnLinkAttempt);
         SubscribeLocalEvent<AccessReaderComponent, AccessReaderConfigurationAttemptEvent>(OnConfigurationAttempt);
+        SubscribeLocalEvent<AccessReaderComponent, FindAvailableLocksEvent>(OnFindAvailableLocks);
+        SubscribeLocalEvent<AccessReaderComponent, CheckUserHasLockAccessEvent>(OnCheckLockAccess);
 
         SubscribeLocalEvent<AccessReaderComponent, ComponentGetState>(OnGetState);
         SubscribeLocalEvent<AccessReaderComponent, ComponentHandleState>(OnHandleState);
@@ -169,6 +172,22 @@ public sealed class AccessReaderSystem : EntitySystem
         ent.Comp.AccessListsOriginal ??= new(ent.Comp.AccessLists);
     }
 
+    private void OnFindAvailableLocks(Entity<AccessReaderComponent> ent, ref FindAvailableLocksEvent args)
+    {
+        args.FoundReaders |= LockTypes.Access;
+    }
+
+    private void OnCheckLockAccess(Entity<AccessReaderComponent> ent, ref CheckUserHasLockAccessEvent args)
+    {
+        // Are we looking for an access lock?
+        if (!args.FoundReaders.HasFlag(LockTypes.Access))
+            return;
+
+        // If the user has access to this lock, we pass it into the event.
+        if (IsAllowed(args.User, ent))
+            args.HasAccess |= LockTypes.Access;
+    }
+
     /// <summary>
     /// Searches the source for access tags
     /// then compares it with the all targets accesses to see if it is allowed.
diff --git a/Content.Server/Administration/Systems/RejuvenateSystem.cs b/Content.Shared/Administration/Systems/RejuvenateSystem.cs
similarity index 54%
rename from Content.Server/Administration/Systems/RejuvenateSystem.cs
rename to Content.Shared/Administration/Systems/RejuvenateSystem.cs
index d25db20bd9..d27ea63ace 100644
--- a/Content.Server/Administration/Systems/RejuvenateSystem.cs
+++ b/Content.Shared/Administration/Systems/RejuvenateSystem.cs
@@ -1,9 +1,12 @@
 using Content.Shared.Rejuvenate;
 
-namespace Content.Server.Administration.Systems;
+namespace Content.Shared.Administration.Systems;
 
 public sealed class RejuvenateSystem : EntitySystem
 {
+    /// <summary>
+    /// Fully heals the target, removing all damage, debuffs or other negative status effects.
+    /// </summary>
     public void PerformRejuvenate(EntityUid target)
     {
         RaiseLocalEvent(target, new RejuvenateEvent());
diff --git a/Content.Shared/Body/Components/LungComponent.cs b/Content.Shared/Body/Components/LungComponent.cs
index dd31de7722..ab1869f8b1 100644
--- a/Content.Shared/Body/Components/LungComponent.cs
+++ b/Content.Shared/Body/Components/LungComponent.cs
@@ -22,7 +22,7 @@ public sealed partial class LungComponent : Component
     /// The name/key of the solution on this entity which these lungs act on.
     /// </summary>
     [DataField]
-    public string SolutionName = LungSystem.LungSolutionName;
+    public string SolutionName = "Lung";
 
     /// <summary>
     /// The solution on this entity that these lungs act on.
diff --git a/Content.Shared/Body/Components/StomachComponent.cs b/Content.Shared/Body/Components/StomachComponent.cs
index 1b2f587824..ca20cc544a 100644
--- a/Content.Shared/Body/Components/StomachComponent.cs
+++ b/Content.Shared/Body/Components/StomachComponent.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Body.Components
 {
-    [RegisterComponent, NetworkedComponent, Access(typeof(StomachSystem), typeof(FoodSystem))]
+    [RegisterComponent, NetworkedComponent, Access(typeof(StomachSystem))]
     public sealed partial class StomachComponent : Component
     {
         /// <summary>
diff --git a/Content.Shared/Body/Systems/LungSystem.cs b/Content.Shared/Body/Systems/LungSystem.cs
index 5f4c1ee4ef..a097a7752a 100644
--- a/Content.Shared/Body/Systems/LungSystem.cs
+++ b/Content.Shared/Body/Systems/LungSystem.cs
@@ -1,11 +1,14 @@
+using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Body.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Atmos;
+using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Clothing;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Inventory.Events;
+using Robust.Shared.Prototypes;
+using BreathToolComponent = Content.Shared.Atmos.Components.BreathToolComponent;
+using InternalsComponent = Content.Shared.Body.Components.InternalsComponent;
 
 namespace Content.Shared.Body.Systems;
 
@@ -15,8 +18,6 @@ public sealed class LungSystem : EntitySystem
     [Dependency] private readonly SharedInternalsSystem _internals = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
-    public static string LungSolutionName = "Lung";
-
     public override void Initialize()
     {
         base.Initialize();
@@ -53,6 +54,7 @@ public sealed class LungSystem : EntitySystem
         }
     }
 
+    // TODO: JUST METABOLIZE GASES DIRECTLY DON'T CONVERT TO REAGENTS!!! (Needs Metabolism refactor :B)
     public void GasToReagent(EntityUid uid, LungComponent lung)
     {
         if (!_solutionContainerSystem.ResolveSolution(uid, lung.SolutionName, ref lung.Solution, out var solution))
diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
index 3b46d3913c..693eede7d8 100644
--- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
+++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
@@ -6,7 +6,8 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
-using Content.Shared.EntityEffects.Effects;
+using Content.Shared.EntityEffects.Effects.Solution;
+using Content.Shared.EntityEffects.Effects.Transform;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;
 using Content.Shared.Forensics.Components;
@@ -149,7 +150,9 @@ public abstract class SharedBloodstreamSystem : EntitySystem
         {
             switch (effect)
             {
-                case CreateEntityReactionEffect: // Prevent entities from spawning in the bloodstream
+                // TODO: Rather than this, ReactionAttempt should allow systems to remove effects from the list before the reaction.
+                // TODO: I think there's a PR up on the repo for this and if there isn't I'll make one -Princess
+                case EntityEffects.Effects.EntitySpawning.SpawnEntity: // Prevent entities from spawning in the bloodstream
                 case AreaReactionEffect: // No spontaneous smoke or foam leaking out of blood vessels.
                     args.Cancelled = true;
                     return;
@@ -214,7 +217,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem
 
         // TODO: Replace with RandomPredicted once the engine PR is merged
         // Use both the receiver and the damage causing entity for the seed so that we have different results for multiple attacks in the same tick
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id, GetNetEntity(args.Origin)?.Id ?? 0 });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(ent).Id, GetNetEntity(args.Origin)?.Id ?? 0 );
         var rand = new System.Random(seed);
         var prob = Math.Clamp(totalFloat / 25, 0, 1);
         if (totalFloat > 0 && rand.Prob(prob))
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index 7dd4ea4d11..75680089fb 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -467,7 +467,7 @@ public abstract partial class SharedBuckleSystem
             // TODO: This is doing 4 moveevents this is why I left the warning in, if you're going to remove it make it only do 1 moveevent.
             if (strap.Comp.BuckleOffset != Vector2.Zero)
             {
-                buckleXform.Coordinates = oldBuckledXform.Coordinates.Offset(strap.Comp.BuckleOffset);
+                _transform.SetCoordinates(buckle, buckleXform, oldBuckledXform.Coordinates.Offset(strap.Comp.BuckleOffset));
             }
         }
 
diff --git a/Content.Shared/Cabinet/ItemCabinetSystem.cs b/Content.Shared/Cabinet/ItemCabinetSystem.cs
index 749065ac47..ea500aaeaa 100644
--- a/Content.Shared/Cabinet/ItemCabinetSystem.cs
+++ b/Content.Shared/Cabinet/ItemCabinetSystem.cs
@@ -37,7 +37,7 @@ public sealed class ItemCabinetSystem : EntitySystem
     private void OnMapInit(Entity<ItemCabinetComponent> ent, ref MapInitEvent args)
     {
         // update at mapinit to avoid copy pasting locked: true and locked: false for each closed/open prototype
-        SetSlotLock(ent, !_openable.IsOpen(ent));
+        SetSlotLock(ent, _openable.IsClosed(ent, null));
     }
 
     private void UpdateAppearance(Entity<ItemCabinetComponent> ent)
diff --git a/Content.Shared/Cargo/SharedCargoSystem.cs b/Content.Shared/Cargo/SharedCargoSystem.cs
index 8925ce0de1..9d044d1850 100644
--- a/Content.Shared/Cargo/SharedCargoSystem.cs
+++ b/Content.Shared/Cargo/SharedCargoSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Prototypes;
+using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
@@ -55,6 +56,151 @@ public abstract class SharedCargoSystem : EntitySystem
         }
         return distribution;
     }
+
+    /// <summary>
+    /// Returns information about the given bank account.
+    /// </summary>
+    /// <param name="station">Station to get bank account info from.</param>
+    /// <param name="accountPrototypeId">Bank account prototype ID to get info for.</param>
+    /// <param name="money">The amount of money in the account</param>
+    /// <returns>Whether or not the bank account exists.</returns>
+    public bool TryGetAccount(Entity<StationBankAccountComponent?> station, ProtoId<CargoAccountPrototype> accountPrototypeId, out int money)
+    {
+        money = 0;
+
+        if (!Resolve(station, ref station.Comp))
+            return false;
+
+        return station.Comp.Accounts.TryGetValue(accountPrototypeId, out money);
+    }
+
+    /// <summary>
+    /// Returns a readonly dictionary of all accounts and their money info.
+    /// </summary>
+    /// <param name="station">Station to get bank account info from.</param>
+    /// <returns>Whether or not the bank account exists.</returns>
+    public IReadOnlyDictionary<ProtoId<CargoAccountPrototype>, int> GetAccounts(Entity<StationBankAccountComponent?> station)
+    {
+        if (!Resolve(station, ref station.Comp))
+            return new Dictionary<ProtoId<CargoAccountPrototype>, int>();
+
+        return station.Comp.Accounts;
+    }
+
+    /// <summary>
+    /// Attempts to adjust the money of a certain bank account.
+    /// </summary>
+    /// <param name="station">Station where the bank account is from</param>
+    /// <param name="accountPrototypeId">the id of the bank account</param>
+    /// <param name="money">how much money to set the account to</param>
+    /// <param name="createAccount">Whether or not it should create the account if it doesn't exist.</param>
+    /// <param name="dirty">Whether to mark the bank account component as dirty.</param>
+    /// <returns>Whether or not setting the value succeeded.</returns>
+    public bool TryAdjustBankAccount(
+        Entity<StationBankAccountComponent?> station,
+        ProtoId<CargoAccountPrototype> accountPrototypeId,
+        int money,
+        bool createAccount = false,
+        bool dirty = true)
+    {
+        if (!Resolve(station, ref station.Comp))
+            return false;
+
+        var accounts = station.Comp.Accounts;
+
+        if (!accounts.ContainsKey(accountPrototypeId) && !createAccount)
+            return false;
+
+        accounts[accountPrototypeId] += money;
+        var ev = new BankBalanceUpdatedEvent(station, station.Comp.Accounts);
+        RaiseLocalEvent(station, ref ev, true);
+
+        if (!dirty)
+            return true;
+
+        Dirty(station);
+        return true;
+    }
+
+    /// <summary>
+    /// Attempts to set the money of a certain bank account.
+    /// </summary>
+    /// <param name="station">Station where the bank account is from</param>
+    /// <param name="accountPrototypeId">the id of the bank account</param>
+    /// <param name="money">how much money to set the account to</param>
+    /// <param name="createAccount">Whether or not it should create the account if it doesn't exist.</param>
+    /// <param name="dirty">Whether to mark the bank account component as dirty.</param>
+    /// <returns>Whether or not setting the value succeeded.</returns>
+    public bool TrySetBankAccount(
+        Entity<StationBankAccountComponent?> station,
+        ProtoId<CargoAccountPrototype> accountPrototypeId,
+        int money,
+        bool createAccount = false,
+        bool dirty = true)
+    {
+        if (!Resolve(station, ref station.Comp))
+            return false;
+
+        var accounts = station.Comp.Accounts;
+
+        if (!accounts.ContainsKey(accountPrototypeId) && !createAccount)
+            return false;
+
+        accounts[accountPrototypeId] = money;
+        var ev = new BankBalanceUpdatedEvent(station, station.Comp.Accounts);
+        RaiseLocalEvent(station, ref ev, true);
+
+        if (!dirty)
+            return true;
+
+        Dirty(station);
+        return true;
+    }
+
+    public void UpdateBankAccount(
+        Entity<StationBankAccountComponent?> ent,
+        int balanceAdded,
+        ProtoId<CargoAccountPrototype> account,
+        bool dirty = true)
+    {
+        UpdateBankAccount(
+            ent,
+            balanceAdded,
+            new Dictionary<ProtoId<CargoAccountPrototype>, double> { {account, 1} },
+            dirty: dirty);
+    }
+
+    /// <summary>
+    /// Adds or removes funds from the <see cref="StationBankAccountComponent"/>.
+    /// </summary>
+    /// <param name="ent">The station.</param>
+    /// <param name="balanceAdded">The amount of funds to add or remove.</param>
+    /// <param name="accountDistribution">The distribution between individual <see cref="CargoAccountPrototype"/>.</param>
+    /// <param name="dirty">Whether to mark the bank account component as dirty.</param>
+    [PublicAPI]
+    public void UpdateBankAccount(
+        Entity<StationBankAccountComponent?> ent,
+        int balanceAdded,
+        Dictionary<ProtoId<CargoAccountPrototype>, double> accountDistribution,
+        bool dirty = true)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        foreach (var (account, percent) in accountDistribution)
+        {
+            var accountBalancedAdded = (int) Math.Round(percent * balanceAdded);
+            ent.Comp.Accounts[account] += accountBalancedAdded;
+        }
+
+        var ev = new BankBalanceUpdatedEvent(ent, ent.Comp.Accounts);
+        RaiseLocalEvent(ent, ref ev, true);
+
+        if (!dirty)
+            return;
+
+        Dirty(ent);
+    }
 }
 
 [NetSerializable, Serializable]
diff --git a/Content.Shared/Chat/EmotesEvents.cs b/Content.Shared/Chat/EmotesEvents.cs
index 4479f8b2ab..196bbb43bd 100644
--- a/Content.Shared/Chat/EmotesEvents.cs
+++ b/Content.Shared/Chat/EmotesEvents.cs
@@ -1,9 +1,49 @@
-using Content.Shared.Chat.Prototypes;
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.Inventory;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chat;
 
+/// <summary>
+/// An event raised just before an emote is performed, providing systems with an opportunity to cancel the emote's performance.
+/// </summary>
+[ByRefEvent]
+public sealed class BeforeEmoteEvent(EntityUid source, EmotePrototype emote)
+    : CancellableEntityEventArgs, IInventoryRelayEvent
+{
+    public readonly EntityUid Source = source;
+    public readonly EmotePrototype Emote = emote;
+
+    /// <summary>
+    /// The equipment that is blocking emoting. Should only be non-null if the event was canceled.
+    /// </summary>
+    public EntityUid? Blocker = null;
+
+    public SlotFlags TargetSlots => SlotFlags.WITHOUT_POCKET;
+}
+
+/// <summary>
+/// Raised by the chat system when an entity made some emote.
+/// Use it to play sound, change sprite or something else.
+/// </summary>
+[ByRefEvent]
+public record struct EmoteEvent(EmotePrototype Emote)
+{
+    /// <summary>
+    /// The used emote.
+    /// </summary>
+    public EmotePrototype Emote = Emote;
+
+    /// <summary>
+    /// If this message has already been "handled" by a previous system.
+    /// </summary>
+    public bool Handled;
+}
+
+/// <summary>
+/// Sent by the client when requesting the server to play a specific emote selected from the emote radial menu.
+/// </summary>
 [Serializable, NetSerializable]
 public sealed class PlayEmoteMessage(ProtoId<EmotePrototype> protoId) : EntityEventArgs
 {
diff --git a/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs b/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs
index e6fdae4cf1..a3d6ccce7f 100644
--- a/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs
+++ b/Content.Shared/Chat/Prototypes/AutoEmotePrototype.cs
@@ -14,30 +14,44 @@ public sealed partial class AutoEmotePrototype : IPrototype
     /// The ID of the emote prototype.
     /// </summary>
     [DataField("emote", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
-    public string EmoteId = String.Empty;
+    public string EmoteId = string.Empty;
 
     /// <summary>
     /// How often an attempt at the emote will be made.
     /// </summary>
-    [DataField("interval", required: true)]
+    [DataField(required: true)]
     public TimeSpan Interval;
 
     /// <summary>
     /// Probability of performing the emote each interval.
-    /// <summary>
+    /// </summary>
     [DataField("chance")]
     public float Chance = 1;
 
     /// <summary>
     /// Also send the emote in chat.
-    /// <summary>
-    [DataField("withChat")]
+    /// </summary>
+    [DataField]
     public bool WithChat = true;
 
+    /// <summary>
+    /// Should we ignore action blockers?
+    /// This does nothing if WithChat is false.
+    /// </summary>
+    [DataField]
+    public bool IgnoreActionBlocker;
+
+    /// <summary>
+    /// Should we ignore whitelists and force the emote?
+    /// This does nothing if WithChat is false.
+    /// </summary>
+    [DataField]
+    public bool Force;
+
     /// <summary>
     /// Hide the chat message from the chat window, only showing the popup.
     /// This does nothing if WithChat is false.
-    /// <summary>
-    [DataField("hiddenFromChatWindow")]
-    public bool HiddenFromChatWindow = false;
+    /// </summary>
+    [DataField]
+    public bool HiddenFromChatWindow;
 }
diff --git a/Content.Shared/Chat/SharedChatEvents.cs b/Content.Shared/Chat/SharedChatEvents.cs
index c187fd59a8..dddb77ed6e 100644
--- a/Content.Shared/Chat/SharedChatEvents.cs
+++ b/Content.Shared/Chat/SharedChatEvents.cs
@@ -1,12 +1,13 @@
+using Content.Shared.Inventory;
+using Content.Shared.Radio;
 using Content.Shared.Speech;
 using Robust.Shared.Prototypes;
-using Content.Shared.Inventory;
 
 namespace Content.Shared.Chat;
 
 /// <summary>
-///     This event should be sent everytime an entity talks (Radio, local chat, etc...).
-///     The event is sent to both the entity itself, and all clothing (For stuff like voice masks).
+/// This event should be sent everytime an entity talks (Radio, local chat, etc...).
+/// The event is sent to both the entity itself, and all clothing (For stuff like voice masks).
 /// </summary>
 public sealed class TransformSpeakerNameEvent : EntityEventArgs, IInventoryRelayEvent
 {
@@ -22,3 +23,55 @@ public sealed class TransformSpeakerNameEvent : EntityEventArgs, IInventoryRelay
         SpeechVerb = null;
     }
 }
+
+/// <summary>
+/// Raised broadcast in order to transform speech.transmit
+/// </summary>
+public sealed class TransformSpeechEvent : EntityEventArgs
+{
+    public EntityUid Sender;
+    public string Message;
+
+    public TransformSpeechEvent(EntityUid sender, string message)
+    {
+        Sender = sender;
+        Message = message;
+    }
+}
+
+public sealed class CheckIgnoreSpeechBlockerEvent : EntityEventArgs
+{
+    public EntityUid Sender;
+    public bool IgnoreBlocker;
+
+    public CheckIgnoreSpeechBlockerEvent(EntityUid sender, bool ignoreBlocker)
+    {
+        Sender = sender;
+        IgnoreBlocker = ignoreBlocker;
+    }
+}
+
+/// <summary>
+/// Raised on an entity when it speaks, either through 'say' or 'whisper'.
+/// </summary>
+public sealed class EntitySpokeEvent : EntityEventArgs
+{
+    public readonly EntityUid Source;
+    public readonly string Message;
+    public readonly string? ObfuscatedMessage; // not null if this was a whisper
+
+    /// <summary>
+    /// If the entity was trying to speak into a radio, this was the channel they were trying to access. If a radio
+    /// message gets sent on this channel, this should be set to null to prevent duplicate messages.
+    /// </summary>
+    public RadioChannelPrototype? Channel;
+
+    public EntitySpokeEvent(EntityUid source, string message, RadioChannelPrototype? channel, string? obfuscatedMessage)
+    {
+        Source = source;
+        Message = message;
+        OriginalMessage = originalMessage; // Corvax-TTS: Spec symbol sanitize
+        Channel = channel;
+        ObfuscatedMessage = obfuscatedMessage;
+    }
+}
diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Shared/Chat/SharedChatSystem.Emote.cs
similarity index 68%
rename from Content.Server/Chat/Systems/ChatSystem.Emote.cs
rename to Content.Shared/Chat/SharedChatSystem.Emote.cs
index ee891e0870..d92a02a9de 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Shared/Chat/SharedChatSystem.Emote.cs
@@ -1,28 +1,15 @@
 using System.Collections.Frozen;
-using Content.Server.Popups;
 using Content.Shared.Chat.Prototypes;
-using Content.Shared.Emoting;
 using Content.Shared.Speech;
 using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Chat.Systems;
+namespace Content.Shared.Chat;
 
-// emotes using emote prototype
-public partial class ChatSystem
+public abstract partial class SharedChatSystem
 {
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-
     private FrozenDictionary<string, EmotePrototype> _wordEmoteDict = FrozenDictionary<string, EmotePrototype>.Empty;
 
-    protected override void OnPrototypeReload(PrototypesReloadedEventArgs obj)
-    {
-        base.OnPrototypeReload(obj);
-        if (obj.WasModified<EmotePrototype>())
-            CacheEmotes();
-    }
-
     private void CacheEmotes()
     {
         var dict = new Dictionary<string, EmotePrototype>();
@@ -47,15 +34,19 @@ public partial class ChatSystem
     }
 
     /// <summary>
-    ///     Makes selected entity to emote using <see cref="EmotePrototype"/> and sends message to chat.
+    /// Makes the selected entity emote using the given <see cref="EmotePrototype"/> and sends a message to chat.
     /// </summary>
     /// <param name="source">The entity that is speaking</param>
-    /// <param name="emoteId">The id of emote prototype. Should has valid <see cref="EmotePrototype.ChatMessages"/></param>
-    /// <param name="hideLog">Whether or not this message should appear in the adminlog window</param>
+    /// <param name="emoteId">The id of emote prototype. Should have valid <see cref="EmotePrototype.ChatMessages"/></param>
+    /// <param name="hideLog">Whether this message should appear in the adminlog window, or not.</param>
     /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
-    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
+    /// <param name="ignoreActionBlocker">Whether emote action blocking should be ignored or not.</param>
+    /// <param name="nameOverride">
+    /// The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>.
+    /// If this is set, the event will not get raised.
+    /// </param>
     /// <param name="forceEmote">Bypasses whitelist/blacklist/availibility checks for if the entity can use this emote</param>
-    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    /// <returns>True if an emote was performed. False if the emote is unavailable, cancelled, etc.</returns>
     public bool TryEmoteWithChat(
         EntityUid source,
         string emoteId,
@@ -64,24 +55,28 @@ public partial class ChatSystem
         string? nameOverride = null,
         bool ignoreActionBlocker = false,
         bool forceEmote = false
-        )
+    )
     {
-        if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
+        if (!_prototypeManager.Resolve<EmotePrototype>(emoteId, out var proto))
             return false;
+
         return TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker, forceEmote: forceEmote);
     }
 
     /// <summary>
-    ///     Makes selected entity to emote using <see cref="EmotePrototype"/> and sends message to chat.
+    /// Makes the selected entity emote using the given <see cref="EmotePrototype"/> and sends a message to chat.
     /// </summary>
-    /// <param name="source">The entity that is speaking</param>
-    /// <param name="emote">The emote prototype. Should has valid <see cref="EmotePrototype.ChatMessages"/></param>
-    /// <param name="hideLog">Whether or not this message should appear in the adminlog window</param>
-    /// <param name="hideChat">Whether or not this message should appear in the chat window</param>
+    /// <param name="source">The entity that is speaking.</param>
+    /// <param name="emote">The emote prototype. Should have valid <see cref="EmotePrototype.ChatMessages"/>.</param>
+    /// <param name="hideLog">Whether this message should appear in the adminlog window or not.</param>
+    /// <param name="ignoreActionBlocker">Whether emote action blocking should be ignored or not.</param>
     /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
-    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
+    /// <param name="nameOverride">
+    /// The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>.
+    /// If this is set, the event will not get raised.
+    /// </param>
     /// <param name="forceEmote">Bypasses whitelist/blacklist/availibility checks for if the entity can use this emote</param>
-    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    /// <returns>True if an emote was performed. False if the emote is unavailable, cancelled, etc.</returns>
     public bool TryEmoteWithChat(
         EntityUid source,
         EmotePrototype emote,
@@ -109,21 +104,21 @@ public partial class ChatSystem
     }
 
     /// <summary>
-    ///     Makes selected entity to emote using <see cref="EmotePrototype"/> without sending any messages to chat.
+    /// Makes the selected entity emote using the given <see cref="EmotePrototype"/> without sending any messages to chat.
     /// </summary>
-    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    /// <returns>True if an emote was performed. False if the emote is unavailable, cancelled, etc.</returns>
     public bool TryEmoteWithoutChat(EntityUid uid, string emoteId, bool ignoreActionBlocker = false)
     {
-        if (!_prototypeManager.TryIndex<EmotePrototype>(emoteId, out var proto))
+        if (!_prototypeManager.Resolve<EmotePrototype>(emoteId, out var proto))
             return false;
 
         return TryEmoteWithoutChat(uid, proto, ignoreActionBlocker);
     }
 
     /// <summary>
-    ///     Makes selected entity to emote using <see cref="EmotePrototype"/> without sending any messages to chat.
+    /// Makes the selected entity emote using the given <see cref="EmotePrototype"/> without sending any messages to chat.
     /// </summary>
-    /// <returns>True if an emote was performed. False if the emote is unvailable, cancelled, etc.</returns>
+    /// <returns>True if an emote was performed. False if the emote is unavailable, cancelled, etc.</returns>
     public bool TryEmoteWithoutChat(EntityUid uid, EmotePrototype proto, bool ignoreActionBlocker = false)
     {
         if (!_actionBlocker.CanEmote(uid) && !ignoreActionBlocker)
@@ -133,7 +128,7 @@ public partial class ChatSystem
     }
 
     /// <summary>
-    ///     Tries to find and play relevant emote sound in emote sounds collection.
+    /// Tries to find and play the relevant emote sound in an emote sounds collection.
     /// </summary>
     /// <returns>True if emote sound was played.</returns>
     public bool TryPlayEmoteSound(EntityUid uid, EmoteSoundsPrototype? proto, EmotePrototype emote, AudioParams? audioParams = null)
@@ -142,7 +137,7 @@ public partial class ChatSystem
     }
 
     /// <summary>
-    ///     Tries to find and play relevant emote sound in emote sounds collection.
+    /// Tries to find and play the relevant emote sound in an emote sounds collection.
     /// </summary>
     /// <returns>True if emote sound was played.</returns>
     public bool TryPlayEmoteSound(EntityUid uid, EmoteSoundsPrototype? proto, string emoteId, AudioParams? audioParams = null)
@@ -167,44 +162,27 @@ public partial class ChatSystem
     /// <summary>
     /// Checks if a valid emote was typed, to play sounds and etc and invokes an event.
     /// </summary>
-    /// <param name="uid"></param>
-    /// <param name="textInput"></param>
+    /// <param name="source">The entity that is speaking</param>
+    /// <param name="textInput">Formatted emote message.</param>
     /// <returns>True if the chat message should be displayed (because the emote was explicitly cancelled), false if it should not be.</returns>
-    private bool TryEmoteChatInput(EntityUid uid, string textInput)
+    protected bool TryEmoteChatInput(EntityUid source, string textInput)
     {
         var actionTrimmedLower = TrimPunctuation(textInput.ToLower());
         if (!_wordEmoteDict.TryGetValue(actionTrimmedLower, out var emote))
             return true;
 
-        if (!AllowedToUseEmote(uid, emote))
+        if (!AllowedToUseEmote(source, emote))
             return true;
 
-        return TryInvokeEmoteEvent(uid, emote);
+        return TryInvokeEmoteEvent(source, emote);
 
-        static string TrimPunctuation(string textInput)
-        {
-            var trimEnd = textInput.Length;
-            while (trimEnd > 0 && char.IsPunctuation(textInput[trimEnd - 1]))
-            {
-                trimEnd--;
-            }
-
-            var trimStart = 0;
-            while (trimStart < trimEnd && char.IsPunctuation(textInput[trimStart]))
-            {
-                trimStart++;
-            }
-
-            return textInput[trimStart..trimEnd];
-        }
     }
     /// <summary>
-    /// Checks if we can use this emote based on the emotes whitelist, blacklist, and availibility to the entity.
+    /// Checks if we can use this emote based on the emotes whitelist, blacklist, and availability to the entity.
     /// </summary>
     /// <param name="source">The entity that is speaking</param>
     /// <param name="emote">The emote being used</param>
-    /// <returns></returns>
-    private bool AllowedToUseEmote(EntityUid source, EmotePrototype emote)
+    public bool AllowedToUseEmote(EntityUid source, EmotePrototype emote)
     {
         // If emote is in AllowedEmotes, it will bypass whitelist and blacklist
         if (TryComp<SpeechComponent>(source, out var speech) &&
@@ -214,8 +192,8 @@ public partial class ChatSystem
         }
 
         // Check the whitelist and blacklist
-        if (_whitelistSystem.IsWhitelistFail(emote.Whitelist, source) ||
-            _whitelistSystem.IsBlacklistPass(emote.Blacklist, source))
+        if (_whitelist.IsWhitelistFail(emote.Whitelist, source) ||
+            _whitelist.IsBlacklistPass(emote.Blacklist, source))
         {
             return false;
         }
@@ -244,9 +222,13 @@ public partial class ChatSystem
 
         if (beforeEv.Cancelled)
         {
+            // Chat is not predicted anyways, so no need to predict this popup either.
+            if (_net.IsClient)
+                return false;
+
             if (beforeEv.Blocker != null)
             {
-                _popupSystem.PopupEntity(
+                _popup.PopupEntity(
                     Loc.GetString(
                         "chat-system-emote-cancelled-blocked",
                         ("emote", Loc.GetString(proto.Name).ToLower()),
@@ -258,7 +240,7 @@ public partial class ChatSystem
             }
             else
             {
-                _popupSystem.PopupEntity(
+                _popup.PopupEntity(
                     Loc.GetString("chat-system-emote-cancelled-generic",
                         ("emote", Loc.GetString(proto.Name).ToLower())),
                     uid,
@@ -274,20 +256,21 @@ public partial class ChatSystem
 
         return true;
     }
-}
 
-/// <summary>
-///     Raised by chat system when entity made some emote.
-///     Use it to play sound, change sprite or something else.
-/// </summary>
-[ByRefEvent]
-public sealed class EmoteEvent : HandledEntityEventArgs
-{
-    public readonly EmotePrototype Emote;
-
-    public EmoteEvent(EmotePrototype emote)
+    private string TrimPunctuation(string textInput)
     {
-        Emote = emote;
-        Handled = false;
+        var trimEnd = textInput.Length;
+        while (trimEnd > 0 && char.IsPunctuation(textInput[trimEnd - 1]))
+        {
+            trimEnd--;
+        }
+
+        var trimStart = 0;
+        while (trimStart < trimEnd && char.IsPunctuation(textInput[trimStart]))
+        {
+            trimStart++;
+        }
+
+        return textInput[trimStart..trimEnd];
     }
 }
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index 2738810365..b0fef0ac0d 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -1,15 +1,23 @@
 using System.Collections.Frozen;
 using System.Text.RegularExpressions;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Chat.Prototypes;
 using Content.Shared.Popups;
 using Content.Shared.Radio;
 using Content.Shared.Speech;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Console;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Chat;
 
-public abstract class SharedChatSystem : EntitySystem
+public abstract partial class SharedChatSystem : EntitySystem
 {
     public const char RadioCommonPrefix = ';';
     public const char RadioChannelPrefix = ':';
@@ -38,6 +46,11 @@ public abstract class SharedChatSystem : EntitySystem
 
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly INetManager _net = default!;
 
     /// <summary>
     /// Cache of the keycodes for faster lookup.
@@ -47,15 +60,21 @@ public abstract class SharedChatSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         DebugTools.Assert(_prototypeManager.HasIndex(CommonChannel));
+
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypeReload);
         CacheRadios();
+        CacheEmotes();
     }
 
     protected virtual void OnPrototypeReload(PrototypesReloadedEventArgs obj)
     {
         if (obj.WasModified<RadioChannelPrototype>())
             CacheRadios();
+
+        if (obj.WasModified<EmotePrototype>())
+            CacheEmotes();
     }
 
     private void CacheRadios()
@@ -293,4 +312,177 @@ public abstract class SharedChatSystem : EntitySystem
         tagStart += tag.Length + 2;
         return rawmsg.Substring(tagStart, tagEnd - tagStart);
     }
+
+    protected virtual void SendEntityEmote(
+        EntityUid source,
+        string action,
+        ChatTransmitRange range,
+        string? nameOverride,
+        bool hideLog = false,
+        bool checkEmote = true,
+        bool ignoreActionBlocker = false,
+        NetUserId? author = null
+        )
+    { }
+
+    /// <summary>
+    /// Sends an in-character chat message to relevant clients.
+    /// </summary>
+    /// <param name="source">The entity that is speaking.</param>
+    /// <param name="message">The message being spoken or emoted.</param>
+    /// <param name="desiredType">The chat type.</param>
+    /// <param name="hideChat">Whether or not this message should appear in the chat window.</param>
+    /// <param name="hideLog">Whether or not this message should appear in the adminlog window.</param>
+    /// <param name="shell"></param>
+    /// <param name="player">The player doing the speaking.</param>
+    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
+    /// <param name="checkRadioPrefix">Whether or not <paramref name="message"/> should be parsed with consideration of radio channel prefix text at start the start.</param>
+    /// <param name="ignoreActionBlocker">If set to true, action blocker will not be considered for whether an entity can send this message.</param>
+    public virtual void TrySendInGameICMessage(
+        EntityUid source,
+        string message,
+        InGameICChatType desiredType,
+        bool hideChat,
+        bool hideLog = false,
+        IConsoleShell? shell = null,
+        ICommonSession? player = null,
+        string? nameOverride = null,
+        bool checkRadioPrefix = true,
+        bool ignoreActionBlocker = false)
+    { }
+
+    /// <summary>
+    /// Sends an in-character chat message to relevant clients.
+    /// </summary>
+    /// <param name="source">The entity that is speaking.</param>
+    /// <param name="message">The message being spoken or emoted.</param>
+    /// <param name="desiredType">The chat type.</param>
+    /// <param name="range">Conceptual range of transmission, if it shows in the chat window, if it shows to far-away ghosts or ghosts at all...</param>
+    /// <param name="hideLog">Disables the admin log for this message if true. Used for entities that are not players, like vendors, cloning, etc.</param>
+    /// <param name="shell"></param>
+    /// <param name="player">The player doing the speaking.</param>
+    /// <param name="nameOverride">The name to use for the speaking entity. Usually this should just be modified via <see cref="TransformSpeakerNameEvent"/>. If this is set, the event will not get raised.</param>
+    /// <param name="ignoreActionBlocker">If set to true, action blocker will not be considered for whether an entity can send this message.</param>
+    public virtual void TrySendInGameICMessage(
+        EntityUid source,
+        string message,
+        InGameICChatType desiredType,
+        ChatTransmitRange range,
+        bool hideLog = false,
+        IConsoleShell? shell = null,
+        ICommonSession? player = null,
+        string? nameOverride = null,
+        bool checkRadioPrefix = true,
+        bool ignoreActionBlocker = false
+        )
+    { }
+
+    /// <summary>
+    /// Sends an out-of-character chat message to relevant clients.
+    /// </summary>
+    /// <param name="source">The entity that is speaking.</param>
+    /// <param name="message">The message being spoken or emoted.</param>
+    /// <param name="type">The chat type.</param>
+    /// <param name="hideChat">Whether or not to show the message in the chat window.</param>
+    /// <param name="shell"></param>
+    /// <param name="player">The player doing the speaking.</param>
+    public virtual void TrySendInGameOOCMessage(
+        EntityUid source,
+        string message,
+        InGameOOCChatType type,
+        bool hideChat,
+        IConsoleShell? shell = null,
+        ICommonSession? player = null
+        )
+    { }
+
+    /// <summary>
+    /// Dispatches an announcement to all.
+    /// </summary>
+    /// <param name="message">The contents of the message.</param>
+    /// <param name="sender">The sender (Communications Console in Communications Console Announcement).</param>
+    /// <param name="playSound">Play the announcement sound.</param>
+    /// <param name="announcementSound">Sound to play.</param>
+    /// <param name="colorOverride">Optional color for the announcement message.</param>
+    public virtual void DispatchGlobalAnnouncement(
+        string message,
+        string? sender = null,
+        bool playSound = true,
+        SoundSpecifier? announcementSound = null,
+        Color? colorOverride = null
+        )
+    { }
+
+    /// <summary>
+    /// Dispatches an announcement to players selected by filter.
+    /// </summary>
+    /// <param name="filter">Filter to select players who will recieve the announcement.</param>
+    /// <param name="message">The contents of the message.</param>
+    /// <param name="source">The entity making the announcement (used to determine the station).</param>
+    /// <param name="sender">The sender (Communications Console in Communications Console Announcement).</param>
+    /// <param name="playSound">Play the announcement sound.</param>
+    /// <param name="announcementSound">Sound to play.</param>
+    /// <param name="colorOverride">Optional color for the announcement message.</param>
+    public virtual void DispatchFilteredAnnouncement(
+        Filter filter,
+        string message,
+        EntityUid? source = null,
+        string? sender = null,
+        bool playSound = true,
+        SoundSpecifier? announcementSound = null,
+        Color? colorOverride = null)
+    { }
+
+    /// <summary>
+    /// Dispatches an announcement on a specific station.
+    /// </summary>
+    /// <param name="source">The entity making the announcement (used to determine the station).</param>
+    /// <param name="message">The contents of the message.</param>
+    /// <param name="sender">The sender (Communications Console in Communications Console Announcement).</param>
+    /// <param name="playDefaultSound">Play the announcement sound.</param>
+    /// <param name="announcementSound">Sound to play.</param>
+    /// <param name="colorOverride">Optional color for the announcement message.</param>
+    public virtual void DispatchStationAnnouncement(
+        EntityUid source,
+        string message,
+        string? sender = null,
+        bool playDefaultSound = true,
+        SoundSpecifier? announcementSound = null,
+        Color? colorOverride = null)
+    { }
+}
+
+/// <summary>
+/// Controls transmission of chat.
+/// </summary>
+public enum ChatTransmitRange : byte
+{
+    /// Acts normal, ghosts can hear across the map, etc.
+    Normal,
+    /// Normal but ghosts are still range-limited.
+    GhostRangeLimit,
+    /// Hidden from the chat window.
+    HideChat,
+    /// Ghosts can't hear or see it at all. Regular players can if in-range.
+    NoGhosts
+}
+
+/// <summary>
+/// InGame IC chat is for chat that is specifically ingame (not lobby) but is also in character, i.e. speaking.
+/// </summary>
+// ReSharper disable once InconsistentNaming
+public enum InGameICChatType : byte
+{
+    Speak,
+    Emote,
+    Whisper
+}
+
+/// <summary>
+/// InGame OOC chat is for chat that is specifically ingame (not lobby) but is OOC, like deadchat or LOOC.
+/// </summary>
+public enum InGameOOCChatType : byte
+{
+    Looc,
+    Dead
 }
diff --git a/Content.Shared/Chemistry/Components/DrainableSolutionComponent.cs b/Content.Shared/Chemistry/Components/DrainableSolutionComponent.cs
index 0a6ace0943..616f5a1299 100644
--- a/Content.Shared/Chemistry/Components/DrainableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/DrainableSolutionComponent.cs
@@ -3,8 +3,9 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Chemistry.Components;
 
 /// <summary>
-///     Denotes the solution that can be easily removed through any reagent container.
-///     Think pouring this or draining from a water tank.
+/// Denotes a specific solution contained within this entity that can can be
+/// easily "drained". This means things with taps/spigots, or easily poured
+/// items.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class DrainableSolutionComponent : Component
@@ -12,6 +13,12 @@ public sealed partial class DrainableSolutionComponent : Component
     /// <summary>
     /// Solution name that can be drained.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string Solution = "default";
+
+    /// <summary>
+    /// The drain doafter time required to transfer reagents from the solution.
+    /// </summary>
+    [DataField]
+    public TimeSpan DrainTime = TimeSpan.Zero;
 }
diff --git a/Content.Shared/Chemistry/Components/DumpableSolutionComponent.cs b/Content.Shared/Chemistry/Components/DumpableSolutionComponent.cs
index 43fbe137b6..5fab79b6b4 100644
--- a/Content.Shared/Chemistry/Components/DumpableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/DumpableSolutionComponent.cs
@@ -3,8 +3,11 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Chemistry.Components;
 
 /// <summary>
-///     Denotes the solution that can be easily dumped into (completely removed from the dumping container into this one)
-///     Think pouring a container fully into this.
+/// Denotes that there is a solution contained in this entity that can be
+/// easily dumped into (that is, completely removed from the dumping container
+/// into this one). Think pouring a container fully into this. The action for this is represented via drag & drop.
+///
+/// To represent it being possible to controllably pour volumes into the entity, see <see cref="RefillableSolutionComponent"/>.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class DumpableSolutionComponent : Component
@@ -12,12 +15,13 @@ public sealed partial class DumpableSolutionComponent : Component
     /// <summary>
     /// Solution name that can be dumped into.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string Solution = "default";
 
     /// <summary>
     /// Whether the solution can be dumped into infinitely.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    /// <remarks>Note that this is what makes the ChemMaster's buffer a stasis buffer as well!</remarks>
+    [DataField]
     public bool Unlimited = false;
 }
diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
index ca20e1c22f..e1e4f21101 100644
--- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
@@ -24,6 +24,13 @@ public sealed partial class HyposprayComponent : Component
     [DataField]
     public FixedPoint2 TransferAmount = FixedPoint2.New(5);
 
+    /// <summary>
+    /// The delay to draw reagents using the hypospray.
+    /// If set, <see cref="RefillableSolutionComponent"/> RefillTime should probably have the same value.
+    /// </summary>
+    [DataField]
+    public float DrawTime = 0f;
+
     /// <summary>
     ///     Sound that will be played when injecting.
     /// </summary>
diff --git a/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs b/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs
index 245b7398a7..41d6d42938 100644
--- a/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs
@@ -4,9 +4,11 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Chemistry.Components;
 
 /// <summary>
-///     Reagents that can be added easily. For example like
-///     pouring something into another beaker, glass, or into the gas
-///     tank of a car.
+/// Denotes that the entity has a solution contained which can be easily added
+/// to in controlled volumes. This should go on things that are meant to be refilled, including
+/// pouring things into a beaker. The action for this is represented via clicking.
+///
+/// To represent it being possible to just dump entire volumes at once into an entity, see <see cref="DumpableSolutionComponent"/>.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class RefillableSolutionComponent : Component
@@ -14,12 +16,18 @@ public sealed partial class RefillableSolutionComponent : Component
     /// <summary>
     /// Solution name that can added to easily.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string Solution = "default";
 
     /// <summary>
     /// The maximum amount that can be transferred to the solution at once
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public FixedPoint2? MaxRefill = null;
+
+    /// <summary>
+    /// The refill doafter time required to transfer reagents into the solution.
+    /// </summary>
+    [DataField]
+    public TimeSpan RefillTime = TimeSpan.Zero;
 }
diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs
index 38be03226d..2179469c08 100644
--- a/Content.Shared/Chemistry/Components/Solution.cs
+++ b/Content.Shared/Chemistry/Components/Solution.cs
@@ -37,7 +37,6 @@ namespace Content.Shared.Chemistry.Components
         ///     systems use this.
         /// </remarks>
         [DataField("maxVol")]
-        [ViewVariables(VVAccess.ReadWrite)]
         public FixedPoint2 MaxVolume { get; set; } = FixedPoint2.Zero;
 
         public float FillFraction => MaxVolume == 0 ? 1 : Volume.Float() / MaxVolume.Float();
@@ -45,8 +44,7 @@ namespace Content.Shared.Chemistry.Components
         /// <summary>
         ///     If reactions will be checked for when adding reagents to the container.
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("canReact")]
+        [DataField]
         public bool CanReact { get; set; } = true;
 
         /// <summary>
@@ -58,8 +56,7 @@ namespace Content.Shared.Chemistry.Components
         /// <summary>
         ///     The temperature of the reagents in the solution.
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("temperature")]
+        [DataField]
         public float Temperature { get; set; } = 293.15f;
 
         /// <summary>
@@ -100,7 +97,7 @@ namespace Content.Shared.Chemistry.Components
             _heatCapacity = 0;
             foreach (var (reagent, quantity) in Contents)
             {
-                _heatCapacity += (float) quantity *
+                _heatCapacity += (float)quantity *
                                     protoMan.Index<ReagentPrototype>(reagent.Prototype).SpecificHeat;
             }
 
@@ -148,7 +145,7 @@ namespace Content.Shared.Chemistry.Components
         /// </summary>
         /// <param name="prototype">The prototype ID of the reagent to add.</param>
         /// <param name="quantity">The quantity in milli-units.</param>
-        public Solution(string prototype, FixedPoint2 quantity, List<ReagentData>? data = null) : this()
+        public Solution([ForbidLiteral] string prototype, FixedPoint2 quantity, List<ReagentData>? data = null) : this()
         {
             AddReagent(new ReagentId(prototype, data), quantity);
         }
@@ -190,7 +187,7 @@ namespace Content.Shared.Chemistry.Components
         public void ValidateSolution()
         {
             // sandbox forbids: [Conditional("DEBUG")]
-    #if DEBUG
+#if DEBUG
             // Correct volume
             DebugTools.Assert(Contents.Select(x => x.Quantity).Sum() == Volume);
 
@@ -208,7 +205,7 @@ namespace Content.Shared.Chemistry.Components
                 UpdateHeatCapacity(null);
                 DebugTools.Assert(MathHelper.CloseTo(_heatCapacity, cur, tolerance: 0.01));
             }
-    #endif
+#endif
         }
 
         void ISerializationHooks.AfterDeserialization()
@@ -223,7 +220,7 @@ namespace Content.Shared.Chemistry.Components
                 MaxVolume = Volume;
         }
 
-        public bool ContainsPrototype(string prototype)
+        public bool ContainsPrototype([ForbidLiteral] string prototype)
         {
             foreach (var (reagent, _) in Contents)
             {
@@ -245,7 +242,7 @@ namespace Content.Shared.Chemistry.Components
             return false;
         }
 
-        public bool ContainsReagent(string reagentId, List<ReagentData>? data)
+        public bool ContainsReagent([ForbidLiteral] string reagentId, List<ReagentData>? data)
             => ContainsReagent(new(reagentId, data));
 
         public bool TryGetReagent(ReagentId id, out ReagentQuantity quantity)
@@ -352,7 +349,7 @@ namespace Content.Shared.Chemistry.Components
         /// </summary>
         /// <param name="prototype">The prototype ID of the reagent to add.</param>
         /// <param name="quantity">The quantity in milli-units.</param>
-        public void AddReagent(string prototype, FixedPoint2 quantity, bool dirtyHeatCap = true)
+        public void AddReagent([ForbidLiteral] string prototype, FixedPoint2 quantity, bool dirtyHeatCap = true)
             => AddReagent(new ReagentId(prototype, null), quantity, dirtyHeatCap);
 
         /// <summary>
@@ -673,6 +670,12 @@ namespace Content.Shared.Chemistry.Components
             return sol;
         }
 
+        /// <summary>
+        /// Splits a solution into two by moving reagents from the given solution into a new one.
+        /// This modifies the original solution.
+        /// </summary>
+        /// <param name="toTake">The quantity of this solution to remove.</param>
+        /// <returns>A new solution containing the removed reagents.</returns>
         public Solution SplitSolution(FixedPoint2 toTake)
         {
             if (toTake <= FixedPoint2.Zero)
@@ -690,7 +693,7 @@ namespace Content.Shared.Chemistry.Components
             var origVol = Volume;
             var effVol = Volume.Value;
             newSolution = new Solution(Contents.Count) { Temperature = Temperature };
-            var remaining = (long) toTake.Value;
+            var remaining = (long)toTake.Value;
 
             for (var i = Contents.Count - 1; i >= 0; i--) // iterate backwards because of remove swap.
             {
@@ -706,7 +709,7 @@ namespace Content.Shared.Chemistry.Components
                     continue;
                 }
 
-                var splitQuantity = FixedPoint2.FromCents((int) split);
+                var splitQuantity = FixedPoint2.FromCents((int)split);
                 var newQuantity = quantity - splitQuantity;
 
                 DebugTools.Assert(newQuantity >= 0);
@@ -753,7 +756,7 @@ namespace Content.Shared.Chemistry.Components
 
             var effVol = Volume.Value;
             Volume -= toTake;
-            var remaining = (long) toTake.Value;
+            var remaining = (long)toTake.Value;
             for (var i = Contents.Count - 1; i >= 0; i--)// iterate backwards because of remove swap.
             {
                 var (reagent, quantity) = Contents[i];
@@ -768,7 +771,7 @@ namespace Content.Shared.Chemistry.Components
                     continue;
                 }
 
-                var splitQuantity = FixedPoint2.FromCents((int) split);
+                var splitQuantity = FixedPoint2.FromCents((int)split);
                 var newQuantity = quantity - splitQuantity;
 
                 if (newQuantity > FixedPoint2.Zero)
diff --git a/Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
index 324858afd7..e179fb5f43 100644
--- a/Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
@@ -1,10 +1,10 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Hypospray.Events;
 using Content.Shared.Database;
+using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
 using Content.Shared.Forensics;
 using Content.Shared.IdentityManagement;
@@ -16,6 +16,7 @@ using Content.Shared.Timing;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.EntitySystems;
 
@@ -27,6 +28,7 @@ public sealed class HypospraySystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainers = default!;
     [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
 
     public override void Initialize()
     {
@@ -36,6 +38,7 @@ public sealed class HypospraySystem : EntitySystem
         SubscribeLocalEvent<HyposprayComponent, MeleeHitEvent>(OnAttack);
         SubscribeLocalEvent<HyposprayComponent, UseInHandEvent>(OnUseInHand);
         SubscribeLocalEvent<HyposprayComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleModeVerb);
+        SubscribeLocalEvent<HyposprayComponent, HyposprayDrawDoAfterEvent>(OnDrawDoAfter);
     }
 
     #region Ref events
@@ -63,6 +66,20 @@ public sealed class HypospraySystem : EntitySystem
         TryDoInject(entity, args.HitEntities[0], args.User);
     }
 
+    private void OnDrawDoAfter(Entity<HyposprayComponent> entity, ref HyposprayDrawDoAfterEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (entity.Comp.CanContainerDraw
+            && args.Target.HasValue
+            && !EligibleEntity(args.Target.Value, entity)
+            && _solutionContainers.TryGetDrawableSolution(args.Target.Value, out var drawableSolution, out _))
+        {
+            TryDraw(entity, args.Target.Value, drawableSolution.Value, args.User);
+        }
+    }
+
     #endregion
 
     #region Draw/Inject
@@ -73,7 +90,7 @@ public sealed class HypospraySystem : EntitySystem
             && !EligibleEntity(target, entity)
             && _solutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
         {
-            return TryDraw(entity, target, drawableSolution.Value, user);
+            return TryStartDraw(entity, target, drawableSolution.Value, user);
         }
 
         return TryDoInject(entity, target, user);
@@ -186,17 +203,37 @@ public sealed class HypospraySystem : EntitySystem
         return true;
     }
 
-    private bool TryDraw(Entity<HyposprayComponent> entity, EntityUid target, Entity<SolutionComponent> targetSolution, EntityUid user)
+    public bool TryStartDraw(Entity<HyposprayComponent> entity, EntityUid target, Entity<SolutionComponent> targetSolution, EntityUid user)
     {
-        if (!_solutionContainers.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln,
-                out var solution) || solution.AvailableVolume == 0)
+        if (!_solutionContainers.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln))
+            return false;
+
+        if (!TryGetDrawAmount(entity, target, targetSolution, user,  soln.Value, out _))
+            return false;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, user, entity.Comp.DrawTime, new HyposprayDrawDoAfterEvent(), entity, target)
+        {
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            NeedHand = true,
+            Hidden = true,
+        };
+
+        return _doAfter.TryStartDoAfter(doAfterArgs, out _);
+    }
+
+    private bool TryGetDrawAmount(Entity<HyposprayComponent> entity, EntityUid target, Entity<SolutionComponent> targetSolution, EntityUid user, Entity<SolutionComponent> solutionEntity, [NotNullWhen(true)] out FixedPoint2? amount)
+    {
+        amount = null;
+
+        if (solutionEntity.Comp.Solution.AvailableVolume == 0)
         {
             return false;
         }
 
         // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
         var realTransferAmount = FixedPoint2.Min(entity.Comp.TransferAmount, targetSolution.Comp.Solution.Volume,
-            solution.AvailableVolume);
+            solutionEntity.Comp.Solution.AvailableVolume);
 
         if (realTransferAmount <= 0)
         {
@@ -207,7 +244,19 @@ public sealed class HypospraySystem : EntitySystem
             return false;
         }
 
-        var removedSolution = _solutionContainers.Draw(target, targetSolution, realTransferAmount);
+        amount = realTransferAmount;
+        return true;
+    }
+
+    private bool TryDraw(Entity<HyposprayComponent> entity, EntityUid target, Entity<SolutionComponent> targetSolution, EntityUid user)
+    {
+        if (!_solutionContainers.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln))
+            return false;
+
+        if (!TryGetDrawAmount(entity, target, targetSolution, user, soln.Value, out var amount))
+            return false;
+
+        var removedSolution = _solutionContainers.Draw(target, targetSolution, amount.Value);
 
         if (!_solutionContainers.TryAddSolution(soln.Value, removedSolution))
         {
@@ -275,3 +324,6 @@ public sealed class HypospraySystem : EntitySystem
 
     #endregion
 }
+
+[Serializable, NetSerializable]
+public sealed partial class HyposprayDrawDoAfterEvent : SimpleDoAfterEvent {}
diff --git a/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
index 86f9ffa390..a40c28b586 100644
--- a/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
@@ -36,7 +36,7 @@ public sealed class ScoopableSolutionSystem : EntitySystem
             !_solution.TryGetRefillableSolution(beaker, out var target, out _))
             return false;
 
-        var scooped = _solutionTransfer.Transfer(user, ent, src.Value, beaker, target.Value, srcSolution.Volume);
+        var scooped = _solutionTransfer.Transfer(new SolutionTransferData(user, ent, src.Value, beaker, target.Value, srcSolution.Volume));
         if (scooped == 0)
             return false;
 
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 54210cf195..a245c0b606 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -588,7 +588,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     ///     Adds a solution to the container, if it can fully fit.
     /// </summary>
     /// <param name="targetUid">entity holding targetSolution</param>
-    ///  <param name="targetSolution">entity holding targetSolution</param>
+    /// <param name="targetSolution">entity holding targetSolution</param>
     /// <param name="toAdd">solution being added</param>
     /// <returns>If the solution could be added.</returns>
     public bool TryAddSolution(Entity<SolutionComponent> soln, Solution toAdd)
@@ -606,40 +606,44 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     }
 
     /// <summary>
-    ///     Adds as much of a solution to a container as can fit.
+    ///     Adds as much of a solution to a container as can fit and updates the container.
     /// </summary>
     /// <param name="targetUid">The entity containing <paramref cref="targetSolution"/></param>
     /// <param name="targetSolution">The solution being added to.</param>
-    /// <param name="toAdd">The solution being added to <paramref cref="targetSolution"/></param>
+    /// <param name="toAdd">The solution being added to <paramref cref="targetSolution"/>. This solution is not modified.</param>
     /// <returns>The quantity of the solution actually added.</returns>
     public FixedPoint2 AddSolution(Entity<SolutionComponent> soln, Solution toAdd)
     {
-        var (uid, comp) = soln;
-        var solution = comp.Solution;
+        var solution = soln.Comp.Solution;
 
         if (toAdd.Volume == FixedPoint2.Zero)
             return FixedPoint2.Zero;
 
         var quantity = FixedPoint2.Max(FixedPoint2.Zero, FixedPoint2.Min(toAdd.Volume, solution.AvailableVolume));
         if (quantity < toAdd.Volume)
-            TryTransferSolution(soln, toAdd, quantity);
+        {
+            // TODO: This should be made into a function that directly transfers reagents.
+            // Currently this is quite inefficient.
+            solution.AddSolution(toAdd.Clone().SplitSolution(quantity), PrototypeManager);
+        }
         else
-            ForceAddSolution(soln, toAdd);
+            solution.AddSolution(toAdd, PrototypeManager);
 
+        UpdateChemicals(soln);
         return quantity;
     }
 
     /// <summary>
     ///     Adds a solution to a container and updates the container.
+    ///     This can exceed the maximum volume of the solution added to.
     /// </summary>
     /// <param name="targetUid">The entity containing <paramref cref="targetSolution"/></param>
     /// <param name="targetSolution">The solution being added to.</param>
-    /// <param name="toAdd">The solution being added to <paramref cref="targetSolution"/></param>
+    /// <param name="toAdd">The solution being added to <paramref cref="targetSolution"/>. This solution is not modified.</param>
     /// <returns>Whether any reagents were added to the solution.</returns>
     public bool ForceAddSolution(Entity<SolutionComponent> soln, Solution toAdd)
     {
-        var (uid, comp) = soln;
-        var solution = comp.Solution;
+        var solution = soln.Comp.Solution;
 
         if (toAdd.Volume == FixedPoint2.Zero)
             return false;
@@ -707,6 +711,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     }
 
     // Thermal energy and temperature management.
+    // TODO: ENERGY CONSERVATION!!! Nuke this once we have HeatContainers and use methods which properly conserve energy and model heat transfer correctly!
 
     #region Thermal Energy and Temperature
 
@@ -763,6 +768,26 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         UpdateChemicals(soln);
     }
 
+    /// <summary>
+    /// Same as <see cref="AddThermalEnergy"/> but clamps the value between two temperature values.
+    /// </summary>
+    /// <param name="soln">Solution we're adjusting the energy of</param>
+    /// <param name="thermalEnergy">Thermal energy we're adding or removing</param>
+    /// <param name="min">Min desired temperature</param>
+    /// <param name="max">Max desired temperature</param>
+    public void AddThermalEnergyClamped(Entity<SolutionComponent> soln, float thermalEnergy, float min, float max)
+    {
+        var solution = soln.Comp.Solution;
+
+        if (thermalEnergy == 0.0f)
+            return;
+
+        var heatCap = solution.GetHeatCapacity(PrototypeManager);
+        var deltaT = thermalEnergy / heatCap;
+        solution.Temperature = Math.Clamp(solution.Temperature + deltaT, min, max);
+        UpdateChemicals(soln);
+    }
+
     #endregion Thermal Energy and Temperature
 
     #region Event Handlers
diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
index b0f55a3272..4d78ab4647 100644
--- a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
@@ -1,19 +1,19 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Database;
+using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.EntitySystems;
 
 /// <summary>
-/// Allows an entity to transfer solutions with a customizable amount per click.
-/// Also provides <see cref="Transfer"/> API for other systems.
+/// Allows an entity to transfer solutions with a customizable amount -per click-.
+/// Also provides <see cref="Transfer"/>, <see cref="RefillTransfer"/> and <see cref="DrainTransfer"/> API for other systems.
 /// </summary>
 public sealed class SolutionTransferSystem : EntitySystem
 {
@@ -21,6 +21,10 @@ public sealed class SolutionTransferSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
     [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+
+    private EntityQuery<RefillableSolutionComponent> _refillableQuery;
+    private EntityQuery<DrainableSolutionComponent> _drainableQuery;
 
     /// <summary>
     ///     Default transfer amounts for the set-transfer verb.
@@ -32,28 +36,18 @@ public sealed class SolutionTransferSystem : EntitySystem
         base.Initialize();
 
         SubscribeLocalEvent<SolutionTransferComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
-        SubscribeLocalEvent<SolutionTransferComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<SolutionTransferComponent, TransferAmountSetValueMessage>(OnTransferAmountSetValueMessage);
-    }
+        SubscribeLocalEvent<SolutionTransferComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<SolutionTransferComponent, SolutionDrainTransferDoAfterEvent>(OnSolutionDrainTransferDoAfter);
+        SubscribeLocalEvent<SolutionTransferComponent, SolutionRefillTransferDoAfterEvent>(OnSolutionFillTransferDoAfter);
 
-    private void OnTransferAmountSetValueMessage(Entity<SolutionTransferComponent> ent, ref TransferAmountSetValueMessage message)
-    {
-        var (uid, comp) = ent;
-
-        var newTransferAmount = FixedPoint2.Clamp(message.Value, comp.MinimumTransferAmount, comp.MaximumTransferAmount);
-        comp.TransferAmount = newTransferAmount;
-
-        if (message.Actor is { Valid: true } user)
-            _popup.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), uid, user);
-
-        Dirty(uid, comp);
+        _refillableQuery = GetEntityQuery<RefillableSolutionComponent>();
+        _drainableQuery = GetEntityQuery<DrainableSolutionComponent>();
     }
 
     private void AddSetTransferVerbs(Entity<SolutionTransferComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
     {
-        var (uid, comp) = ent;
-
-        if (!args.CanAccess || !args.CanInteract || !comp.CanChangeTransferAmount || args.Hands == null)
+        if (!args.CanAccess || !args.CanInteract || !ent.Comp.CanChangeTransferAmount || args.Hands == null)
             return;
 
         // Custom transfer verb
@@ -66,7 +60,7 @@ public sealed class SolutionTransferSystem : EntitySystem
             // TODO: remove server check when bui prediction is a thing
             Act = () =>
             {
-                _ui.OpenUi(uid, TransferAmountUiKey.Key, @event.User);
+                _ui.OpenUi(ent.Owner, TransferAmountUiKey.Key, @event.User);
             },
             Priority = 1
         });
@@ -76,7 +70,7 @@ public sealed class SolutionTransferSystem : EntitySystem
         var user = args.User;
         foreach (var amount in DefaultTransferAmounts)
         {
-          if (amount < comp.MinimumTransferAmount || amount > comp.MaximumTransferAmount)
+            if (amount < ent.Comp.MinimumTransferAmount || amount > ent.Comp.MaximumTransferAmount)
                 continue;
 
             AlternativeVerb verb = new();
@@ -84,11 +78,11 @@ public sealed class SolutionTransferSystem : EntitySystem
             verb.Category = VerbCategory.SetTransferAmount;
             verb.Act = () =>
             {
-                comp.TransferAmount = amount;
+                ent.Comp.TransferAmount = amount;
 
-                _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), uid, user);
+                _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), ent.Owner, user);
 
-                Dirty(uid, comp);
+                Dirty(ent.Owner, ent.Comp);
             };
 
             // we want to sort by size, not alphabetically by the verb text.
@@ -99,117 +93,301 @@ public sealed class SolutionTransferSystem : EntitySystem
         }
     }
 
+    private void OnTransferAmountSetValueMessage(Entity<SolutionTransferComponent> ent, ref TransferAmountSetValueMessage message)
+    {
+        var newTransferAmount = FixedPoint2.Clamp(message.Value, ent.Comp.MinimumTransferAmount, ent.Comp.MaximumTransferAmount);
+        ent.Comp.TransferAmount = newTransferAmount;
+
+        if (message.Actor is { Valid: true } user)
+            _popup.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", newTransferAmount)), ent.Owner, user);
+
+        Dirty(ent.Owner, ent.Comp);
+    }
+
     private void OnAfterInteract(Entity<SolutionTransferComponent> ent, ref AfterInteractEvent args)
     {
         if (!args.CanReach || args.Target is not {} target)
             return;
 
-        var (uid, comp) = ent;
+        // We have two cases for interaction:
+        // Held Drainable --> Target Refillable
+        // Held Refillable <-- Target Drainable
 
-        //Special case for reagent tanks, because normally clicking another container will give solution, not take it.
-        if (comp.CanReceive
-            && !HasComp<RefillableSolutionComponent>(target) // target must not be refillable (e.g. Reagent Tanks)
-            && _solution.TryGetDrainableSolution(target, out var targetSoln, out _) // target must be drainable
-            && TryComp<RefillableSolutionComponent>(uid, out var refill)
-            && _solution.TryGetRefillableSolution((uid, refill, null), out var ownerSoln, out var ownerRefill))
+        // In the case where the target has both Refillable and Drainable, Held --> Target takes priority.
+
+        if (ent.Comp.CanSend
+            && _drainableQuery.TryComp(ent.Owner, out var heldDrainable)
+            && _refillableQuery.TryComp(target, out var targetRefillable)
+            && TryGetTransferrableSolutions((ent.Owner, heldDrainable),
+                (target, targetRefillable),
+                out var ownerSoln,
+                out var targetSoln,
+                out _))
         {
-            var transferAmount = comp.TransferAmount; // This is the player-configurable transfer amount of "uid," not the target reagent tank.
+            args.Handled = true; //If we reach this point, the interaction counts as handled.
 
-            // if the receiver has a smaller transfer limit, use that instead
-            if (refill?.MaxRefill is {} maxRefill)
+            var transferAmount = ent.Comp.TransferAmount;
+            if (targetRefillable.MaxRefill is {} maxRefill)
                 transferAmount = FixedPoint2.Min(transferAmount, maxRefill);
 
-            var transferred = Transfer(args.User, target, targetSoln.Value, uid, ownerSoln.Value, transferAmount);
-            args.Handled = true;
-            if (transferred > 0)
-            {
-                var toTheBrim = ownerRefill.AvailableVolume == 0;
-                var msg = toTheBrim
-                    ? "comp-solution-transfer-fill-fully"
-                    : "comp-solution-transfer-fill-normal";
+            var transferData = new SolutionTransferData(args.User, ent.Owner, ownerSoln.Value, target, targetSoln.Value, transferAmount);
+            var transferTime = targetRefillable.RefillTime + heldDrainable.DrainTime;
 
-                _popup.PopupClient(Loc.GetString(msg, ("owner", args.Target), ("amount", transferred), ("target", uid)), uid, args.User);
-                return;
+            if (transferTime > TimeSpan.Zero)
+            {
+                if (!CanTransfer(transferData))
+                    return;
+
+                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, transferTime, new SolutionDrainTransferDoAfterEvent(transferAmount), ent.Owner, target)
+                {
+                    BreakOnDamage = true,
+                    BreakOnMove = true,
+                    NeedHand = true,
+                    Hidden = true,
+                };
+                _doAfter.TryStartDoAfter(doAfterArgs);
             }
+            else
+            {
+                DrainTransfer(transferData);
+            }
+
+            return;
         }
 
-        // if target is refillable, and owner is drainable
-        if (comp.CanSend
-            && TryComp<RefillableSolutionComponent>(target, out var targetRefill)
-            && _solution.TryGetRefillableSolution((target, targetRefill, null), out targetSoln, out _)
-            && _solution.TryGetDrainableSolution(uid, out ownerSoln, out _))
+        if (ent.Comp.CanReceive
+            && _refillableQuery.TryComp(ent.Owner, out var heldRefillable)
+            && _drainableQuery.TryComp(target, out var targetDrainable)
+            && TryGetTransferrableSolutions((target, targetDrainable),
+                (ent.Owner, heldRefillable),
+                out targetSoln,
+                out ownerSoln,
+                out var solution))
         {
-            var transferAmount = comp.TransferAmount;
+            args.Handled = true; //If we reach this point, the interaction counts as handled.
 
-            if (targetRefill?.MaxRefill is {} maxRefill)
+            var transferAmount = ent.Comp.TransferAmount; // This is the player-configurable transfer amount of "uid," not the target drainable.
+            if (heldRefillable.MaxRefill is {} maxRefill) // if the receiver has a smaller transfer limit, use that instead
                 transferAmount = FixedPoint2.Min(transferAmount, maxRefill);
 
-            var transferred = Transfer(args.User, uid, ownerSoln.Value, target, targetSoln.Value, transferAmount);
-            args.Handled = true;
-            if (transferred > 0)
+            var transferData = new SolutionTransferData(args.User, target, targetSoln.Value, ent.Owner, ownerSoln.Value, transferAmount);
+            var transferTime = heldRefillable.RefillTime + targetDrainable.DrainTime;
+
+            if (transferTime > TimeSpan.Zero)
             {
-                var message = Loc.GetString("comp-solution-transfer-transfer-solution", ("amount", transferred), ("target", target));
-                _popup.PopupClient(message, uid, args.User);
+                if (!CanTransfer(transferData))
+                    return;
+
+                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, transferTime, new SolutionRefillTransferDoAfterEvent(transferAmount), ent.Owner, target)
+                {
+                    BreakOnDamage = true,
+                    BreakOnMove = true,
+                    NeedHand = true,
+                    Hidden = true,
+                };
+                _doAfter.TryStartDoAfter(doAfterArgs);
+            }
+            else
+            {
+                RefillTransfer(transferData, solution);
             }
         }
     }
 
+    private void OnSolutionDrainTransferDoAfter(Entity<SolutionTransferComponent> ent, ref SolutionDrainTransferDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Target is not { } target)
+            return;
+
+        // Have to check again, in case something has changed.
+        if (CanSend(ent, target, out var ownerSoln, out var targetSoln))
+        {
+            DrainTransfer(new SolutionTransferData(args.User, ent.Owner, ownerSoln.Value, args.Target.Value, targetSoln.Value, args.Amount));
+        }
+    }
+
+    private void OnSolutionFillTransferDoAfter(Entity<SolutionTransferComponent> ent, ref SolutionRefillTransferDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Target is not { } target)
+            return;
+
+        // Have to check again, in case something has changed.
+        if (!CanRecieve(ent, target, out var ownerSoln, out var targetSoln, out var solution))
+            return;
+
+        RefillTransfer(new SolutionTransferData(args.User, target, targetSoln.Value, ent.Owner, ownerSoln.Value, args.Amount), solution);
+    }
+
+    private bool CanSend(Entity<SolutionTransferComponent, DrainableSolutionComponent?> ent,
+        Entity<RefillableSolutionComponent?> target,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? drainable,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? refillable)
+    {
+        drainable = null;
+        refillable = null;
+
+        return ent.Comp1.CanReceive && TryGetTransferrableSolutions(ent.Owner, target, out drainable, out refillable, out _);
+    }
+
+    private bool CanRecieve(Entity<SolutionTransferComponent> ent,
+        EntityUid source,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? drainable,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? refillable,
+        [NotNullWhen(true)] out Solution? solution)
+    {
+        drainable = null;
+        refillable = null;
+        solution = null;
+
+        return ent.Comp.CanReceive && TryGetTransferrableSolutions(source, ent.Owner, out drainable, out refillable, out solution);
+    }
+
+    private bool TryGetTransferrableSolutions(Entity<DrainableSolutionComponent?> source,
+        Entity<RefillableSolutionComponent?> target,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? drainable,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? refillable,
+        [NotNullWhen(true)] out Solution? solution)
+    {
+        drainable = null;
+        refillable = null;
+        solution = null;
+
+        if (!_drainableQuery.Resolve(source, ref source.Comp) || !_refillableQuery.Resolve(target, ref target.Comp))
+            return false;
+
+        if (!_solution.TryGetDrainableSolution(source, out drainable, out _))
+            return false;
+
+        if (!_solution.TryGetRefillableSolution(target, out refillable, out solution))
+            return false;
+
+        return true;
+    }
+
     /// <summary>
-    /// Transfer from a solution to another, allowing either entity to cancel it and show a popup.
+    /// Attempt to drain a solution into another, such as pouring a bottle into a glass.
+    /// Includes a pop-up if the transfer failed or succeeded
+    /// </summary>
+    /// <param name="data">The transfer data making up the transfer.</param>
+    /// <returns>The actual amount transferred.</returns>
+    private void DrainTransfer(SolutionTransferData data)
+    {
+        var transferred = Transfer(data);
+        if (transferred <= 0)
+            return;
+
+        var message = Loc.GetString("comp-solution-transfer-transfer-solution", ("amount", transferred), ("target", data.TargetEntity));
+        _popup.PopupClient(message, data.SourceEntity, data.User);
+    }
+
+    /// <summary>
+    /// Attempt to fill a solution from another container, such as tapping from a water tank.
+    /// Includes a pop-up if the transfer failed or succeeded.
+    /// </summary>
+    /// <param name="data">The transfer data making up the transfer.</param>
+    /// <param name="targetSolution">The target solution,included for LoC pop-up purposes.</param>
+    /// <returns>The actual amount transferred.</returns>
+    private void RefillTransfer(SolutionTransferData data, Solution targetSolution)
+    {
+        var transferred = Transfer(data);
+        if (transferred <= 0)
+            return;
+
+        var toTheBrim = targetSolution.AvailableVolume == 0;
+        var msg = toTheBrim
+            ? "comp-solution-transfer-fill-fully"
+            : "comp-solution-transfer-fill-normal";
+
+        _popup.PopupClient(Loc.GetString(msg, ("owner", data.SourceEntity), ("amount", transferred), ("target", data.TargetEntity)), data.TargetEntity, data.User);
+    }
+
+    /// <summary>
+    /// Transfer from a solution to another, allowing either entity to cancel.
+    /// Includes a pop-up if the transfer failed.
     /// </summary>
     /// <returns>The actual amount transferred.</returns>
-    public FixedPoint2 Transfer(EntityUid user,
-        EntityUid sourceEntity,
-        Entity<SolutionComponent> source,
-        EntityUid targetEntity,
-        Entity<SolutionComponent> target,
-        FixedPoint2 amount)
+    public FixedPoint2 Transfer(SolutionTransferData data)
     {
-        var transferAttempt = new SolutionTransferAttemptEvent(sourceEntity, targetEntity);
+        var sourceSolution = data.Source.Comp.Solution;
+        var targetSolution = data.Target.Comp.Solution;
 
-        // Check if the source is cancelling the transfer
-        RaiseLocalEvent(sourceEntity, ref transferAttempt);
-        if (transferAttempt.CancelReason is {} reason)
-        {
-            _popup.PopupClient(reason, sourceEntity, user);
+        if (!CanTransfer(data))
             return FixedPoint2.Zero;
-        }
 
-        var sourceSolution = source.Comp.Solution;
-        if (sourceSolution.Volume == 0)
-        {
-            _popup.PopupClient(Loc.GetString("comp-solution-transfer-is-empty", ("target", sourceEntity)), sourceEntity, user);
-            return FixedPoint2.Zero;
-        }
+        var actualAmount = FixedPoint2.Min(data.Amount, FixedPoint2.Min(sourceSolution.Volume, targetSolution.AvailableVolume));
 
-        // Check if the target is cancelling the transfer
-        RaiseLocalEvent(targetEntity, ref transferAttempt);
-        if (transferAttempt.CancelReason is {} targetReason)
-        {
-            _popup.PopupClient(targetReason, targetEntity, user);
-            return FixedPoint2.Zero;
-        }
+        var solution = _solution.SplitSolution(data.Source, actualAmount);
+        _solution.AddSolution(data.Target, solution);
 
-        var targetSolution = target.Comp.Solution;
-        if (targetSolution.AvailableVolume == 0)
-        {
-            _popup.PopupClient(Loc.GetString("comp-solution-transfer-is-full", ("target", targetEntity)), targetEntity, user);
-            return FixedPoint2.Zero;
-        }
+        var ev = new SolutionTransferredEvent(data.SourceEntity, data.TargetEntity, data.User, actualAmount);
+        RaiseLocalEvent(data.TargetEntity, ref ev);
 
-        var actualAmount = FixedPoint2.Min(amount, FixedPoint2.Min(sourceSolution.Volume, targetSolution.AvailableVolume));
-
-        var solution = _solution.SplitSolution(source, actualAmount);
-        _solution.AddSolution(target, solution);
-
-        var ev = new SolutionTransferredEvent(sourceEntity, targetEntity, user, actualAmount);
-        RaiseLocalEvent(targetEntity, ref ev);
-
-        _adminLogger.Add(LogType.Action, LogImpact.Medium,
-            $"{ToPrettyString(user):player} transferred {SharedSolutionContainerSystem.ToPrettyString(solution)} to {ToPrettyString(targetEntity):target}, which now contains {SharedSolutionContainerSystem.ToPrettyString(targetSolution)}");
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Medium,
+            $"{ToPrettyString(data.User):player} transferred {SharedSolutionContainerSystem.ToPrettyString(solution)} to {ToPrettyString(data.TargetEntity):target}, which now contains {SharedSolutionContainerSystem.ToPrettyString(targetSolution)}");
 
         return actualAmount;
     }
+
+    /// <summary>
+    /// Check if the source solution can transfer the amount to the target solution, and display a pop-up if it fails.
+    /// </summary>
+    private bool CanTransfer(SolutionTransferData data)
+    {
+        var transferAttempt = new SolutionTransferAttemptEvent(data.SourceEntity, data.TargetEntity);
+
+        // Check if the source is cancelling the transfer
+        RaiseLocalEvent(data.SourceEntity, ref transferAttempt);
+        if (transferAttempt.CancelReason is {} reason)
+        {
+            _popup.PopupClient(reason, data.SourceEntity, data.User);
+            return false;
+        }
+
+        var sourceSolution = data.Source.Comp.Solution;
+        if (sourceSolution.Volume == 0)
+        {
+            _popup.PopupClient(Loc.GetString("comp-solution-transfer-is-empty", ("target", data.SourceEntity)), data.SourceEntity, data.User);
+            return false;
+        }
+
+        // Check if the target is cancelling the transfer
+        RaiseLocalEvent(data.TargetEntity, ref transferAttempt);
+        if (transferAttempt.CancelReason is {} targetReason)
+        {
+            _popup.PopupClient(targetReason, data.TargetEntity, data.User);
+            return false;
+        }
+
+        var targetSolution = data.Target.Comp.Solution;
+        if (targetSolution.AvailableVolume == 0)
+        {
+            _popup.PopupClient(Loc.GetString("comp-solution-transfer-is-full", ("target", data.TargetEntity)), data.TargetEntity, data.User);
+            return false;
+        }
+
+        return true;
+    }
+}
+
+
+/// <summary>
+/// A collection of data containing relevant entities and values for transferring reagents.
+/// </summary>
+/// <param name="user">The user performing the transfer.</param>
+/// <param name="sourceEntity">The entity holding the solution container which reagents are being moved from.</param>
+/// <param name="source">The entity holding the solution from which reagents are being moved away from.</param>
+/// <param name="targetEntity">The entity holding the solution container which reagents are being moved to.</param>
+/// <param name="target">The entity holding the solution which reagents are being moved to</param>
+/// <param name="amount">The amount being moved.</param>
+public struct SolutionTransferData(EntityUid user, EntityUid sourceEntity, Entity<SolutionComponent> source, EntityUid targetEntity, Entity<SolutionComponent> target, FixedPoint2 amount)
+{
+    public EntityUid User = user;
+    public EntityUid SourceEntity = sourceEntity;
+    public Entity<SolutionComponent> Source = source;
+    public EntityUid TargetEntity = targetEntity;
+    public Entity<SolutionComponent> Target = target;
+    public FixedPoint2 Amount = amount;
 }
 
 /// <summary>
@@ -234,3 +412,35 @@ public record struct SolutionTransferAttemptEvent(EntityUid From, EntityUid To,
 /// </summary>
 [ByRefEvent]
 public record struct SolutionTransferredEvent(EntityUid From, EntityUid To, EntityUid User, FixedPoint2 Amount);
+
+/// <summary>
+/// Doafter event for solution transfers where the held item is drained into the target. Checks for validity both when initiating and when finishing the event.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class SolutionDrainTransferDoAfterEvent : DoAfterEvent
+{
+    public FixedPoint2 Amount;
+
+    public SolutionDrainTransferDoAfterEvent(FixedPoint2 amount)
+    {
+        Amount = amount;
+    }
+
+    public override DoAfterEvent Clone() => this;
+}
+
+/// <summary>
+/// Doafter event for solution transfers where the held item is filled from the target. Checks for validity both when initiating and when finishing the event.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class SolutionRefillTransferDoAfterEvent : DoAfterEvent
+{
+    public FixedPoint2 Amount;
+
+    public SolutionRefillTransferDoAfterEvent(FixedPoint2 amount)
+    {
+        Amount = amount;
+    }
+
+    public override DoAfterEvent Clone() => this;
+}
diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
index 351a51ecc1..a995ef90f4 100644
--- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
@@ -31,6 +31,7 @@ namespace Content.Shared.Chemistry.Reaction
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+        [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!;
 
         /// <summary>
         /// A cache of all reactions indexed by at most ONE of their required reactants.
@@ -205,27 +206,12 @@ namespace Content.Shared.Chemistry.Reaction
 
         private void OnReaction(Entity<SolutionComponent> soln, ReactionPrototype reaction, ReagentPrototype? reagent, FixedPoint2 unitReactions)
         {
-            var args = new EntityEffectReagentArgs(soln, EntityManager, null, soln.Comp.Solution, unitReactions, reagent, null, 1f);
-
             var posFound = _transformSystem.TryGetMapOrGridCoordinates(soln, out var gridPos);
 
             _adminLogger.Add(LogType.ChemicalReaction, reaction.Impact,
                 $"Chemical reaction {reaction.ID:reaction} occurred with strength {unitReactions:strength} on entity {ToPrettyString(soln):metabolizer} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found]")}");
 
-            foreach (var effect in reaction.Effects)
-            {
-                if (!effect.ShouldApply(args))
-                    continue;
-
-                if (effect.ShouldLog)
-                {
-                    var entity = args.TargetEntity;
-                    _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                        $"Reaction effect {effect.GetType().Name:effect} of reaction {reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found")}");
-                }
-
-                effect.Effect(args);
-            }
+            _entityEffects.ApplyEffects(soln, reaction.Effects, unitReactions.Float());
 
             // Someday, some brave soul will thread through an optional actor
             // argument in from every call of OnReaction up, all just to pass
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index 4bbb972572..c9a24ec550 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -60,7 +60,7 @@ namespace Content.Shared.Chemistry.Reaction
         /// <summary>
         /// Effects to be triggered when the reaction occurs.
         /// </summary>
-        [DataField("effects")] public List<EntityEffect> Effects = new();
+        [DataField("effects")] public EntityEffect[] Effects = [];
 
         /// <summary>
         /// How dangerous is this effect? Stuff like bicaridine should be low, while things like methamphetamine
diff --git a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
index cabdee93c1..89fcca900e 100644
--- a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
@@ -34,7 +34,7 @@ public sealed partial class ReactiveReagentEffectEntry
     public HashSet<string>? Reagents = null;
 
     [DataField("effects", required: true)]
-    public List<EntityEffect> Effects = default!;
+    public EntityEffect[] Effects = default!;
 
     [DataField("groups", readOnly: true, serverOnly: true,
         customTypeSerializer:typeof(PrototypeIdDictionarySerializer<HashSet<ReactionMethod>, ReactiveGroupPrototype>))]
diff --git a/Content.Shared/Chemistry/ReactiveSystem.cs b/Content.Shared/Chemistry/ReactiveSystem.cs
index 6306537324..2ffb848f8a 100644
--- a/Content.Shared/Chemistry/ReactiveSystem.cs
+++ b/Content.Shared/Chemistry/ReactiveSystem.cs
@@ -1,108 +1,35 @@
-using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 
 namespace Content.Shared.Chemistry;
 
 [UsedImplicitly]
 public sealed class ReactiveSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
 
     public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method)
     {
         foreach (var reagent in solution.Contents.ToArray())
         {
-            ReactionEntity(uid, method, reagent, solution);
+            ReactionEntity(uid, method, reagent);
         }
     }
 
-    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity, Solution? source)
+    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentQuantity reagentQuantity)
     {
-        // We throw if the reagent specified doesn't exist.
-        var proto = _prototypeManager.Index<ReagentPrototype>(reagentQuantity.Reagent.Prototype);
-        ReactionEntity(uid, method, proto, reagentQuantity, source);
-    }
-
-    public void ReactionEntity(EntityUid uid, ReactionMethod method, ReagentPrototype proto,
-        ReagentQuantity reagentQuantity, Solution? source)
-    {
-        if (!TryComp(uid, out ReactiveComponent? reactive))
+        if (reagentQuantity.Quantity == FixedPoint2.Zero)
             return;
 
-        // custom event for bypassing reactivecomponent stuff
-        var ev = new ReactionEntityEvent(method, proto, reagentQuantity, source);
+        // We throw if the reagent specified doesn't exist.
+        if (!_proto.Resolve<ReagentPrototype>(reagentQuantity.Reagent.Prototype, out var proto))
+            return;
+
+        var ev = new ReactionEntityEvent(method, reagentQuantity, proto);
         RaiseLocalEvent(uid, ref ev);
-
-        // If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
-        var args = new EntityEffectReagentArgs(uid, EntityManager, null, source, source?.GetReagentQuantity(reagentQuantity.Reagent) ?? reagentQuantity.Quantity, proto, method, 1f);
-
-        // First, check if the reagent wants to apply any effects.
-        if (proto.ReactiveEffects != null && reactive.ReactiveGroups != null)
-        {
-            foreach (var (key, val) in proto.ReactiveEffects)
-            {
-                if (!val.Methods.Contains(method))
-                    continue;
-
-                if (!reactive.ReactiveGroups.ContainsKey(key))
-                    continue;
-
-                if (!reactive.ReactiveGroups[key].Contains(method))
-                    continue;
-
-                foreach (var effect in val.Effects)
-                {
-                    if (!effect.ShouldApply(args, _robustRandom))
-                        continue;
-
-                    if (effect.ShouldLog)
-                    {
-                        var entity = args.TargetEntity;
-                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                            $"Reactive effect {effect.GetType().Name:effect} of reagent {proto.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
-                    }
-
-                    effect.Effect(args);
-                }
-            }
-        }
-
-        // Then, check if the prototype has any effects it can apply as well.
-        if (reactive.Reactions != null)
-        {
-            foreach (var entry in reactive.Reactions)
-            {
-                if (!entry.Methods.Contains(method))
-                    continue;
-
-                if (entry.Reagents != null && !entry.Reagents.Contains(proto.ID))
-                    continue;
-
-                foreach (var effect in entry.Effects)
-                {
-                    if (!effect.ShouldApply(args, _robustRandom))
-                        continue;
-
-                    if (effect.ShouldLog)
-                    {
-                        var entity = args.TargetEntity;
-                        _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
-                            $"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {proto.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
-                    }
-
-                    effect.Effect(args);
-                }
-            }
-        }
     }
 }
 public enum ReactionMethod
@@ -113,9 +40,4 @@ Ingestion,
 }
 
 [ByRefEvent]
-public readonly record struct ReactionEntityEvent(
-    ReactionMethod Method,
-    ReagentPrototype Reagent,
-    ReagentQuantity ReagentQuantity,
-    Solution? Source
-);
+public readonly record struct ReactionEntityEvent(ReactionMethod Method, ReagentQuantity ReagentQuantity, ReagentPrototype Reagent);
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index b999d8df61..3b16b577cb 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -2,21 +2,17 @@ using System.Collections.Frozen;
 using System.Linq;
 using Content.Shared.FixedPoint;
 using System.Text.Json.Serialization;
-using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Prototypes;
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Contraband;
 using Content.Shared.EntityEffects;
-using Content.Shared.Database;
+using Content.Shared.Localizations;
 using Content.Shared.Nutrition;
-using Content.Shared.Prototypes;
 using Content.Shared.Roles;
 using Content.Shared.Slippery;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
@@ -190,6 +186,7 @@ namespace Content.Shared.Chemistry.Reagent
         [DataField]
         public SoundSpecifier FootstepSound = new SoundCollectionSpecifier("FootstepPuddle");
 
+        // TODO: Reaction tile doesn't work properly and destroys reagents way too quickly
         public FixedPoint2 ReactionTile(TileRef tile, FixedPoint2 reactVolume, IEntityManager entityManager, List<ReagentData>? data)
         {
             var removed = FixedPoint2.Zero;
@@ -211,33 +208,32 @@ namespace Content.Shared.Chemistry.Reagent
             return removed;
         }
 
-        public void ReactionPlant(EntityUid? plantHolder,
-            ReagentQuantity amount,
-            Solution solution,
-            EntityManager entityManager,
-            IRobustRandom random,
-            ISharedAdminLogManager logger)
+        public IEnumerable<string> GuidebookReagentEffectsDescription(IPrototypeManager prototype, IEntitySystemManager entSys, IEnumerable<EntityEffect> effects, FixedPoint2? metabolism = null)
         {
-            if (plantHolder == null)
-                return;
+            return effects.Select(x => GuidebookReagentEffectDescription(prototype, entSys, x, metabolism))
+                .Where(x => x is not null)
+                .Select(x => x!)
+                .ToArray();
+        }
 
-            var args = new EntityEffectReagentArgs(plantHolder.Value, entityManager, null, solution, amount.Quantity, this, null, 1f);
-            foreach (var plantMetabolizable in PlantMetabolisms)
-            {
-                if (!plantMetabolizable.ShouldApply(args, random))
-                    continue;
+        public string? GuidebookReagentEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys, EntityEffect effect, FixedPoint2? metabolism)
+        {
+            if (effect.EntityEffectGuidebookText(prototype, entSys) is not { } description)
+                return null;
 
-                if (plantMetabolizable.ShouldLog)
-                {
-                    var entity = args.TargetEntity;
-                    logger.Add(
-                        LogType.ReagentEffect,
-                        plantMetabolizable.LogImpact,
-                        $"Plant metabolism effect {plantMetabolizable.GetType().Name:effect} of reagent {ID} applied on entity {entity}");
-                }
+            var quantity = metabolism == null ? 0f : (double) (effect.MinScale * metabolism);
 
-                plantMetabolizable.Effect(args);
-            }
+            return Loc.GetString(
+                "guidebook-reagent-effect-description",
+                ("reagent", LocalizedName),
+                ("quantity", quantity),
+                ("effect", description),
+                ("chance", effect.Probability),
+                ("conditionCount", effect.Conditions?.Length ?? 0),
+                ("conditions",
+                    ContentLocalizationManager.FormatList(
+                        effect.Conditions?.Select(x => x.EntityConditionGuidebookText(prototype)).ToList() ?? new List<string>()
+                    )));
         }
     }
 
@@ -246,6 +242,7 @@ namespace Content.Shared.Chemistry.Reagent
     {
         public string ReagentPrototype;
 
+        // TODO: Kill Metabolism groups!
         public Dictionary<ProtoId<MetabolismGroupPrototype>, ReagentEffectsGuideEntry>? GuideEntries;
 
         public List<string>? PlantMetabolisms = null;
@@ -254,15 +251,12 @@ namespace Content.Shared.Chemistry.Reagent
         {
             ReagentPrototype = proto.ID;
             GuideEntries = proto.Metabolisms?
-                .Select(x => (x.Key, x.Value.MakeGuideEntry(prototype, entSys)))
+                .Select(x => (x.Key, x.Value.MakeGuideEntry(prototype, entSys, proto)))
                 .ToDictionary(x => x.Key, x => x.Item2);
             if (proto.PlantMetabolisms.Count > 0)
             {
-                PlantMetabolisms = new List<string>(proto.PlantMetabolisms
-                    .Select(x => x.GuidebookEffectDescription(prototype, entSys))
-                    .Where(x => x is not null)
-                    .Select(x => x!)
-                    .ToArray());
+                PlantMetabolisms =
+                    new List<string>(proto.GuidebookReagentEffectsDescription(prototype, entSys, proto.PlantMetabolisms));
             }
         }
     }
@@ -285,14 +279,11 @@ namespace Content.Shared.Chemistry.Reagent
         [DataField("effects", required: true)]
         public EntityEffect[] Effects = default!;
 
-        public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys)
+        public string EntityEffectFormat => "guidebook-reagent-effect-description";
+
+        public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys, ReagentPrototype proto)
         {
-            return new ReagentEffectsGuideEntry(MetabolismRate,
-                Effects
-                    .Select(x => x.GuidebookEffectDescription(prototype, entSys)) // hate.
-                    .Where(x => x is not null)
-                    .Select(x => x!)
-                    .ToArray());
+            return new ReagentEffectsGuideEntry(MetabolismRate, proto.GuidebookReagentEffectsDescription(prototype, entSys, Effects, MetabolismRate).ToArray());
         }
     }
 
diff --git a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
index 30e00faf0a..0c53349934 100644
--- a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs
@@ -62,27 +62,7 @@ public sealed class MaskSystem : EntitySystem
 
     private void OnGotUnequipped(EntityUid uid, MaskComponent mask, GotUnequippedEvent args)
     {
-        if (!mask.IsToggled || !mask.IsToggleable)
-            return;
-
-        mask.IsToggled = false;
-        ToggleMaskComponents(uid, mask, args.Equipee, mask.EquippedPrefix, true);
-    }
-
-    /// <summary>
-    /// Called after setting IsToggled, raises events and dirties.
-    /// </summary>
-    private void ToggleMaskComponents(EntityUid uid, MaskComponent mask, EntityUid wearer, string? equippedPrefix = null, bool isEquip = false)
-    {
-        Dirty(uid, mask);
-        if (mask.ToggleActionEntity is { } action)
-            _actionSystem.SetToggled(action, mask.IsToggled);
-
-        var maskEv = new ItemMaskToggledEvent((uid, mask), wearer);
-        RaiseLocalEvent(uid, ref maskEv);
-
-        var wearerEv = new WearerMaskToggledEvent((uid, mask));
-        RaiseLocalEvent(wearer, ref wearerEv);
+        SetToggled(uid, false);
     }
 
     private void OnFolded(Entity<MaskComponent> ent, ref FoldedEvent args)
diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs
index 2506359c25..d7b4019eb8 100644
--- a/Content.Shared/Clumsy/ClumsySystem.cs
+++ b/Content.Shared/Clumsy/ClumsySystem.cs
@@ -49,7 +49,7 @@ public sealed class ClumsySystem : EntitySystem
             return;
 
         // TODO: Replace with RandomPredicted once the engine PR is merged
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(ent).Id);
         var rand = new System.Random(seed);
         if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
@@ -68,7 +68,7 @@ public sealed class ClumsySystem : EntitySystem
             return;
 
         // TODO: Replace with RandomPredicted once the engine PR is merged
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(ent).Id);
         var rand = new System.Random(seed);
         if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
@@ -87,7 +87,7 @@ public sealed class ClumsySystem : EntitySystem
             return;
 
         // TODO: Replace with RandomPredicted once the engine PR is merged
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(args.Item).Id });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(args.Item).Id);
         var rand = new System.Random(seed);
         if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
@@ -121,7 +121,7 @@ public sealed class ClumsySystem : EntitySystem
             return;
 
         // TODO: Replace with RandomPredicted once the engine PR is merged
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(args.Gun).Id });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(args.Gun).Id);
         var rand = new System.Random(seed);
         if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
@@ -146,7 +146,7 @@ public sealed class ClumsySystem : EntitySystem
             return;
 
         // TODO: Replace with RandomPredicted once the engine PR is merged
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(ent).Id);
         var rand = new System.Random(seed);
         if (!_cfg.GetCVar(CCVars.GameTableBonk) && !rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
diff --git a/Content.Shared/Cluwne/CluwneComponent.cs b/Content.Shared/Cluwne/CluwneComponent.cs
index c9f96d030b..692a8ec4f9 100644
--- a/Content.Shared/Cluwne/CluwneComponent.cs
+++ b/Content.Shared/Cluwne/CluwneComponent.cs
@@ -1,6 +1,9 @@
 using Robust.Shared.Audio;
 using Content.Shared.Chat.Prototypes;
+using Content.Shared.Damage;
+using Content.Shared.Roles;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Cluwne;
@@ -12,22 +15,74 @@ public sealed partial class CluwneComponent : Component
     /// <summary>
     /// timings for giggles and knocks.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan DamageGiggleCooldown = TimeSpan.FromSeconds(2);
 
-    [ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// Amount of genetic damage dealt when they revert
+    /// </summary>
+    [DataField]
+    public DamageSpecifier RevertDamage = new()
+    {
+        DamageDict = new()
+        {
+            { "Genetic", 300.0 },
+        },
+    };
+
+    /// <summary>
+    /// Chance that the Cluwne will be knocked over and paralyzed.
+    /// </summary>
+    [DataField]
     public float KnockChance = 0.05f;
 
-    [ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// Chance that the Cluwne will randomly giggle
+    /// </summary>
+    [DataField]
     public float GiggleRandomChance = 0.1f;
 
-    [DataField("emoteId", customTypeSerializer: typeof(PrototypeIdSerializer<EmoteSoundsPrototype>))]
-    public string? EmoteSoundsId = "Cluwne";
+    /// <summary>
+    /// Enable random emoting?
+    /// </summary>
+    [DataField]
+    public bool RandomEmote = true;
+
+    /// <summary>
+    /// Emote sound collection that the Cluwne should use.
+    /// </summary>
+    [DataField("emoteId")]
+    public ProtoId<EmoteSoundsPrototype>? EmoteSoundsId = "Cluwne";
+
+    /// <summary>
+    /// Emote to use for the Cluwne Giggling
+    /// </summary>
+    [DataField]
+    public ProtoId<AutoEmotePrototype>? AutoEmoteId = "CluwneGiggle";
+
+    /// <summary>
+    /// Message to popup when the Cluwne is transformed
+    /// </summary>
+    [DataField]
+    public LocId TransformMessage = "cluwne-transform";
+
+    /// <summary>
+    /// Name prefix for the Cluwne.
+    /// Example "Urist McHuman" will be "Cluwned Urist McHuman"
+    /// </summary>
+    [DataField]
+    public LocId NamePrefix = "cluwne-name-prefix";
+
+    /// <summary>
+    /// Outfit ID that the cluwne will spawn with.
+    /// </summary>
+    [DataField]
+    public ProtoId<StartingGearPrototype> OutfitId = "CluwneGear";
 
     /// <summary>
     /// Amount of time cluwne is paralyzed for when falling over.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float ParalyzeTime = 2f;
 
     /// <summary>
@@ -36,6 +91,21 @@ public sealed partial class CluwneComponent : Component
     [DataField("spawnsound")]
     public SoundSpecifier SpawnSound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg");
 
-    [DataField("knocksound")]
+    /// <summary>
+    /// Emote to use for the cluwne giggling
+    /// </summary>
+    [DataField]
+    public LocId GiggleEmote = "cluwne-giggle-emote";
+
+    /// <summary>
+    /// Sound to play when the Cluwne is knocked over and paralyzed
+    /// </summary>
+    [DataField]
     public SoundSpecifier KnockSound = new SoundPathSpecifier("/Audio/Items/airhorn.ogg");
+
+    /// <summary>
+    /// Emote thats used when the cluwne getting knocked over
+    /// </summary>
+    [DataField]
+    public LocId KnockEmote = "cluwne-knock-emote";
 }
diff --git a/Content.Shared/Crayon/CrayonComponent.cs b/Content.Shared/Crayon/CrayonComponent.cs
new file mode 100644
index 0000000000..c772b43d00
--- /dev/null
+++ b/Content.Shared/Crayon/CrayonComponent.cs
@@ -0,0 +1,119 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Crayon;
+
+/// <summary>
+/// Component holding the state of a crayon-like component
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedCrayonSystem))]
+public sealed partial class CrayonComponent : Component
+{
+    /// <summary>
+    /// The ID of currently selected decal prototype that will be placed when the crayon is used.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string SelectedState;
+
+    /// <summary>
+    /// Color with which the crayon will draw.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color Color;
+
+    /// <summary>
+    /// Play a sound when drawing if specified.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? UseSound;
+
+    /// <summary>
+    /// Can the color can be changed?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool SelectableColor;
+
+    /// <summary>
+    /// Should the crayon be deleted when all charges are consumed?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DeleteEmpty = true;
+}
+
+/// <summary>
+/// Opens the crayon window for decal and color selection.
+/// </summary>
+[Serializable, NetSerializable]
+public enum CrayonUiKey : byte
+{
+    Key,
+}
+
+/// <summary>
+/// Used by the client to notify the server about the selected decal ID
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CrayonSelectMessage : BoundUserInterfaceMessage
+{
+    public readonly string State;
+    public CrayonSelectMessage(string selected)
+    {
+        State = selected;
+    }
+}
+
+/// <summary>
+/// Sets the color of the crayon, used by Rainbow Crayon
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CrayonColorMessage : BoundUserInterfaceMessage
+{
+    public readonly Color Color;
+    public CrayonColorMessage(Color color)
+    {
+        Color = color;
+    }
+}
+
+/// <summary>
+/// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn.
+/// Allows the client UI to advance forward in the client-only ephemeral queue,
+/// preventing the crayon from becoming a magic text storage device.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CrayonUsedMessage : BoundUserInterfaceMessage
+{
+    public readonly string DrawnDecal;
+
+    public CrayonUsedMessage(string drawn)
+    {
+        DrawnDecal = drawn;
+    }
+}
+
+/// <summary>
+/// The state of the crayon UI as sent by the server
+/// </summary>
+/// <summary>
+/// TODO: Delete this and use component states and predict the UI.
+/// This info is already networked on its own.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState
+{
+    public string Selected;
+    /// <summary>
+    /// Can the color can be changed
+    /// </summary>
+    public bool SelectableColor;
+    public Color Color;
+
+    public CrayonBoundUserInterfaceState(string selected, bool selectableColor, Color color)
+    {
+        Selected = selected;
+        SelectableColor = selectableColor;
+        Color = color;
+    }
+}
diff --git a/Content.Shared/Crayon/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs
deleted file mode 100644
index a9c21988ea..0000000000
--- a/Content.Shared/Crayon/SharedCrayonComponent.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Crayon
-{
-
-    /// <summary>
-    /// Component holding the state of a crayon-like component
-    /// </summary>
-    [NetworkedComponent, ComponentProtoName("Crayon"), Access(typeof(SharedCrayonSystem))]
-    public abstract partial class SharedCrayonComponent : Component
-    {
-        /// <summary>
-        /// The ID of currently selected decal prototype that will be placed when the crayon is used
-        /// </summary>
-        public string SelectedState { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Color with which the crayon will draw
-        /// </summary>
-        [DataField("color")]
-        public Color Color;
-
-        [Serializable, NetSerializable]
-        public enum CrayonUiKey : byte
-        {
-            Key,
-        }
-    }
-
-    /// <summary>
-    /// Used by the client to notify the server about the selected decal ID
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonSelectMessage : BoundUserInterfaceMessage
-    {
-        public readonly string State;
-        public CrayonSelectMessage(string selected)
-        {
-            State = selected;
-        }
-    }
-
-    /// <summary>
-    /// Sets the color of the crayon, used by Rainbow Crayon
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonColorMessage : BoundUserInterfaceMessage
-    {
-        public readonly Color Color;
-        public CrayonColorMessage(Color color)
-        {
-            Color = color;
-        }
-    }
-
-    /// <summary>
-    /// Server to CLIENT. Notifies the BUI that a decal with given ID has been drawn.
-    /// Allows the client UI to advance forward in the client-only ephemeral queue,
-    /// preventing the crayon from becoming a magic text storage device.
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonUsedMessage : BoundUserInterfaceMessage
-    {
-        public readonly string DrawnDecal;
-
-        public CrayonUsedMessage(string drawn)
-        {
-            DrawnDecal = drawn;
-        }
-    }
-
-    /// <summary>
-    /// Component state, describes how many charges are left in the crayon in the near-hand UI
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonComponentState : ComponentState
-    {
-        public readonly Color Color;
-        public readonly string State;
-        public readonly int Charges;
-        public readonly int Capacity;
-
-        public CrayonComponentState(Color color, string state, int charges, int capacity)
-        {
-            Color = color;
-            State = state;
-            Charges = charges;
-            Capacity = capacity;
-        }
-    }
-
-    /// <summary>
-    /// The state of the crayon UI as sent by the server
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class CrayonBoundUserInterfaceState : BoundUserInterfaceState
-    {
-        public string Selected;
-        /// <summary>
-        /// Whether or not the color can be selected
-        /// </summary>
-        public bool SelectableColor;
-        public Color Color;
-
-        public CrayonBoundUserInterfaceState(string selected, bool selectableColor, Color color)
-        {
-            Selected = selected;
-            SelectableColor = selectableColor;
-            Color = color;
-        }
-    }
-}
diff --git a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs
index d665d32f1e..3e2e103501 100644
--- a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs
+++ b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsSystem.cs
@@ -45,6 +45,8 @@ public abstract class SharedCriminalRecordsSystem : EntitySystem
             SecurityStatus.Detained => "SecurityIconIncarcerated",
             SecurityStatus.Discharged => "SecurityIconDischarged",
             SecurityStatus.Suspected => "SecurityIconSuspected",
+            SecurityStatus.Hostile => "SecurityIconHostile",
+            SecurityStatus.Eliminated => "SecurityIconEliminated",
             _ => record.StatusIcon
         };
 
diff --git a/Content.Shared/Damage/Components/DamageExaminableComponent.cs b/Content.Shared/Damage/Components/DamageExaminableComponent.cs
index a9fa833070..0ac9435bb6 100644
--- a/Content.Shared/Damage/Components/DamageExaminableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageExaminableComponent.cs
@@ -2,7 +2,8 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Damage.Components;
 
+/// <summary>
+/// Shows a detailed examine window with this entity's damage stats when examined.
+/// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class DamageExaminableComponent : Component
-{
-}
+public sealed partial class DamageExaminableComponent : Component;
diff --git a/Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs b/Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs
new file mode 100644
index 0000000000..7728bcf7ee
--- /dev/null
+++ b/Content.Shared/Damage/Components/DamageOtherOnHitComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Damage.Systems;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+/// Makes this entity deal damage when thrown at something.
+/// </summary>
+[RegisterComponent]
+[Access(typeof(SharedDamageOtherOnHitSystem))]
+public sealed partial class DamageOtherOnHitComponent : Component
+{
+    /// <summary>
+    /// Whether to ignore damage modifiers.
+    /// </summary>
+    [DataField]
+    public bool IgnoreResistances = false;
+
+    /// <summary>
+    /// The damage amount to deal on hit.
+    /// </summary>
+    [DataField(required: true)]
+    public DamageSpecifier Damage = default!;
+
+}
diff --git a/Content.Shared/Damage/Events/DamageExamineEvent.cs b/Content.Shared/Damage/Events/DamageExamineEvent.cs
index d3e6175f49..33949cc052 100644
--- a/Content.Shared/Damage/Events/DamageExamineEvent.cs
+++ b/Content.Shared/Damage/Events/DamageExamineEvent.cs
@@ -1,6 +1,10 @@
+using Content.Shared.Damage.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Damage.Events;
 
+/// <summary>
+/// Raised on an entity with <see cref="DamageExaminableComponent"/> when examined to get the damage values displayed in the examine window.
+/// </summary>
 [ByRefEvent]
 public readonly record struct DamageExamineEvent(FormattedMessage Message, EntityUid User);
diff --git a/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs b/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
new file mode 100644
index 0000000000..f17a91972d
--- /dev/null
+++ b/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.CombatMode.Pacification;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Events;
+
+namespace Content.Shared.Damage.Systems;
+
+public abstract class SharedDamageOtherOnHitSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageOtherOnHitComponent, DamageExamineEvent>(OnDamageExamine);
+        SubscribeLocalEvent<DamageOtherOnHitComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
+    }
+
+    private void OnDamageExamine(Entity<DamageOtherOnHitComponent> ent, ref DamageExamineEvent args)
+    {
+        _damageExamine.AddDamageExamine(args.Message, _damageable.ApplyUniversalAllModifiers(ent.Comp.Damage * _damageable.UniversalThrownDamageModifier), Loc.GetString("damage-throw"));
+    }
+
+    /// <summary>
+    /// Prevent players with the Pacified status effect from throwing things that deal damage.
+    /// </summary>
+    private void OnAttemptPacifiedThrow(Entity<DamageOtherOnHitComponent> ent, ref AttemptPacifiedThrowEvent args)
+    {
+        args.Cancel("pacified-cannot-throw");
+    }
+}
diff --git a/Content.Shared/Delivery/SharedDeliverySystem.cs b/Content.Shared/Delivery/SharedDeliverySystem.cs
index d7fc40dcc6..71baa92ec6 100644
--- a/Content.Shared/Delivery/SharedDeliverySystem.cs
+++ b/Content.Shared/Delivery/SharedDeliverySystem.cs
@@ -162,7 +162,7 @@ public abstract class SharedDeliverySystem : EntitySystem
     private bool TryUnlockDelivery(Entity<DeliveryComponent> ent, EntityUid user, bool rewardMoney = true, bool force = false)
     {
         // Check fingerprint access if there is a reader on the mail
-        if (!force && TryComp<FingerprintReaderComponent>(ent, out var reader) && !_fingerprintReader.IsAllowed((ent, reader), user))
+        if (!force && !_fingerprintReader.IsAllowed(ent.Owner, user, out _))
             return false;
 
         var deliveryName = _nameModifier.GetBaseName(ent.Owner);
diff --git a/Content.Shared/Destructible/SharedDestructibleSystem.cs b/Content.Shared/Destructible/SharedDestructibleSystem.cs
index 572ed9d560..6b7148a4c9 100644
--- a/Content.Shared/Destructible/SharedDestructibleSystem.cs
+++ b/Content.Shared/Destructible/SharedDestructibleSystem.cs
@@ -1,11 +1,11 @@
-namespace Content.Shared.Destructible;
+namespace Content.Shared.Destructible;
 
 public abstract class SharedDestructibleSystem : EntitySystem
 {
     /// <summary>
-    ///     Force entity to be destroyed and deleted.
+    /// Force entity to be destroyed and deleted.
     /// </summary>
-    public bool DestroyEntity(EntityUid owner)
+    public bool DestroyEntity(Entity<MetaDataComponent?> owner)
     {
         var ev = new DestructionAttemptEvent();
         RaiseLocalEvent(owner, ev);
@@ -15,12 +15,12 @@ public abstract class SharedDestructibleSystem : EntitySystem
         var eventArgs = new DestructionEventArgs();
         RaiseLocalEvent(owner, eventArgs);
 
-        QueueDel(owner);
+        PredictedQueueDel(owner);
         return true;
     }
 
     /// <summary>
-    ///     Force entity to break.
+    /// Force entity to break.
     /// </summary>
     public void BreakEntity(EntityUid owner)
     {
@@ -30,7 +30,7 @@ public abstract class SharedDestructibleSystem : EntitySystem
 }
 
 /// <summary>
-///     Raised before an entity is about to be destroyed and deleted
+/// Raised before an entity is about to be destroyed and deleted
 /// </summary>
 public sealed class DestructionAttemptEvent : CancellableEntityEventArgs
 {
@@ -38,7 +38,7 @@ public sealed class DestructionAttemptEvent : CancellableEntityEventArgs
 }
 
 /// <summary>
-///     Raised when entity is destroyed and about to be deleted.
+/// Raised when entity is destroyed and about to be deleted.
 /// </summary>
 public sealed class DestructionEventArgs : EntityEventArgs
 {
@@ -46,7 +46,7 @@ public sealed class DestructionEventArgs : EntityEventArgs
 }
 
 /// <summary>
-///     Raised when entity was heavy damage and about to break.
+/// Raised when entity was heavy damage and about to break.
 /// </summary>
 public sealed class BreakageEventArgs : EntityEventArgs
 {
diff --git a/Content.Shared/Destructible/ThresholdActs.cs b/Content.Shared/Destructible/ThresholdActs.cs
new file mode 100644
index 0000000000..281d58092f
--- /dev/null
+++ b/Content.Shared/Destructible/ThresholdActs.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Destructible;
+
+[Flags]
+[Serializable, NetSerializable]
+public enum ThresholdActs : byte
+{
+    None = 0,
+    Breakage = 1 << 0,
+    Destruction = 1 << 1,
+}
diff --git a/Content.Shared/Destructible/Triggers/AndTrigger.cs b/Content.Shared/Destructible/Triggers/AndTrigger.cs
new file mode 100644
index 0000000000..ebedeee479
--- /dev/null
+++ b/Content.Shared/Destructible/Triggers/AndTrigger.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Damage;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Destructible.Thresholds.Triggers;
+
+/// <summary>
+/// A trigger that will activate when all of its triggers have activated.
+/// </summary>
+[Serializable, NetSerializable]
+[DataDefinition]
+public sealed partial class AndTrigger : IThresholdTrigger
+{
+    [DataField]
+    public List<IThresholdTrigger> Triggers = new();
+
+    public bool Reached(Entity<DamageableComponent> damageable, SharedDestructibleSystem system)
+    {
+        foreach (var trigger in Triggers)
+        {
+            if (!trigger.Reached(damageable, system))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Destructible/Triggers/DamageGroupTrigger.cs b/Content.Shared/Destructible/Triggers/DamageGroupTrigger.cs
new file mode 100644
index 0000000000..902198e33d
--- /dev/null
+++ b/Content.Shared/Destructible/Triggers/DamageGroupTrigger.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Content.Shared.Damage.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Destructible.Thresholds.Triggers;
+
+/// <summary>
+/// A trigger that will activate when the amount of damage received
+/// of the specified class is above the specified threshold.
+/// </summary>
+[Serializable, NetSerializable]
+[DataDefinition]
+public sealed partial class DamageGroupTrigger : IThresholdTrigger
+{
+    /// <summary>
+    /// The damage group to check for.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<DamageGroupPrototype> DamageGroup = default!;
+
+    /// <summary>
+    /// The amount of damage at which this threshold will trigger.
+    /// </summary>
+    [DataField(required: true)]
+    public FixedPoint2 Damage = default!;
+
+    public bool Reached(Entity<DamageableComponent> damageable, SharedDestructibleSystem system)
+    {
+        return damageable.Comp.DamagePerGroup[DamageGroup] >= Damage;
+    }
+}
diff --git a/Content.Shared/Destructible/Triggers/DamageTrigger.cs b/Content.Shared/Destructible/Triggers/DamageTrigger.cs
new file mode 100644
index 0000000000..9ec2060e5f
--- /dev/null
+++ b/Content.Shared/Destructible/Triggers/DamageTrigger.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Destructible.Thresholds.Triggers;
+
+/// <summary>
+/// A trigger that will activate when the total amount of damage received
+/// is above the specified threshold.
+/// </summary>
+[Serializable, NetSerializable]
+[DataDefinition]
+public sealed partial class DamageTrigger : IThresholdTrigger
+{
+    /// <summary>
+    /// The amount of damage at which this threshold will trigger.
+    /// </summary>
+    [DataField(required: true)]
+    public FixedPoint2 Damage = default!;
+
+    public bool Reached(Entity<DamageableComponent> damageable, SharedDestructibleSystem system)
+    {
+        return damageable.Comp.TotalDamage >= Damage;
+    }
+}
diff --git a/Content.Shared/Destructible/Triggers/DamageTypeTrigger.cs b/Content.Shared/Destructible/Triggers/DamageTypeTrigger.cs
new file mode 100644
index 0000000000..8f50b62791
--- /dev/null
+++ b/Content.Shared/Destructible/Triggers/DamageTypeTrigger.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Destructible.Thresholds.Triggers;
+
+/// <summary>
+/// A trigger that will activate when the amount of damage received
+/// of the specified type is above the specified threshold.
+/// </summary>
+[Serializable, NetSerializable]
+[DataDefinition]
+public sealed partial class DamageTypeTrigger : IThresholdTrigger
+{
+    /// <summary>
+    /// The damage type to check for.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<DamageTypePrototype> DamageType = default!;
+
+    /// <summary>
+    /// The amount of damage at which this threshold will trigger.
+    /// </summary>
+    [DataField(required: true)]
+    public FixedPoint2 Damage = default!;
+
+    public bool Reached(Entity<DamageableComponent> damageable, SharedDestructibleSystem system)
+    {
+        return damageable.Comp.Damage.DamageDict.TryGetValue(DamageType, out var damageReceived) &&
+               damageReceived >= Damage;
+    }
+}
diff --git a/Content.Shared/Destructible/Triggers/IThresholdTrigger.cs b/Content.Shared/Destructible/Triggers/IThresholdTrigger.cs
new file mode 100644
index 0000000000..98c96a5bd5
--- /dev/null
+++ b/Content.Shared/Destructible/Triggers/IThresholdTrigger.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Damage;
+
+namespace Content.Shared.Destructible.Thresholds.Triggers;
+
+/// <summary>
+/// A condition for triggering a <see cref="DamageThreshold">.
+/// </summary>
+/// <remarks>
+/// I decided against converting these into EntityEffectConditions for performance reasons
+/// (although I did not do any benchmarks, so it might be fine).
+/// Entity effects will raise a separate event for each entity and each condition, which can become a huge number
+/// for cases like nuke explosions or shuttle collisions where there are lots of DamageChangedEvents at once.
+/// IThresholdTriggers on the other hand are directly checked in a foreach loop without raising events.
+/// And there are only few of these conditions, so there is only a minor amount of code duplication.
+/// </remarks>
+public interface IThresholdTrigger
+{
+    /// <summary>
+    /// Checks if this trigger has been reached.
+    /// </summary>
+    /// <param name="damageable">The damageable component to check with.</param>
+    /// <param name="system">
+    /// An instance of <see cref="SharedDestructibleSystem"/> to pull dependencies from, if any.
+    /// </param>
+    /// <returns>true if this trigger has been reached, false otherwise.</returns>
+    bool Reached(Entity<DamageableComponent> damageable, SharedDestructibleSystem system);
+}
diff --git a/Content.Shared/Destructible/Triggers/OrTrigger.cs b/Content.Shared/Destructible/Triggers/OrTrigger.cs
new file mode 100644
index 0000000000..3e379cac7f
--- /dev/null
+++ b/Content.Shared/Destructible/Triggers/OrTrigger.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Damage;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Destructible.Thresholds.Triggers;
+
+/// <summary>
+/// A trigger that will activate when any of its triggers have activated.
+/// </summary>
+[Serializable, NetSerializable]
+[DataDefinition]
+public sealed partial class OrTrigger : IThresholdTrigger
+{
+    [DataField]
+    public List<IThresholdTrigger> Triggers = new();
+
+    public bool Reached(Entity<DamageableComponent> damageable, SharedDestructibleSystem system)
+    {
+        foreach (var trigger in Triggers)
+        {
+            if (trigger.Reached(damageable, system))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
index 5d51bbc3e8..74bbc259c6 100644
--- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
+++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
@@ -214,6 +214,17 @@ public abstract class SharedDeviceLinkSystem : EntitySystem
         return links;
     }
 
+    /// <summary>
+    /// Gets the entities linked to a specific source port.
+    /// </summary>
+    public HashSet<EntityUid> GetLinkedSinks(Entity<DeviceLinkSourceComponent?> source, ProtoId<SourcePortPrototype> port)
+    {
+        if (!Resolve(source, ref source.Comp) || !source.Comp.Outputs.TryGetValue(port, out var linked))
+            return new HashSet<EntityUid>(); // not a source or not linked
+
+        return new HashSet<EntityUid>(linked); // clone to prevent modifying the original
+    }
+
     /// <summary>
     /// Returns the default links for the given list of source port prototypes
     /// </summary>
diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs
index 020a7a4c9b..e66dff2611 100644
--- a/Content.Shared/Doors/Components/DoorComponent.cs
+++ b/Content.Shared/Doors/Components/DoorComponent.cs
@@ -325,4 +325,5 @@ public enum DoorVisualLayers : byte
     BaseUnlit,
     BaseBolted,
     BaseEmergencyAccess,
+    BaseEmagging,
 }
diff --git a/Content.Shared/Drunk/SharedDrunkSystem.cs b/Content.Shared/Drunk/SharedDrunkSystem.cs
index 96aff82fa0..9faeb9419d 100644
--- a/Content.Shared/Drunk/SharedDrunkSystem.cs
+++ b/Content.Shared/Drunk/SharedDrunkSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Speech.EntitySystems;
 using Content.Shared.StatusEffectNew;
 using Content.Shared.Traits.Assorted;
 using Robust.Shared.Prototypes;
@@ -8,12 +7,6 @@ namespace Content.Shared.Drunk;
 public abstract class SharedDrunkSystem : EntitySystem
 {
     public static EntProtoId Drunk = "StatusEffectDrunk";
-    public static EntProtoId Woozy = "StatusEffectWoozy";
-
-    /* I have no clue why this magic number was chosen, I copied it from slur system and needed it for the overlay
-    If you have a more intelligent magic number be my guest to completely explode this value.
-    There were no comments as to why this value was chosen three years ago. */
-    public static float MagicNumber = 1100f;
 
     [Dependency] protected readonly StatusEffectsSystem Status = default!;
 
diff --git a/Content.Shared/Emoting/EmoteEvents.cs b/Content.Shared/Emoting/EmoteEvents.cs
index ea3073f336..931395ee7e 100644
--- a/Content.Shared/Emoting/EmoteEvents.cs
+++ b/Content.Shared/Emoting/EmoteEvents.cs
@@ -1,27 +1,6 @@
-using Content.Shared.Chat.Prototypes;
-using Content.Shared.Inventory;
-
-namespace Content.Shared.Emoting;
+namespace Content.Shared.Emoting;
 
 public sealed class EmoteAttemptEvent(EntityUid uid) : CancellableEntityEventArgs
 {
     public EntityUid Uid { get; } = uid;
 }
-
-/// <summary>
-/// An event raised just before an emote is performed, providing systems with an opportunity to cancel the emote's performance.
-/// </summary>
-[ByRefEvent]
-public sealed class BeforeEmoteEvent(EntityUid source, EmotePrototype emote)
-    : CancellableEntityEventArgs, IInventoryRelayEvent
-{
-    public readonly EntityUid Source = source;
-    public readonly EmotePrototype Emote = emote;
-
-    /// <summary>
-    ///     The equipment that is blocking emoting. Should only be non-null if the event was canceled.
-    /// </summary>
-    public EntityUid? Blocker = null;
-
-    public SlotFlags TargetSlots => SlotFlags.WITHOUT_POCKET;
-}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
new file mode 100644
index 0000000000..ece979a6a8
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class BreathingCondition : EntityConditionBase<BreathingCondition>
+{
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("entity-condition-guidebook-breathing", ("isBreathing", !Inverted));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
new file mode 100644
index 0000000000..f00707f907
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <summary>
+/// Returns true if this entity's hunger is within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class TotalHungerEntityConditionSystem : EntityConditionSystem<HungerComponent, HungerCondition>
+{
+    [Dependency] private readonly HungerSystem _hunger = default!;
+
+    protected override void Condition(Entity<HungerComponent> entity, ref EntityConditionEvent<HungerCondition> args)
+    {
+        var total = _hunger.GetHunger(entity.Comp);
+        args.Result = total >= args.Condition.Min && total <= args.Condition.Max;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class HungerCondition : EntityConditionBase<HungerCondition>
+{
+    [DataField]
+    public float Min;
+
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("entity-condition-guidebook-total-hunger", ("max", float.IsPositiveInfinity(Max) ? int.MaxValue : Max), ("min", Min));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
new file mode 100644
index 0000000000..cabf731939
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Body.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <summary>
+/// Returns true if this entity is using internals. False if they are not or cannot use internals.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class InternalsOnEntityConditionSystem : EntityConditionSystem<InternalsComponent, InternalsCondition>
+{
+    protected override void Condition(Entity<InternalsComponent> entity, ref EntityConditionEvent<InternalsCondition> args)
+    {
+        args.Result = entity.Comp.GasTankEntity != null;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class InternalsCondition : EntityConditionBase<InternalsCondition>
+{
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("entity-condition-guidebook-internals", ("usingInternals", !Inverted));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
new file mode 100644
index 0000000000..5fb63d008f
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Body.Prototypes;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class MetabolizerTypeCondition : EntityConditionBase<MetabolizerTypeCondition>
+{
+    [DataField(required: true)]
+    public ProtoId<MetabolizerTypePrototype>[] Type = default!;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        var typeList = new List<string>();
+
+        foreach (var type in Type)
+        {
+            if (!prototype.Resolve(type, out var proto))
+                continue;
+
+            typeList.Add(proto.LocalizedName);
+        }
+
+        var names = ContentLocalizationManager.FormatListToOr(typeList);
+
+        return Loc.GetString("entity-condition-guidebook-organ-type",
+            ("name", names),
+            ("shouldhave", !Inverted));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
new file mode 100644
index 0000000000..735720c0ea
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Body;
+
+/// <summary>
+/// Returns true if this entity's current mob state matches the condition's specified mob state.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class MobStateEntityConditionSystem : EntityConditionSystem<MobStateComponent, MobStateCondition>
+{
+    protected override void Condition(Entity<MobStateComponent> entity, ref EntityConditionEvent<MobStateCondition> args)
+    {
+        if (entity.Comp.CurrentState == args.Condition.Mobstate)
+            args.Result = true;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class MobStateCondition : EntityConditionBase<MobStateCondition>
+{
+    [DataField]
+    public MobState Mobstate = MobState.Alive;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("entity-condition-guidebook-mob-state-condition", ("state", Mobstate));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs
new file mode 100644
index 0000000000..dd877140d6
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity can take damage and if its damage of a given damage group is within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class DamageGroupEntityConditionSystem : EntityConditionSystem<DamageableComponent, DamageGroupCondition>
+{
+    protected override void Condition(Entity<DamageableComponent> entity, ref EntityConditionEvent<DamageGroupCondition> args)
+    {
+        var value = entity.Comp.DamagePerGroup[args.Condition.DamageGroup];
+        args.Result = value >= args.Condition.Min && value <= args.Condition.Max;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class DamageGroupCondition : EntityConditionBase<DamageGroupCondition>
+{
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    [DataField(required: true)]
+    public ProtoId<DamageGroupPrototype> DamageGroup;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("entity-condition-guidebook-group-damage",
+            ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
+            ("min", Min.Float()),
+            ("type", prototype.Index(DamageGroup).LocalizedName));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs
new file mode 100644
index 0000000000..30490c72e8
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity can take damage and if its damage of a given damage type is within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class DamageTypeEntityConditionSystem : EntityConditionSystem<DamageableComponent, DamageTypeCondition>
+{
+    protected override void Condition(Entity<DamageableComponent> entity, ref EntityConditionEvent<DamageTypeCondition> args)
+    {
+        var value = entity.Comp.Damage.DamageDict.GetValueOrDefault(args.Condition.DamageType);
+        args.Result = value >= args.Condition.Min && value <= args.Condition.Max;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class DamageTypeCondition : EntityConditionBase<DamageTypeCondition>
+{
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    [DataField(required: true)]
+    public ProtoId<DamageTypePrototype> DamageType;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("entity-condition-guidebook-type-damage",
+            ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
+            ("min", Min.Float()),
+            ("type", prototype.Index(DamageType).LocalizedName));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
new file mode 100644
index 0000000000..a698efa032
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
@@ -0,0 +1,59 @@
+using System.Linq;
+using Content.Shared.Localizations;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Components;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity has any of the specified jobs. False if the entity has no mind, none of the specified jobs, or is jobless.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class HasJobEntityConditionSystem : EntityConditionSystem<MindContainerComponent, JobCondition>
+{
+    protected override void Condition(Entity<MindContainerComponent> entity, ref EntityConditionEvent<JobCondition> args)
+    {
+        // We need a mind in our mind container...
+        if (!TryComp<MindComponent>(entity.Comp.Mind, out var mind))
+            return;
+
+        foreach (var roleId in mind.MindRoleContainer.ContainedEntities)
+        {
+            if (!HasComp<JobRoleComponent>(roleId))
+                continue;
+
+            if (!TryComp<MindRoleComponent>(roleId, out var mindRole))
+            {
+                Log.Error($"Encountered job mind role entity {roleId} without a {nameof(MindRoleComponent)}");
+                continue;
+            }
+
+            if (mindRole.JobPrototype == null)
+            {
+                Log.Error($"Encountered job mind role entity {roleId} without a {nameof(JobPrototype)}");
+                continue;
+            }
+
+            if (!args.Condition.Jobs.Contains(mindRole.JobPrototype.Value))
+                continue;
+
+            args.Result = true;
+            return;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class JobCondition : EntityConditionBase<JobCondition>
+{
+    [DataField(required: true)] public List<ProtoId<JobPrototype>> Jobs = [];
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        var localizedNames = Jobs.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
+        return Loc.GetString("entity-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
new file mode 100644
index 0000000000..dbe585e631
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this solution entity has an amount of reagent in it within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class ReagentThresholdEntityConditionSystem : EntityConditionSystem<SolutionComponent, ReagentCondition>
+{
+    protected override void Condition(Entity<SolutionComponent> entity, ref EntityConditionEvent<ReagentCondition> args)
+    {
+        var quant = entity.Comp.Solution.GetTotalPrototypeQuantity(args.Condition.Reagent);
+
+        args.Result = quant >= args.Condition.Min && quant <= args.Condition.Max;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class ReagentCondition : EntityConditionBase<ReagentCondition>
+{
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<ReagentPrototype> Reagent;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        if (!prototype.Resolve(Reagent, out var reagentProto))
+            return String.Empty;
+
+        return Loc.GetString("entity-condition-guidebook-reagent-threshold",
+            ("reagent", reagentProto.LocalizedName),
+            ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
new file mode 100644
index 0000000000..36f4f51bf5
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Localizations;
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Tags;
+
+/// <summary>
+/// Returns true if this entity has all the listed tags.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class HasAllTagsEntityConditionSystem : EntityConditionSystem<TagComponent, AllTagsCondition>
+{
+    [Dependency] private readonly TagSystem _tag = default!;
+
+    protected override void Condition(Entity<TagComponent> entity, ref EntityConditionEvent<AllTagsCondition> args)
+    {
+        args.Result = _tag.HasAllTags(entity.Comp, args.Condition.Tags);
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class AllTagsCondition : EntityConditionBase<AllTagsCondition>
+{
+    [DataField(required: true)]
+    public ProtoId<TagPrototype>[] Tags = [];
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        var tagList = new List<string>();
+
+        foreach (var type in Tags)
+        {
+            if (!prototype.Resolve(type, out var proto))
+                continue;
+
+            tagList.Add(proto.ID);
+        }
+
+        var names = ContentLocalizationManager.FormatList(tagList);
+
+        return Loc.GetString("entity-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
new file mode 100644
index 0000000000..dedce491fd
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Localizations;
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Tags;
+
+/// <summary>
+/// Returns true if this entity have any of the listed tags.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class HasAnyTagEntityConditionSystem : EntityConditionSystem<TagComponent, AnyTagCondition>
+{
+    [Dependency] private readonly TagSystem _tag = default!;
+
+    protected override void Condition(Entity<TagComponent> entity, ref EntityConditionEvent<AnyTagCondition> args)
+    {
+        args.Result = _tag.HasAnyTag(entity.Comp, args.Condition.Tags);
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class AnyTagCondition : EntityConditionBase<AnyTagCondition>
+{
+    [DataField(required: true)]
+    public ProtoId<TagPrototype>[] Tags = [];
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype)
+    {
+        var tagList = new List<string>();
+
+        foreach (var type in Tags)
+        {
+            if (!prototype.Resolve(type, out var proto))
+                continue;
+
+            tagList.Add(proto.ID);
+        }
+
+        var names = ContentLocalizationManager.FormatListToOr(tagList);
+
+        return Loc.GetString("entity-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
+    }
+}
diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
new file mode 100644
index 0000000000..6145982a03
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions.Tags;
+
+/// <summary>
+/// Returns true if this entity has the listed tag.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class HasTagEntityConditionSystem : EntityConditionSystem<TagComponent, TagCondition>
+{
+    [Dependency] private readonly TagSystem _tag = default!;
+
+    protected override void Condition(Entity<TagComponent> entity, ref EntityConditionEvent<TagCondition> args)
+    {
+        args.Result = _tag.HasTag(entity.Comp, args.Condition.Tag);
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class TagCondition : EntityConditionBase<TagCondition>
+{
+    [DataField(required: true)]
+    public ProtoId<TagPrototype> Tag;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("entity-condition-guidebook-has-tag", ("tag", Tag), ("invert", Inverted));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
new file mode 100644
index 0000000000..f87bbecf8c
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Temperature.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity has an amount of reagent in it within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class TemperatureEntityConditionSystem : EntityConditionSystem<TemperatureComponent, TemperatureCondition>
+{
+    protected override void Condition(Entity<TemperatureComponent> entity, ref EntityConditionEvent<TemperatureCondition> args)
+    {
+        if (entity.Comp.CurrentTemperature >= args.Condition.Min && entity.Comp.CurrentTemperature <= args.Condition.Max)
+            args.Result = true;
+    }
+}
+
+/// <summary>
+/// Returns true if this solution entity has an amount of reagent in it within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class SolutionTemperatureEntityConditionSystem : EntityConditionSystem<SolutionComponent, TemperatureCondition>
+{
+    protected override void Condition(Entity<SolutionComponent> entity, ref EntityConditionEvent<TemperatureCondition> args)
+    {
+        if (entity.Comp.Solution.Temperature >= args.Condition.Min && entity.Comp.Solution.Temperature <= args.Condition.Max)
+            args.Result = true;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class TemperatureCondition : EntityConditionBase<TemperatureCondition>
+{
+    /// <summary>
+    /// Minimum allowed temperature
+    /// </summary>
+    [DataField]
+    public float Min = 0;
+
+    /// <summary>
+    /// Maximum allowed temperature
+    /// </summary>
+    [DataField]
+    public float Max = float.PositiveInfinity;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("entity-condition-guidebook-body-temperature",
+            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+            ("min", Min));
+}
diff --git a/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
new file mode 100644
index 0000000000..fbb659b54f
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/TemplateEntityConditionSystem.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+///<summary>
+/// A basic summary of this condition.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class TemplateEntityConditionSystem : EntityConditionSystem<MetaDataComponent, TemplateCondition>
+{
+    protected override void Condition(Entity<MetaDataComponent> entity, ref EntityConditionEvent<TemplateCondition> args)
+    {
+        // Condition goes here.
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class TemplateCondition : EntityConditionBase<TemplateCondition>
+{
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) => String.Empty;
+}
diff --git a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
new file mode 100644
index 0000000000..16f4a946f3
--- /dev/null
+++ b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions.Conditions;
+
+/// <summary>
+/// Returns true if this entity can take damage and if its total damage is within a specified minimum and maximum.
+/// </summary>
+/// <inheritdoc cref="EntityConditionSystem{T, TCondition}"/>
+public sealed partial class TotalDamageEntityConditionSystem : EntityConditionSystem<DamageableComponent, TotalDamageCondition>
+{
+    protected override void Condition(Entity<DamageableComponent> entity, ref EntityConditionEvent<TotalDamageCondition> args)
+    {
+        var total = entity.Comp.TotalDamage;
+        args.Result = total >= args.Condition.Min && total <= args.Condition.Max;
+    }
+}
+
+/// <inheritdoc cref="EntityCondition"/>
+public sealed partial class TotalDamageCondition : EntityConditionBase<TotalDamageCondition>
+{
+    [DataField]
+    public FixedPoint2 Max = FixedPoint2.MaxValue;
+
+    [DataField]
+    public FixedPoint2 Min = FixedPoint2.Zero;
+
+    public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
+        Loc.GetString("entity-condition-guidebook-total-damage",
+            ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
+            ("min", Min.Float()));
+}
diff --git a/Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs b/Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs
new file mode 100644
index 0000000000..090a422641
--- /dev/null
+++ b/Content.Shared/EntityConditions/SharedEntityConditionsSystem.cs
@@ -0,0 +1,152 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityConditions;
+
+/// <summary>
+/// This handles entity effects.
+/// Specifically it handles the receiving of events for causing entity effects, and provides
+/// public API for other systems to take advantage of entity effects.
+/// </summary>
+public sealed partial class SharedEntityConditionsSystem : EntitySystem, IEntityConditionRaiser
+{
+    /// <summary>
+    /// Checks a list of conditions to verify that they all return true.
+    /// </summary>
+    /// <param name="target">Target entity we're checking conditions on</param>
+    /// <param name="conditions">Conditions we're checking</param>
+    /// <returns>Returns true if all conditions return true, false if any fail</returns>
+    public bool TryConditions(EntityUid target, EntityCondition[]? conditions)
+    {
+        // If there's no conditions we can't fail any of them...
+        if (conditions == null)
+            return true;
+
+        foreach (var condition in conditions)
+        {
+            if (!TryCondition(target, condition))
+                return false;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Checks a list of conditions to see if any are true.
+    /// </summary>
+    /// <param name="target">Target entity we're checking conditions on</param>
+    /// <param name="conditions">Conditions we're checking</param>
+    /// <returns>Returns true if any conditions return true</returns>
+    public bool TryAnyCondition(EntityUid target, EntityCondition[]? conditions)
+    {
+        // If there's no conditions we can't meet any of them...
+        if (conditions == null)
+            return false;
+
+        foreach (var condition in conditions)
+        {
+            if (TryCondition(target, condition))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks a single <see cref="EntityCondition"/> on an entity.
+    /// </summary>
+    /// <param name="target">Target entity we're checking conditions on</param>
+    /// <param name="condition">Condition we're checking</param>
+    /// <returns>Returns true if we meet the condition and false otherwise</returns>
+    public bool TryCondition(EntityUid target, EntityCondition condition)
+    {
+        return condition.Inverted != condition.RaiseEvent(target, this);
+    }
+
+    /// <summary>
+    /// Raises a condition to an entity. You should not be calling this unless you know what you're doing.
+    /// </summary>
+    public bool RaiseConditionEvent<T>(EntityUid target, T effect) where T : EntityConditionBase<T>
+    {
+        var effectEv = new EntityConditionEvent<T>(effect);
+        RaiseLocalEvent(target, ref effectEv);
+        return effectEv.Result;
+    }
+}
+
+/// <summary>
+/// This is a basic abstract entity effect containing all the data an entity effect needs to affect entities with effects...
+/// </summary>
+/// <typeparam name="T">The Component that is required for the effect</typeparam>
+/// <typeparam name="TCon">The Condition we're testing</typeparam>
+public abstract partial class EntityConditionSystem<T, TCon> : EntitySystem where T : Component where TCon : EntityConditionBase<TCon>
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<T, EntityConditionEvent<TCon>>(Condition);
+    }
+    protected abstract void Condition(Entity<T> entity, ref EntityConditionEvent<TCon> args);
+}
+
+/// <summary>
+/// Used to raise an EntityCondition without losing the type of condition.
+/// </summary>
+public interface IEntityConditionRaiser
+{
+    bool RaiseConditionEvent<T>(EntityUid target, T effect) where T : EntityConditionBase<T>;
+}
+
+/// <summary>
+/// Used to store an <see cref="EntityCondition"/> so it can be raised without losing the type of the condition.
+/// </summary>
+/// <typeparam name="T">The Condition wer are raising.</typeparam>
+public abstract partial class EntityConditionBase<T> : EntityCondition where T : EntityConditionBase<T>
+{
+    public override bool RaiseEvent(EntityUid target, IEntityConditionRaiser raiser)
+    {
+        if (this is not T type)
+            return false;
+
+        // If the result of the event matches the result we're looking for then we pass.
+        return raiser.RaiseConditionEvent(target, type);
+    }
+}
+
+/// <summary>
+/// A basic condition which can be checked for on an entity via events.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+public abstract partial class EntityCondition
+{
+    public abstract bool RaiseEvent(EntityUid target, IEntityConditionRaiser raiser);
+
+    /// <summary>
+    /// If true, invert the result. So false returns true and true returns false!
+    /// </summary>
+    [DataField]
+    public bool Inverted;
+
+    /// <summary>
+    /// A basic description of this condition, which displays in the guidebook.
+    /// </summary>
+    public abstract string EntityConditionGuidebookText(IPrototypeManager prototype);
+}
+
+/// <summary>
+/// An Event carrying an entity effect.
+/// </summary>
+/// <param name="Condition">The Condition we're checking</param>
+[ByRefEvent]
+public record struct EntityConditionEvent<T>(T Condition) where T : EntityConditionBase<T>
+{
+    /// <summary>
+    /// The result of our check, defaults to false if nothing handles it.
+    /// </summary>
+    [DataField]
+    public bool Result;
+
+    /// <summary>
+    /// The Condition being raised in this event
+    /// </summary>
+    public readonly T Condition = Condition;
+}
diff --git a/Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs
deleted file mode 100644
index 351e4ee12c..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/BodyTemperature.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Requires the target entity to be above or below a certain temperature.
-///     Used for things like cryoxadone and pyroxadone.
-/// </summary>
-public sealed partial class Temperature : EventEntityEffectCondition<Temperature>
-{
-    [DataField]
-    public float Min = 0;
-
-    [DataField]
-    public float Max = float.PositiveInfinity;
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs b/Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs
deleted file mode 100644
index 9de1bfdbf6..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/BreathingCondition.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Condition for if the entity is successfully breathing.
-/// </summary>
-public sealed partial class Breathing : EventEntityEffectCondition<Breathing>
-{
-    /// <summary>
-    ///     If true, the entity must not have trouble breathing to pass.
-    /// </summary>
-    [DataField]
-    public bool IsBreathing = true;
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-breathing",
-                            ("isBreathing", IsBreathing));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs b/Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs
deleted file mode 100644
index 379a248027..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/HasTagCondition.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Tag;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class HasTag : EntityEffectCondition
-{
-    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
-    public string Tag = default!;
-
-    [DataField]
-    public bool Invert = false;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent<TagComponent>(args.TargetEntity, out var tag))
-            return args.EntityManager.System<TagSystem>().HasTag(tag, Tag) ^ Invert;
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        // this should somehow be made (much) nicer.
-        return Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", Tag), ("invert", Invert));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs b/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
deleted file mode 100644
index cb30ef70c7..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/InternalsCondition.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Shared.Body.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Condition for if the entity is or isn't wearing internals.
-/// </summary>
-public sealed partial class Internals : EntityEffectCondition
-{
-    /// <summary>
-    ///     To pass, the entity's internals must have this same state.
-    /// </summary>
-    [DataField]
-    public bool UsingInternals = true;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out InternalsComponent? internalsComp))
-            return !UsingInternals; // They have no internals to wear.
-
-        var internalsState = internalsComp.GasTankEntity != null; // If gas tank is not null, they are wearing internals
-        return UsingInternals == internalsState;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-internals", ("usingInternals", UsingInternals));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/JobCondition.cs b/Content.Shared/EntityEffects/EffectConditions/JobCondition.cs
deleted file mode 100644
index 96f3be64c6..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/JobCondition.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Linq;
-using Content.Shared.Localizations;
-using Content.Shared.Mind;
-using Content.Shared.Mind.Components;
-using Content.Shared.Roles;
-using Content.Shared.Roles.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class JobCondition : EntityEffectCondition
-{
-    [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        args.EntityManager.TryGetComponent<MindContainerComponent>(args.TargetEntity, out var mindContainer);
-
-        if (mindContainer is null
-            || !args.EntityManager.TryGetComponent<MindComponent>(mindContainer.Mind, out var mind))
-            return false;
-
-        foreach (var roleId in mind.MindRoleContainer.ContainedEntities)
-        {
-            if (!args.EntityManager.HasComponent<JobRoleComponent>(roleId))
-                continue;
-
-            if (!args.EntityManager.TryGetComponent<MindRoleComponent>(roleId, out var mindRole))
-            {
-                Logger.Error($"Encountered job mind role entity {roleId} without a {nameof(MindRoleComponent)}");
-                continue;
-            }
-
-            if (mindRole.JobPrototype == null)
-            {
-                Logger.Error($"Encountered job mind role entity {roleId} without a {nameof(JobPrototype)}");
-                continue;
-            }
-
-            if (Job.Contains(mindRole.JobPrototype.Value))
-                return true;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        var localizedNames = Job.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
-        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs b/Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs
deleted file mode 100644
index efe7246b2a..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/MobStateCondition.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class MobStateCondition : EntityEffectCondition
-{
-    [DataField]
-    public MobState Mobstate = MobState.Alive;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out MobStateComponent? mobState))
-        {
-            if (mobState.CurrentState == Mobstate)
-                return true;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
-    }
-}
-
diff --git a/Content.Shared/EntityEffects/EffectConditions/OrganType.cs b/Content.Shared/EntityEffects/EffectConditions/OrganType.cs
deleted file mode 100644
index f99eb5cc77..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/OrganType.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// using Content.Server.Body.Components;
-using Content.Shared.Body.Prototypes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
-/// </summary>
-public sealed partial class OrganType : EventEntityEffectCondition<OrganType>
-{
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
-    public string Type = default!;
-
-    /// <summary>
-    ///     Does this condition pass when the organ has the type, or when it doesn't have the type?
-    /// </summary>
-    [DataField]
-    public bool ShouldHave = true;
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
-            ("name", prototype.Index<MetabolizerTypePrototype>(Type).LocalizedName),
-            ("shouldhave", ShouldHave));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs b/Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs
deleted file mode 100644
index af71f20c8e..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/ReagentThreshold.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Used for implementing reagent effects that require a certain amount of reagent before it should be applied.
-///     For instance, overdoses.
-///
-///     This can also trigger on -other- reagents, not just the one metabolizing. By default, it uses the
-///     one being metabolized.
-/// </summary>
-public sealed partial class ReagentThreshold : EntityEffectCondition
-{
-    [DataField]
-    public FixedPoint2 Min = FixedPoint2.Zero;
-
-    [DataField]
-    public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-    // TODO use ReagentId
-    [DataField]
-    public string? Reagent;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var reagent = Reagent ?? reagentArgs.Reagent?.ID;
-            if (reagent == null)
-                return true; // No condition to apply.
-
-            var quant = FixedPoint2.Zero;
-            if (reagentArgs.Source != null)
-                quant = reagentArgs.Source.GetTotalPrototypeQuantity(reagent);
-
-            return quant >= Min && quant <= Max;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        ReagentPrototype? reagentProto = null;
-        if (Reagent is not null)
-            prototype.TryIndex(Reagent, out reagentProto);
-
-        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
-            ("reagent", reagentProto?.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
-            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-            ("min", Min.Float()));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
deleted file mode 100644
index e2febd8f48..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-/// <summary>
-///     Requires the solution to be above or below a certain temperature.
-///     Used for things like explosives.
-/// </summary>
-public sealed partial class SolutionTemperature : EntityEffectCondition
-{
-    [DataField]
-    public float Min = 0.0f;
-
-    [DataField]
-    public float Max = float.PositiveInfinity;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            return reagentArgs?.Source != null &&
-                   reagentArgs.Source.Temperature >= Min &&
-                   reagentArgs.Source.Temperature <= Max;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-solution-temperature",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
deleted file mode 100644
index a4baeb634a..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.EntityEffects;
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class TotalDamage : EntityEffectCondition
-{
-    [DataField]
-    public FixedPoint2 Max = FixedPoint2.MaxValue;
-
-    [DataField]
-    public FixedPoint2 Min = FixedPoint2.Zero;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
-        {
-            var total = damage.TotalDamage;
-            return total >= Min && total <= Max;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-total-damage",
-            ("max", Max == FixedPoint2.MaxValue ? (float) int.MaxValue : Max.Float()),
-            ("min", Min.Float()));
-    }
-}
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
deleted file mode 100644
index cbeb334c47..0000000000
--- a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.EntityEffects;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.EffectConditions;
-
-public sealed partial class Hunger : EntityEffectCondition
-{
-    [DataField]
-    public float Max = float.PositiveInfinity;
-
-    [DataField]
-    public float Min = 0;
-
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
-        {
-            var total = args.EntityManager.System<HungerSystem>().GetHunger(hunger);
-            return total >= Min && total <= Max;
-        }
-
-        return false;
-    }
-
-    public override string GuidebookExplanation(IPrototypeManager prototype)
-    {
-        return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
-            ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
-            ("min", Min));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs b/Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs
deleted file mode 100644
index 0f2d35d369..0000000000
--- a/Content.Shared/EntityEffects/Effects/AddToSolutionReaction.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Chemistry.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    public sealed partial class AddToSolutionReaction : EntityEffect
-    {
-        [DataField("solution")]
-        private string _solution = "reagents";
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            if (args is EntityEffectReagentArgs reagentArgs) {
-                if (reagentArgs.Reagent == null)
-                    return;
-
-                // TODO see if this is correct
-                var solutionContainerSystem = reagentArgs.EntityManager.System<SharedSolutionContainerSystem>();
-                if (!solutionContainerSystem.TryGetSolution(reagentArgs.TargetEntity, _solution, out var solutionContainer))
-                    return;
-
-                if (solutionContainerSystem.TryAddReagent(solutionContainer.Value, reagentArgs.Reagent.ID, reagentArgs.Quantity, out var accepted))
-                    reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, accepted);
-
-                return;
-            }
-
-            // TODO: Someone needs to figure out how to do this for non-reagent effects.
-            throw new NotImplementedException();
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustAlert.cs b/Content.Shared/EntityEffects/Effects/AdjustAlert.cs
deleted file mode 100644
index 282de0a06c..0000000000
--- a/Content.Shared/EntityEffects/Effects/AdjustAlert.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Content.Shared.Alert;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class AdjustAlert : EntityEffect
-{
-    /// <summary>
-    /// The specific Alert that will be adjusted
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<AlertPrototype> AlertType;
-
-    /// <summary>
-    /// If true, the alert is removed after Time seconds. If Time was not specified the alert is removed immediately.
-    /// </summary>
-    [DataField]
-    public bool Clear;
-
-    /// <summary>
-    /// Visually display cooldown progress over the alert icon.
-    /// </summary>
-    [DataField]
-    public bool ShowCooldown;
-
-    /// <summary>
-    /// The length of the cooldown or delay before removing the alert (in seconds).
-    /// </summary>
-    [DataField]
-    public float Time;
-
-    //JUSTIFICATION: This just changes some visuals, doesn't need to be documented.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var alertSys = args.EntityManager.EntitySysManager.GetEntitySystem<AlertsSystem>();
-        if (!args.EntityManager.HasComponent<AlertsComponent>(args.TargetEntity))
-            return;
-
-        if (Clear && Time <= 0)
-        {
-            alertSys.ClearAlert(args.TargetEntity, AlertType);
-        }
-        else
-        {
-            var timing = IoCManager.Resolve<IGameTiming>();
-            (TimeSpan, TimeSpan)? cooldown = null;
-
-            if ((ShowCooldown || Clear) && Time > 0)
-                cooldown = (timing.CurTime, timing.CurTime + TimeSpan.FromSeconds(Time));
-
-            alertSys.ShowAlert(args.TargetEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
-        }
-
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
new file mode 100644
index 0000000000..633cde0877
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs
@@ -0,0 +1,65 @@
+using Content.Shared.Alert;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Adjusts a given alert on this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AdjustAlertEntityEffectSysten : EntityEffectSystem<AlertsComponent, AdjustAlert>
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+
+    protected override void Effect(Entity<AlertsComponent> entity, ref EntityEffectEvent<AdjustAlert> args)
+    {
+        var time = args.Effect.Time;
+        var clear = args.Effect.Clear;
+        var type = args.Effect.AlertType;
+
+        if (clear && time <= TimeSpan.Zero)
+        {
+            _alerts.ClearAlert(entity.AsNullable(), type);
+        }
+        else
+        {
+            (TimeSpan, TimeSpan)? cooldown = null;
+
+            if ((args.Effect.ShowCooldown || clear) && args.Effect.Time >= TimeSpan.Zero)
+                cooldown = (_timing.CurTime, _timing.CurTime + time);
+
+            _alerts.ShowAlert(entity.AsNullable(), type, cooldown: cooldown, autoRemove: clear, showCooldown: args.Effect.ShowCooldown);
+        }
+
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustAlert : EntityEffectBase<AdjustAlert>
+{
+    /// <summary>
+    /// The specific Alert that will be adjusted
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<AlertPrototype> AlertType;
+
+    /// <summary>
+    /// If true, the alert is removed after Time seconds. If Time was not specified the alert is removed immediately.
+    /// </summary>
+    [DataField]
+    public bool Clear;
+
+    /// <summary>
+    /// Visually display cooldown progress over the alert icon.
+    /// </summary>
+    [DataField]
+    public bool ShowCooldown;
+
+    /// <summary>
+    /// The length of the cooldown or delay before removing the alert (in seconds).
+    /// </summary>
+    [DataField]
+    public TimeSpan Time;
+}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustReagent.cs b/Content.Shared/EntityEffects/Effects/AdjustReagent.cs
deleted file mode 100644
index bb655b46bc..0000000000
--- a/Content.Shared/EntityEffects/Effects/AdjustReagent.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    public sealed partial class AdjustReagent : EntityEffect
-    {
-        /// <summary>
-        ///     The reagent ID to remove. Only one of this and <see cref="Group"/> should be active.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
-        public string? Reagent = null;
-        // TODO use ReagentId
-
-        /// <summary>
-        ///     The metabolism group to remove, if the reagent satisfies any.
-        ///     Only one of this and <see cref="Reagent"/> should be active.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MetabolismGroupPrototype>))]
-        public string? Group = null;
-
-        [DataField(required: true)]
-        public FixedPoint2 Amount = default!;
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (reagentArgs.Source == null)
-                    return;
-
-                var amount = Amount;
-                amount *= reagentArgs.Scale;
-
-                if (Reagent != null)
-                {
-                    if (amount < 0 && reagentArgs.Source.ContainsPrototype(Reagent))
-                        reagentArgs.Source.RemoveReagent(Reagent, -amount);
-                    if (amount > 0)
-                        reagentArgs.Source.AddReagent(Reagent, amount);
-                }
-                else if (Group != null)
-                {
-                    var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
-                    foreach (var quant in reagentArgs.Source.Contents.ToArray())
-                    {
-                        var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
-                        if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
-                        {
-                            if (amount < 0)
-                                reagentArgs.Source.RemoveReagent(quant.Reagent, amount);
-                            if (amount > 0)
-                                reagentArgs.Source.AddReagent(quant.Reagent, amount);
-                        }
-                    }
-                }
-                return;
-            }
-
-            // TODO: Someone needs to figure out how to do this for non-reagent effects.
-            throw new NotImplementedException();
-        }
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            if (Reagent is not null && prototype.TryIndex(Reagent, out ReagentPrototype? reagentProto))
-            {
-                return Loc.GetString("reagent-effect-guidebook-adjust-reagent-reagent",
-                    ("chance", Probability),
-                    ("deltasign", MathF.Sign(Amount.Float())),
-                    ("reagent", reagentProto.LocalizedName),
-                    ("amount", MathF.Abs(Amount.Float())));
-            }
-            else if (Group is not null && prototype.TryIndex(Group, out MetabolismGroupPrototype? groupProto))
-            {
-                return Loc.GetString("reagent-effect-guidebook-adjust-reagent-group",
-                    ("chance", Probability),
-                    ("deltasign", MathF.Sign(Amount.Float())),
-                    ("group", groupProto.LocalizedName),
-                    ("amount", MathF.Abs(Amount.Float())));
-            }
-
-            throw new NotImplementedException();
-        }
-    }
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/AdjustTemperature.cs b/Content.Shared/EntityEffects/Effects/AdjustTemperature.cs
deleted file mode 100644
index 03dc226e93..0000000000
--- a/Content.Shared/EntityEffects/Effects/AdjustTemperature.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class AdjustTemperature : EventEntityEffect<AdjustTemperature>
-{
-    [DataField]
-    public float Amount;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-adjust-temperature",
-            ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount)),
-            ("amount", MathF.Abs(Amount)));
-}
diff --git a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
new file mode 100644
index 0000000000..adc465f341
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Temperature.Components;
+using Content.Shared.Temperature.Systems;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+// TODO: When we get a proper temperature/energy struct combine this with the solution temperature effect!!!
+/// <summary>
+/// Adjusts the temperature of this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AdjustTemperatureEntityEffectSystem : EntityEffectSystem<TemperatureComponent, AdjustTemperature>
+{
+    [Dependency] private readonly SharedTemperatureSystem _temperature = default!;
+    protected override void Effect(Entity<TemperatureComponent> entity, ref EntityEffectEvent<AdjustTemperature> args)
+    {
+        var amount = args.Effect.Amount * args.Scale;
+
+        _temperature.ChangeHeat(entity, amount, true, entity.Comp);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustTemperature : EntityEffectBase<AdjustTemperature>
+{
+    /// <summary>
+    ///     Amount we're adjusting temperature by.
+    /// </summary>
+    [DataField]
+    public float Amount;
+}
diff --git a/Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs b/Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs
deleted file mode 100644
index 45ed261a35..0000000000
--- a/Content.Shared/EntityEffects/Effects/AreaReactionEffect.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Basically smoke and foam reactions.
-/// </summary>
-public sealed partial class AreaReactionEffect : EventEntityEffect<AreaReactionEffect>
-{
-    /// <summary>
-    /// How many seconds will the effect stay, counting after fully spreading.
-    /// </summary>
-    [DataField("duration")] public float Duration = 10;
-
-    /// <summary>
-    /// How many units of reaction for 1 smoke entity.
-    /// </summary>
-    [DataField] public FixedPoint2 OverflowThreshold = FixedPoint2.New(2.5);
-
-    /// <summary>
-    /// The entity prototype that will be spawned as the effect.
-    /// </summary>
-    [DataField("prototypeId", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string PrototypeId = default!;
-
-    /// <summary>
-    /// Sound that will get played when this reaction effect occurs.
-    /// </summary>
-    [DataField("sound", required: true)] public SoundSpecifier Sound = default!;
-
-    public override bool ShouldLog => true;
-
-    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-area-reaction",
-                    ("duration", Duration)
-                );
-
-    public override LogImpact LogImpact => LogImpact.High;
-}
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs b/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
deleted file mode 100644
index 45ca740363..0000000000
--- a/Content.Shared/EntityEffects/Effects/ArtifactDurabilityRestore.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Content.Shared.Xenoarchaeology.Artifact;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Restores durability in active artefact nodes.
-/// </summary>
-public sealed partial class ArtifactDurabilityRestore : EntityEffect
-{
-    /// <summary>
-    ///     Amount of durability that will be restored per effect interaction.
-    /// </summary>
-    [DataField]
-    public int RestoredDurability = 1;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var entMan = args.EntityManager;
-        var xenoArtifactSys = entMan.System<SharedXenoArtifactSystem>();
-
-        if (!entMan.TryGetComponent<XenoArtifactComponent>(args.TargetEntity, out var xenoArtifact))
-            return;
-
-        foreach (var node in xenoArtifactSys.GetActiveNodes((args.TargetEntity, xenoArtifact)))
-        {
-            xenoArtifactSys.AdjustNodeDurability(node.Owner, RestoredDurability);
-        }
-    }
-
-    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return Loc.GetString("reagent-effect-guidebook-artifact-durability-restore", ("restored", RestoredDurability));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
new file mode 100644
index 0000000000..563c053b36
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs
@@ -0,0 +1,72 @@
+using Content.Shared.Popups;
+using Content.Shared.Xenoarchaeology.Artifact;
+using Content.Shared.Xenoarchaeology.Artifact.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Restores durability on this artifact
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ArtifactDurabilityRestoreEntityEffectsSystem : EntityEffectSystem<XenoArtifactComponent, ArtifactDurabilityRestore>
+{
+    [Dependency] private readonly SharedXenoArtifactSystem _xenoArtifact = default!;
+
+    protected override void Effect(Entity<XenoArtifactComponent> entity, ref EntityEffectEvent<ArtifactDurabilityRestore> args)
+    {
+        var durability = args.Effect.RestoredDurability;
+
+        foreach (var node in _xenoArtifact.GetActiveNodes(entity))
+        {
+            _xenoArtifact.AdjustNodeDurability(node.Owner, durability);
+        }
+    }
+}
+
+/// <summary>
+/// Unlocks a node on this artifact. Only works this effect hasn't been applied before.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ArtifactUnlockEntityEffectSystem : EntityEffectSystem<XenoArtifactComponent, ArtifactUnlock>
+{
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedXenoArtifactSystem _xenoArtifact = default!;
+
+    protected override void Effect(Entity<XenoArtifactComponent> entity, ref EntityEffectEvent<ArtifactUnlock> args)
+    {
+        if (EnsureComp<XenoArtifactUnlockingComponent>(entity, out var unlocking))
+        {
+            if (unlocking.ArtifexiumApplied)
+                return;
+
+            _popup.PopupEntity(Loc.GetString("artifact-activation-artifexium"), entity, PopupType.Medium);
+        }
+        else
+        {
+            _xenoArtifact.TriggerXenoArtifact(entity, null, force: true);
+        }
+
+        _xenoArtifact.SetArtifexiumApplied((entity, unlocking), true);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ArtifactDurabilityRestore : EntityEffectBase<ArtifactDurabilityRestore>
+{
+    /// <summary>
+    ///     Amount of durability that will be restored per effect interaction.
+    /// </summary>
+    [DataField]
+    public int RestoredDurability = 1;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-artifact-durability-restore", ("restored", RestoredDurability));
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ArtifactUnlock : EntityEffectBase<ArtifactUnlock>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-artifact-unlock", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs b/Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs
deleted file mode 100644
index 077e1ebfd2..0000000000
--- a/Content.Shared/EntityEffects/Effects/ArtifactUnlock.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Shared.Xenoarchaeology.Artifact;
-using Content.Shared.EntityEffects;
-using Content.Shared.Popups;
-using Content.Shared.Xenoarchaeology.Artifact.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Sets an artifact into the unlocking state and marks the artifexium effect as true.
-/// This is a very specific behavior intended for a specific chem.
-/// </summary>
-public sealed partial class ArtifactUnlock : EntityEffect
-{
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var entMan = args.EntityManager;
-        var xenoArtifactSys = entMan.System<SharedXenoArtifactSystem>();
-        var popupSys = entMan.System<SharedPopupSystem>();
-
-        if (!entMan.TryGetComponent<XenoArtifactComponent>(args.TargetEntity, out var xenoArtifact))
-            return;
-
-        if (!entMan.TryGetComponent<XenoArtifactUnlockingComponent>(args.TargetEntity, out var unlocking))
-        {
-            xenoArtifactSys.TriggerXenoArtifact((args.TargetEntity, xenoArtifact), null, force: true);
-            unlocking = entMan.EnsureComponent<XenoArtifactUnlockingComponent>(args.TargetEntity);
-        }
-        else if (!unlocking.ArtifexiumApplied)
-        {
-            popupSys.PopupEntity(Loc.GetString("artifact-activation-artifexium"), args.TargetEntity, PopupType.Medium);
-        }
-
-        if (unlocking.ArtifexiumApplied)
-            return;
-
-        xenoArtifactSys.SetArtifexiumApplied((args.TargetEntity, unlocking), true);
-    }
-
-    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return Loc.GetString("reagent-effect-guidebook-artifact-unlock", ("chance", Probability));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
new file mode 100644
index 0000000000..aa5132e596
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Atmos/CreateGasEntityEffect.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class CreateGas : EntityEffectBase<CreateGas>
+{
+    /// <summary>
+    ///     The gas we're creating
+    /// </summary>
+    [DataField]
+    public Gas Gas;
+
+    /// <summary>
+    ///     Amount of moles we're creating
+    /// </summary>
+    [DataField]
+    public float Moles = 3f;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var atmos = entSys.GetEntitySystem<SharedAtmosphereSystem>();
+        var gasProto = atmos.GetGas(Gas);
+
+        return Loc.GetString("entity-effect-guidebook-create-gas",
+            ("chance", Probability),
+            ("moles", Moles),
+            ("gas", gasProto.Name));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
new file mode 100644
index 0000000000..b4b475ec59
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Atmos/ExtinguishEntityEffectSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// This raises an extinguish event on a given entity, reducing FireStacks.
+/// The amount of FireStacks reduced is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ExtinguishEntityEffectSystem : EntityEffectSystem<FlammableComponent, Extinguish>
+{
+    protected override void Effect(Entity<FlammableComponent> entity, ref EntityEffectEvent<Extinguish> args)
+    {
+        var ev = new ExtinguishEvent
+        {
+            FireStacksAdjustment = args.Effect.FireStacksAdjustment * args.Scale,
+        };
+
+        RaiseLocalEvent(entity, ref ev);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Extinguish : EntityEffectBase<Extinguish>
+{
+    /// <summary>
+    ///     Amount of FireStacks reduced.
+    /// </summary>
+    [DataField]
+    public float FireStacksAdjustment = -1.5f;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-extinguish-reaction", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
new file mode 100644
index 0000000000..563201a40f
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Atmos/FlammableEntityEffect.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Database;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Flammable : EntityEffectBase<Flammable>
+{
+    /// <summary>
+    /// Fire stack multiplier applied on an entity,
+    /// unless that entity is already on fire and <see cref="MultiplierOnExisting"/> is not null.
+    /// </summary>
+    [DataField]
+    public float Multiplier = 0.05f;
+
+    /// <summary>
+    /// Fire stack multiplier applied if the entity is already on fire. Defaults to <see cref="Multiplier"/> if null.
+    /// </summary>
+    [DataField]
+    public float? MultiplierOnExisting;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-flammable-reaction", ("chance", Probability));
+
+    public override LogImpact? Impact => LogImpact.Low;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
new file mode 100644
index 0000000000..7ca93e7c18
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Atmos/IgniteEntityEffect.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Database;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Atmos;
+
+/// <summary>
+/// See serverside system
+/// </summary>
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Ignite : EntityEffectBase<Ignite>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-ignite", ("chance", Probability));
+
+    public override LogImpact? Impact => LogImpact.Medium;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
new file mode 100644
index 0000000000..402a50538a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Removes a given amount of chemicals from the bloodstream modified by scale.
+/// Optionally ignores a given chemical.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class CleanBloodstreamEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, CleanBloodstream>
+{
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
+
+    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<CleanBloodstream> args)
+    {
+        var scale = args.Scale * args.Effect.CleanseRate;
+
+        _bloodstream.FlushChemicals((entity, entity), args.Effect.Excluded, scale);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class CleanBloodstream : EntityEffectBase<CleanBloodstream>
+{
+    /// <summary>
+    ///     Amount of reagent we're cleaning out of our bloodstream.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 CleanseRate = 3.0f;
+
+    /// <summary>
+    ///     An optional chemical to ignore when doing removal.
+    /// </summary>
+    [DataField]
+    public ProtoId<ReagentPrototype>? Excluded;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-clean-bloodstream", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
new file mode 100644
index 0000000000..29fd994e8c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Eye.Blinding.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Modifies eye damage by a given amount, modified by scale, floored to an integer.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class EyeDamageEntityEffectSystem : EntityEffectSystem<MetaDataComponent, EyeDamage>
+{
+    [Dependency] private readonly BlindableSystem _blindable = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<EyeDamage> args)
+    {
+        var amount = (int) Math.Floor(args.Effect.Amount * args.Scale);
+        _blindable.AdjustEyeDamage(entity.Owner, amount);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class EyeDamage : EntityEffectBase<EyeDamage>
+{
+    /// <summary>
+    /// The amount of eye damage we're adding or removing
+    /// </summary>
+    [DataField]
+    public int Amount = -1;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
new file mode 100644
index 0000000000..c684ffcdf2
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Modifies bleed by a given amount multiplied by scale. This can increase or decrease bleed.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyBleedEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, ModifyBleed>
+{
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
+
+    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<ModifyBleed> args)
+    {
+        _bloodstream.TryModifyBleedAmount(entity.AsNullable(), args.Effect.Amount * args.Scale);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyBleed : EntityEffectBase<ModifyBleed>
+{
+    /// <summary>
+    /// Amount of bleed we're applying or removing if negative.
+    /// </summary>
+    [DataField]
+    public float Amount = -1.0f;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-modify-bleed-amount", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
new file mode 100644
index 0000000000..43098c9ddd
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Modifies the amount of blood in this entity's bloodstream by a given amount multiplied by scale.
+/// This effect can increase or decrease blood level.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyBloodLevelEntityEffectSystem : EntityEffectSystem<BloodstreamComponent, ModifyBloodLevel>
+{
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
+
+    protected override void Effect(Entity<BloodstreamComponent> entity, ref EntityEffectEvent<ModifyBloodLevel> args)
+    {
+        _bloodstream.TryModifyBloodLevel(entity.AsNullable(), args.Effect.Amount * args.Scale);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyBloodLevel : EntityEffectBase<ModifyBloodLevel>
+{
+    /// <summary>
+    /// Amount of bleed we're applying or removing if negative.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 Amount = 1.0f;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-modify-blood-level", ("chance", Probability), ("deltasign", MathF.Sign(Amount.Float())));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
new file mode 100644
index 0000000000..29fa1de98d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/ModifyLungGasEntityEffectSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Atmos;
+using Content.Shared.Body.Components;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Adjust the amount of Moles stored in this set of lungs based on a given dictionary of gasses and ratios.
+/// The amount of gas adjusted is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyLungGasEntityEffectSystem : EntityEffectSystem<LungComponent, ModifyLungGas>
+{
+    // TODO: This shouldn't be an entity effect, gasses should just metabolize and make a byproduct by default...
+    protected override void Effect(Entity<LungComponent> entity, ref EntityEffectEvent<ModifyLungGas> args)
+    {
+        var amount = args.Scale;
+
+        foreach (var (gas, ratio) in args.Effect.Ratios)
+        {
+            var quantity = ratio * amount / Atmospherics.BreathMolesToReagentMultiplier;
+            if (quantity < 0)
+                quantity = Math.Max(quantity, -entity.Comp.Air[(int) gas]);
+            entity.Comp.Air.AdjustMoles(gas, quantity);
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyLungGas : EntityEffectBase<ModifyLungGas>
+{
+    [DataField(required: true)]
+    public Dictionary<Gas, float> Ratios = default!;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
new file mode 100644
index 0000000000..9790fced4e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/OxygenateEntityEffect.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Oxygenate : EntityEffectBase<Oxygenate>
+{
+    /// <summary>
+    /// Factor of oxygenation per metabolized quantity. Lungs metabolize at about 50u per tick so we need an equal multiplier to cancel that out!
+    /// </summary>
+    [DataField]
+    public float Factor = 1f;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
new file mode 100644
index 0000000000..4fb41bd010
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Atmos.Rotting;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Reduces the rotting timer on an entity by a number of seconds, modified by scale.
+/// This cannot increase the amount of seconds a body has rotted.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ReduceRottingEntityEffectSystem : EntityEffectSystem<PerishableComponent, ReduceRotting>
+{
+    [Dependency] private readonly SharedRottingSystem _rotting = default!;
+
+    protected override void Effect(Entity<PerishableComponent> entity, ref EntityEffectEvent<ReduceRotting> args)
+    {
+        var amount = args.Effect.Seconds * args.Scale;
+
+        _rotting.ReduceAccumulator(entity, amount);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ReduceRotting : EntityEffectBase<ReduceRotting>
+{
+    /// <summary>
+    /// Number of seconds removed from the rotting timer.
+    /// </summary>
+    [DataField]
+    public TimeSpan Seconds = TimeSpan.FromSeconds(10);
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-reduce-rotting",
+            ("chance", Probability),
+            ("time", Seconds.TotalSeconds));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
new file mode 100644
index 0000000000..167e7e540d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs
@@ -0,0 +1,63 @@
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+// TODO: These systems are in the same file since satiation should be one system instead of two. Combine these when that happens.
+// TODO: Arguably oxygen saturation should also be added here...
+/// <summary>
+/// Modifies the thirst level of a given entity, multiplied by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SatiateThirstEntityEffectsSystem : EntityEffectSystem<ThirstComponent, SatiateThirst>
+{
+    [Dependency] private readonly ThirstSystem _thirst = default!;
+    protected override void Effect(Entity<ThirstComponent> entity, ref EntityEffectEvent<SatiateThirst> args)
+    {
+        _thirst.ModifyThirst(entity, entity.Comp, args.Effect.Factor * args.Scale);
+    }
+}
+
+/// <summary>
+/// Modifies the hunger level of a given entity, multiplied by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SatiateHungerEntityEffectsSystem : EntityEffectSystem<HungerComponent, SatiateHunger>
+{
+    [Dependency] private readonly HungerSystem _hunger = default!;
+    protected override void Effect(Entity<HungerComponent> entity, ref EntityEffectEvent<SatiateHunger> args)
+    {
+        _hunger.ModifyHunger(entity, args.Effect.Factor * args.Scale, entity.Comp);
+    }
+}
+
+/// <summary>
+/// A type of <see cref="EntityEffectBase{T}"/> made for satiation effects.
+/// </summary>
+/// <typeparam name="T">The effect inheriting this BaseEffect</typeparam>
+/// <inheritdoc cref="EntityEffect"/>
+public abstract partial class Satiate<T> : EntityEffectBase<T> where T : EntityEffectBase<T>
+{
+    public const float AverageSatiation = 3f; // Magic number. Not sure how it was calculated since I didn't make it.
+
+    /// <summary>
+    ///     Change in satiation.
+    /// </summary>
+    [DataField]
+    public float Factor = 1.5f;
+}
+
+/// <inheritdoc cref="Satiate{T}"/>
+public sealed partial class SatiateThirst : Satiate<SatiateThirst>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  Factor / AverageSatiation));
+}
+
+/// <inheritdoc cref="Satiate{T}"/>
+public sealed partial class SatiateHunger : Satiate<SatiateHunger>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-satiate-hunger", ("chance", Probability), ("relative", Factor / AverageSatiation));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
new file mode 100644
index 0000000000..02747057c5
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Medical;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Body;
+
+/// <summary>
+/// Makes an entity vomit and reduces hunger and thirst by a given amount, modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class VomitEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Vomit>
+{
+    [Dependency] private readonly VomitSystem _vomit = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Vomit> args)
+    {
+        _vomit.Vomit(entity.Owner, args.Effect.ThirstAmount * args.Scale, args.Effect.HungerAmount * args.Scale);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Vomit : EntityEffectBase<Vomit>
+{
+    /// <summary>
+    /// How much we adjust our thirst after vomiting.
+    /// </summary>
+    [DataField]
+    public float ThirstAmount = -8f;
+
+    /// <summary>
+    /// How much we adjust our hunger after vomiting.
+    /// </summary>
+    [DataField]
+    public float HungerAmount = -8f;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-vomit", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs
new file mode 100644
index 0000000000..9b235e68d4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/BasePlantAdjustAttributeEntityEffect.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+/// A type of <see cref="EntityEffectBase{T}"/> which modifies the attribute of a Seed in a PlantHolder.
+/// These are not modified by scale as botany has no concept of scale.
+/// </summary>
+/// <typeparam name="T">The effect inheriting this BaseEffect</typeparam>
+/// <inheritdoc cref="EntityEffect"/>
+public abstract partial class BasePlantAdjustAttribute<T> : EntityEffectBase<T> where T : BasePlantAdjustAttribute<T>
+{
+    /// <summary>
+    /// How much we're adjusting the given attribute by.
+    /// </summary>
+    [DataField]
+    public float Amount { get; protected set; } = 1;
+
+    /// <summary>
+    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
+    /// </summary>
+    [DataField]
+    public abstract string GuidebookAttributeName { get; set; }
+
+    /// <summary>
+    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
+    /// </summary>
+    [DataField]
+    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-attribute",
+        ("attribute", Loc.GetString(GuidebookAttributeName)),
+        ("amount", Amount.ToString("0.00")),
+        ("positive", GuidebookIsAttributePositive),
+        ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs
new file mode 100644
index 0000000000..069cb320a9
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealth.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustHealth : BasePlantAdjustAttribute<PlantAdjustHealth>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs
new file mode 100644
index 0000000000..32e419e291
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevel.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustMutationLevel : BasePlantAdjustAttribute<PlantAdjustMutationLevel>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs
new file mode 100644
index 0000000000..4ea695d135
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationMod.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustMutationMod : BasePlantAdjustAttribute<PlantAdjustMutationMod>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs
new file mode 100644
index 0000000000..6f53076fb3
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutrition.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustNutrition : BasePlantAdjustAttribute<PlantAdjustNutrition>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPests.cs
similarity index 53%
rename from Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
rename to Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPests.cs
index 18c00550d5..c1661ec89e 100644
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPests.cs
@@ -1,6 +1,6 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
 
-public sealed partial class PlantAdjustPests : PlantAdjustAttribute<PlantAdjustPests>
+public sealed partial class PlantAdjustPests : BasePlantAdjustAttribute<PlantAdjustPests>
 {
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-pests";
     public override bool GuidebookIsAttributePositive { get; protected set; } = false;
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs
new file mode 100644
index 0000000000..4f42adf3e6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotency.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+///     Handles increase or decrease of plant potency.
+/// </summary>
+public sealed partial class PlantAdjustPotency : BasePlantAdjustAttribute<PlantAdjustPotency>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-potency";
+}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxins.cs
similarity index 53%
rename from Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
rename to Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxins.cs
index 9123b5847d..04eccb03ec 100644
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustToxins.cs
@@ -1,8 +1,9 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
 
-public sealed partial class PlantAdjustToxins : PlantAdjustAttribute<PlantAdjustToxins>
+public sealed partial class PlantAdjustToxins : BasePlantAdjustAttribute<PlantAdjustToxins>
 {
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-toxins";
+
     public override bool GuidebookIsAttributePositive { get; protected set; } = false;
 }
 
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs
new file mode 100644
index 0000000000..1d6ef8ea09
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWater.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAdjustWater : BasePlantAdjustAttribute<PlantAdjustWater>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeeds.cs
similarity index 53%
rename from Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
rename to Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeeds.cs
index 70ff0747dd..e6be25d8c9 100644
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWeeds.cs
@@ -1,6 +1,6 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
 
-public sealed partial class PlantAdjustWeeds : PlantAdjustAttribute<PlantAdjustWeeds>
+public sealed partial class PlantAdjustWeeds : BasePlantAdjustAttribute<PlantAdjustWeeds>
 {
     public override string GuidebookAttributeName { get; set; } = "plant-attribute-weeds";
     public override bool GuidebookIsAttributePositive { get; protected set; } = false;
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs
new file mode 100644
index 0000000000..76466f544d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowth.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantAffectGrowth : BasePlantAdjustAttribute<PlantAffectGrowth>
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs
new file mode 100644
index 0000000000..dcea56baad
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStat.cs
@@ -0,0 +1,21 @@
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantChangeStat : EntityEffectBase<PlantChangeStat>
+{
+    /// <remarks>
+    /// This is the worst thing in the code base.
+    /// It's meant to be generic and expandable I guess? But it's looking for a specific datafield and then
+    /// sending it into an if else if else if statement that filters by object type and randomly flips bits.
+    /// </remarks>
+    [DataField (required: true)]
+    public string TargetValue = string.Empty;
+
+    [DataField]
+    public float MinValue;
+
+    [DataField]
+    public float MaxValue;
+
+    [DataField]
+    public int Steps;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs
new file mode 100644
index 0000000000..7dcea240a6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadone.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantCryoxadone : EntityEffectBase<PlantCryoxadone>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-cryoxadone", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs
new file mode 100644
index 0000000000..d45c0369f7
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+///     Handles removal of seeds on a plant.
+/// </summary>
+public sealed partial class PlantDestroySeeds : EntityEffectBase<PlantDestroySeeds>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-seeds-remove", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs
new file mode 100644
index 0000000000..4355a44593
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamine.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantDiethylamine : EntityEffectBase<PlantDiethylamine>
+{
+    /// <inheritdoc/>
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-diethylamine", ("chance", Probability));
+}
+
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs
new file mode 100644
index 0000000000..b56b99038b
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantPhalanximine.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class PlantPhalanximine : EntityEffectBase<PlantPhalanximine>
+{
+    /// <inheritdoc/>
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-phalanximine", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs
new file mode 100644
index 0000000000..63b06b0ad1
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeeds.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+/// <summary>
+///     Handles restoral of seeds on a plant.
+/// </summary>
+public sealed partial class PlantRestoreSeeds : EntityEffectBase<PlantRestoreSeeds>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-seeds-add", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs
new file mode 100644
index 0000000000..77bde39b12
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvest.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany.PlantAttributes;
+
+public sealed partial class RobustHarvest : EntityEffectBase<RobustHarvest>
+{
+    [DataField]
+    public int PotencyLimit = 50;
+
+    [DataField]
+    public int PotencyIncrease = 3;
+
+    [DataField]
+    public int PotencySeedlessThreshold = 30;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-plant-robust-harvest",
+            ("seedlesstreshold", PotencySeedlessThreshold),
+            ("limit", PotencyLimit),
+            ("increase", PotencyIncrease),
+            ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
new file mode 100644
index 0000000000..6a3d13e0c6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffect.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Random;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Botany;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+public sealed partial class PlantMutateChemicals : EntityEffectBase<PlantMutateChemicals>
+{
+    /// <summary>
+    /// The Reagent list this mutation draws from.
+    /// </summary>
+    [DataField]
+    public ProtoId<WeightedRandomFillSolutionPrototype> RandomPickBotanyReagent = "RandomPickBotanyReagent";
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
new file mode 100644
index 0000000000..c617c05b33
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffect.cs
@@ -0,0 +1,22 @@
+namespace Content.Shared.EntityEffects.Effects.Botany;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+public sealed partial class PlantMutateConsumeGases : EntityEffectBase<PlantMutateConsumeGases>
+{
+    [DataField]
+    public float MinValue = 0.01f;
+
+    [DataField]
+    public float MaxValue = 0.5f;
+}
+
+public sealed partial class PlantMutateExudeGases : EntityEffectBase<PlantMutateExudeGases>
+{
+    [DataField]
+    public float MinValue = 0.01f;
+
+    [DataField]
+    public float MaxValue = 0.5f;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs
new file mode 100644
index 0000000000..3602453b16
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateHarvestEntityEffect.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.EntityEffects.Effects.Botany;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+public sealed partial class PlantMutateHarvest : EntityEffectBase<PlantMutateHarvest>;
diff --git a/Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs
new file mode 100644
index 0000000000..91e8947044
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffect.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.EntityEffects.Effects.Botany;
+
+/// <summary>
+/// See serverside system.
+/// </summary>
+public sealed partial class PlantMutateSpeciesChange : EntityEffectBase<PlantMutateSpeciesChange>;
diff --git a/Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs b/Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs
deleted file mode 100644
index 3f8c58b74c..0000000000
--- a/Content.Shared/EntityEffects/Effects/CauseZombieInfection.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class CauseZombieInfection : EventEntityEffect<CauseZombieInfection>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-cause-zombie-infection", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs b/Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs
deleted file mode 100644
index 98181b8667..0000000000
--- a/Content.Shared/EntityEffects/Effects/ChemCleanBloodstream.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Basically smoke and foam reactions.
-/// </summary>
-public sealed partial class ChemCleanBloodstream : EventEntityEffect<ChemCleanBloodstream>
-{
-    [DataField]
-    public float CleanseRate = 3.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-chem-clean-bloodstream", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs b/Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs
deleted file mode 100644
index 83b2aa96e5..0000000000
--- a/Content.Shared/EntityEffects/Effects/ChemHealEyeDamage.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared.Eye.Blinding.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Heal or apply eye damage
-/// </summary>
-public sealed partial class ChemHealEyeDamage : EntityEffect
-{
-    /// <summary>
-    /// How much eye damage to add.
-    /// </summary>
-    [DataField]
-    public int Amount = -1;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-cure-eye-damage", ("chance", Probability), ("deltasign", MathF.Sign(Amount)));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-            if (reagentArgs.Scale != 1f) // huh?
-                return;
-
-        args.EntityManager.EntitySysManager.GetEntitySystem<BlindableSystem>().AdjustEyeDamage(args.TargetEntity, Amount);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ChemVomit.cs b/Content.Shared/EntityEffects/Effects/ChemVomit.cs
deleted file mode 100644
index 1cd6b2552c..0000000000
--- a/Content.Shared/EntityEffects/Effects/ChemVomit.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Forces you to vomit.
-/// </summary>
-public sealed partial class ChemVomit : EventEntityEffect<ChemVomit>
-{
-    /// How many units of thirst to add each time we vomit
-    [DataField]
-    public float ThirstAmount = -8f;
-    /// How many units of hunger to add each time we vomit
-    [DataField]
-    public float HungerAmount = -8f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-chem-vomit", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs b/Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs
deleted file mode 100644
index 33173b1737..0000000000
--- a/Content.Shared/EntityEffects/Effects/CreateEntityReactionEffect.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-[DataDefinition]
-public sealed partial class CreateEntityReactionEffect : EventEntityEffect<CreateEntityReactionEffect>
-{
-    /// <summary>
-    ///     What entity to create.
-    /// </summary>
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string Entity = default!;
-
-    /// <summary>
-    ///     How many entities to create per unit reaction.
-    /// </summary>
-    [DataField]
-    public uint Number = 1;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-create-entity-reaction-effect",
-            ("chance", Probability),
-            ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
-            ("amount", Number));
-}
diff --git a/Content.Shared/EntityEffects/Effects/CreateGas.cs b/Content.Shared/EntityEffects/Effects/CreateGas.cs
deleted file mode 100644
index 75d554cdb3..0000000000
--- a/Content.Shared/EntityEffects/Effects/CreateGas.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.EntitySystems;
-using Content.Shared.Database;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class CreateGas : EventEntityEffect<CreateGas>
-{
-    [DataField(required: true)]
-    public Gas Gas = default!;
-
-    /// <summary>
-    ///     For each unit consumed, how many moles of gas should be created?
-    /// </summary>
-    [DataField]
-    public float Multiplier = 3f;
-
-    public override bool ShouldLog => true;
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        var atmos = entSys.GetEntitySystem<SharedAtmosphereSystem>();
-        var gasProto = atmos.GetGas(Gas);
-
-        return Loc.GetString("reagent-effect-guidebook-create-gas",
-            ("chance", Probability),
-            ("moles", Multiplier),
-            ("gas", gasProto.Name));
-    }
-
-    public override LogImpact LogImpact => LogImpact.High;
-}
diff --git a/Content.Shared/EntityEffects/Effects/CureZombieInfection.cs b/Content.Shared/EntityEffects/Effects/CureZombieInfection.cs
deleted file mode 100644
index dd2d21854c..0000000000
--- a/Content.Shared/EntityEffects/Effects/CureZombieInfection.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class CureZombieInfection : EventEntityEffect<CureZombieInfection>
-{
-    [DataField]
-    public bool Innoculate;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        if(Innoculate)
-            return Loc.GetString("reagent-effect-guidebook-innoculate-zombie-infection", ("chance", Probability));
-
-        return Loc.GetString("reagent-effect-guidebook-cure-zombie-infection", ("chance", Probability));
-    }
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/Drunk.cs b/Content.Shared/EntityEffects/Effects/Drunk.cs
deleted file mode 100644
index aa15df8f3d..0000000000
--- a/Content.Shared/EntityEffects/Effects/Drunk.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Drunk;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Drunk : EntityEffect
-{
-    /// <summary>
-    ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
-    /// </summary>
-    [DataField]
-    public TimeSpan BoozePower = TimeSpan.FromSeconds(3f);
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-drunk", ("chance", Probability));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var boozePower = BoozePower;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-            boozePower *= reagentArgs.Scale.Float();
-
-        var drunkSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedDrunkSystem>();
-        drunkSys.TryApplyDrunkenness(args.TargetEntity, boozePower);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Electrocute.cs b/Content.Shared/EntityEffects/Effects/Electrocute.cs
deleted file mode 100644
index 32e0ff1172..0000000000
--- a/Content.Shared/EntityEffects/Effects/Electrocute.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared.Electrocution;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Electrocute : EntityEffect
-{
-    [DataField] public int ElectrocuteTime = 2;
-
-    [DataField] public int ElectrocuteDamageScale = 5;
-
-    /// <remarks>
-    ///     true - refresh electrocute time,  false - accumulate electrocute time
-    /// </remarks>
-    [DataField] public bool Refresh = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime));
-
-    public override bool ShouldLog => true;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            reagentArgs.EntityManager.System<SharedElectrocutionSystem>().TryDoElectrocution(reagentArgs.TargetEntity, null,
-                Math.Max((reagentArgs.Quantity * ElectrocuteDamageScale).Int(), 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
-
-            if (reagentArgs.Reagent != null)
-                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, reagentArgs.Quantity);
-        } else
-        {
-            args.EntityManager.System<SharedElectrocutionSystem>().TryDoElectrocution(args.TargetEntity, null,
-                Math.Max(ElectrocuteDamageScale, 1), TimeSpan.FromSeconds(ElectrocuteTime), Refresh, ignoreInsulation: true);
-        }
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Emote.cs b/Content.Shared/EntityEffects/Effects/Emote.cs
deleted file mode 100644
index 494dc502f5..0000000000
--- a/Content.Shared/EntityEffects/Effects/Emote.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Shared.Chat.Prototypes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Tries to force someone to emote (scream, laugh, etc). Still respects whitelists/blacklists and other limits unless specially forced.
-/// </summary>
-public sealed partial class Emote : EventEntityEffect<Emote>
-{
-    /// <summary>
-    ///     The emote the entity will preform.
-    /// </summary>
-    [DataField("emote", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
-    public string EmoteId;
-
-    /// <summary>
-    ///     If the emote should be recorded in chat.
-    /// </summary>
-    [DataField]
-    public bool ShowInChat;
-
-    /// <summary>
-    ///     If the forced emote will be listed in the guidebook.
-    /// </summary>
-    [DataField]
-    public bool ShowInGuidebook;
-
-    /// <summary>
-    ///     If true, the entity will preform the emote even if they normally can't.
-    /// </summary>
-    [DataField]
-    public bool Force = false;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        if (!ShowInGuidebook)
-            return null; // JUSTIFICATION: Emoting is mostly flavor, so same reason popup messages are not in here.
-
-        var emotePrototype = prototype.Index<EmotePrototype>(EmoteId);
-        return Loc.GetString("reagent-effect-guidebook-emote", ("chance", Probability), ("emote", Loc.GetString(emotePrototype.Name)));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs
new file mode 100644
index 0000000000..d8474e4163
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Chat;
+using Content.Shared.Chat.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Makes this entity emote.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class EmoteEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Emote>
+{
+    [Dependency] private readonly SharedChatSystem _chat = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Emote> args)
+    {
+        if (args.Effect.ShowInChat)
+            _chat.TryEmoteWithChat(entity, args.Effect.EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: args.Effect.Force);
+        else
+            _chat.TryEmoteWithoutChat(entity, args.Effect.EmoteId);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Emote : EntityEffectBase<Emote>
+{
+    /// <summary>
+    ///     The emote the entity will preform.
+    /// </summary>
+    [DataField("emote", required: true)]
+    public ProtoId<EmotePrototype> EmoteId;
+
+    /// <summary>
+    ///     If the emote should be recorded in chat.
+    /// </summary>
+    [DataField]
+    public bool ShowInChat;
+
+    /// <summary>
+    ///     If the forced emote will be listed in the guidebook.
+    /// </summary>
+    [DataField]
+    public bool ShowInGuidebook;
+
+    /// <summary>
+    ///     If true, the entity will preform the emote even if they normally can't.
+    /// </summary>
+    [DataField]
+    public bool Force;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        if (!ShowInGuidebook || !prototype.Resolve(EmoteId, out var emote))
+            return null; // JUSTIFICATION: Emoting is mostly flavor, so same reason popup messages are not in here.
+
+        return Loc.GetString("entity-effect-guidebook-emote", ("chance", Probability), ("emote", Loc.GetString(emote.Name)));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs b/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs
deleted file mode 100644
index 0f9eacc58d..0000000000
--- a/Content.Shared/EntityEffects/Effects/EmpReactionEffect.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-[DataDefinition]
-public sealed partial class EmpReactionEffect : EventEntityEffect<EmpReactionEffect>
-{
-    /// <summary>
-    ///     Impulse range per unit of quantity
-    /// </summary>
-    [DataField("rangePerUnit")]
-    public float EmpRangePerUnit = 0.5f;
-
-    /// <summary>
-    ///     Maximum impulse range
-    /// </summary>
-    [DataField("maxRange")]
-    public float EmpMaxRange = 10;
-
-    /// <summary>
-    ///     How much energy will be drain from sources
-    /// </summary>
-    [DataField]
-    public float EnergyConsumption = 12500;
-
-    /// <summary>
-    ///     Amount of time entities will be disabled
-    /// </summary>
-    [DataField("duration")]
-    public TimeSpan DisableDuration = TimeSpan.FromSeconds(15);
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-emp-reaction-effect", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
new file mode 100644
index 0000000000..bd8d68813e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs
@@ -0,0 +1,39 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// A type of <see cref="EntityEffectBase{T}"/> for effects that spawn entities by prototype.
+/// </summary>
+/// <typeparam name="T">The entity effect inheriting this BaseEffect</typeparam>
+/// <inheritdoc cref="EntityEffect"/>
+public abstract partial class BaseSpawnEntityEntityEffect<T> : EntityEffectBase<T> where T : BaseSpawnEntityEntityEffect<T>
+{
+    /// <summary>
+    /// Amount of entities we're spawning
+    /// </summary>
+    [DataField]
+    public int Number = 1;
+
+    /// <summary>
+    /// Prototype of the entity we're spawning
+    /// </summary>
+    [DataField (required: true)]
+    public EntProtoId Entity;
+
+    /// <summary>
+    /// Whether this spawning is predicted. Set false to not predict the spawn.
+    /// Entities with animations or that have random elements when spawned should set this to false.
+    /// </summary>
+    [DataField]
+    public bool Predicted = true;
+
+    /// <inheritdoc cref="EntityEffect.Scaling"/>
+    public override bool Scaling => true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-spawn-entity",
+            ("chance", Probability),
+            ("entname", IoCManager.Resolve<IPrototypeManager>().Index<EntityPrototype>(Entity).Name),
+            ("amount", Number));
+}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
new file mode 100644
index 0000000000..9887ecdc60
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.Network;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// Spawns a number of entities of a given prototype at the coordinates of this entity.
+/// Amount is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SpawnEntityEntityEffectSystem : EntityEffectSystem<TransformComponent, SpawnEntity>
+{
+    [Dependency] private readonly INetManager _net = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<SpawnEntity> args)
+    {
+        var quantity = args.Effect.Number * (int)Math.Floor(args.Scale);
+        var proto = args.Effect.Entity;
+
+        if (args.Effect.Predicted)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                PredictedSpawnNextToOrDrop(proto, entity, entity.Comp);
+            }
+        }
+        else if (_net.IsServer)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                SpawnNextToOrDrop(proto, entity, entity.Comp);
+            }
+        }
+    }
+}
+
+/// <inheritdoc cref="BaseSpawnEntityEntityEffect{T}"/>
+public sealed partial class SpawnEntity : BaseSpawnEntityEntityEffect<SpawnEntity>;
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
new file mode 100644
index 0000000000..6909d503df
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs
@@ -0,0 +1,51 @@
+using Robust.Shared.Containers;
+using Robust.Shared.Network;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// Spawns a given number of entities of a given prototype in a specified container owned by this entity.
+/// Returns if the prototype cannot spawn in the specified container.
+/// Amount is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SpawnEntityInContainerEntityEffectSystem : EntityEffectSystem<ContainerManagerComponent, SpawnEntityInContainer>
+{
+    [Dependency] private readonly INetManager _net = default!;
+
+    protected override void Effect(Entity<ContainerManagerComponent> entity, ref EntityEffectEvent<SpawnEntityInContainer> args)
+    {
+        var quantity = args.Effect.Number * (int)Math.Floor(args.Scale);
+        var proto = args.Effect.Entity;
+        var container = args.Effect.ContainerName;
+
+        if (args.Effect.Predicted)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                // Stop trying to spawn if it fails
+                if (!PredictedTrySpawnInContainer(proto, entity, container, out _, entity.Comp))
+                    return;
+            }
+        }
+        else if (_net.IsServer)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                // Stop trying to spawn if it fails
+                if (!TrySpawnInContainer(proto, entity, container, out _, entity.Comp))
+                    return;
+            }
+        }
+    }
+}
+
+/// <inheritdoc cref="BaseSpawnEntityEntityEffect{T}"/>
+public sealed partial class SpawnEntityInContainer : BaseSpawnEntityEntityEffect<SpawnEntityInContainer>
+{
+    /// <summary>
+    /// Name of the container we're trying to spawn into.
+    /// </summary>
+    [DataField(required: true)]
+    public string ContainerName;
+}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
new file mode 100644
index 0000000000..e5b1e119c1
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs
@@ -0,0 +1,49 @@
+using Robust.Shared.Containers;
+using Robust.Shared.Network;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// Spawns a given number of entities of a given prototype in a specified container owned by this entity.
+/// Acts like <see cref="SpawnEntityEntityEffectSystem"/> if it cannot spawn the prototype in the specified container.
+/// Amount is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SpawnEntityInContainerOrDropEntityEffectSystem : EntityEffectSystem<ContainerManagerComponent, SpawnEntityInContainerOrDrop>
+{
+    [Dependency] private readonly INetManager _net = default!;
+
+    protected override void Effect(Entity<ContainerManagerComponent> entity, ref EntityEffectEvent<SpawnEntityInContainerOrDrop> args)
+    {
+        var quantity = args.Effect.Number * (int)Math.Floor(args.Scale);
+        var proto = args.Effect.Entity;
+        var container = args.Effect.ContainerName;
+
+        var xform = Transform(entity);
+
+        if (args.Effect.Predicted)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                PredictedSpawnInContainerOrDrop(proto, entity, container, xform, entity.Comp);
+            }
+        }
+        else if (_net.IsServer)
+        {
+            for (var i = 0; i < quantity; i++)
+            {
+                SpawnInContainerOrDrop(proto, entity, container, xform, entity.Comp);
+            }
+        }
+    }
+}
+
+/// <inheritdoc cref="BaseSpawnEntityEntityEffect{T}"/>
+public sealed partial class SpawnEntityInContainerOrDrop : BaseSpawnEntityEntityEffect<SpawnEntityInContainerOrDrop>
+{
+    /// <summary>
+    /// Name of the container we're trying to spawn into.
+    /// </summary>
+    [DataField(required: true)]
+    public string ContainerName;
+}
diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
new file mode 100644
index 0000000000..7514dae4e9
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Inventory;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.EntitySpawning;
+
+/// <summary>
+/// Spawns an entity of a given prototype in a specified inventory slot owned by this entity.
+/// Fails if it cannot spawn the entity in the given slot.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SpawnEntityInInventoryEntityEffectSystem : EntityEffectSystem<InventoryComponent, SpawnEntityInInventory>
+{
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
+    protected override void Effect(Entity<InventoryComponent> entity, ref EntityEffectEvent<SpawnEntityInInventory> args)
+    {
+        _inventory.SpawnItemInSlot(entity, args.Effect.Slot, args.Effect.Entity);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class SpawnEntityInInventory : EntityEffectBase<SpawnEntityInInventory>
+{
+    /// <summary>
+    /// Name of the slot we're spawning the item into.
+    /// </summary>
+    [DataField(required: true)]
+    public string Slot = string.Empty; // Rider is drunk and keeps yelling at me to fill this out or make required: true but, it is required true so it's just being an asshole.
+
+    /// <summary>
+    /// Prototype ID of item to spawn.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Entity;
+}
diff --git a/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs b/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
deleted file mode 100644
index 968d559939..0000000000
--- a/Content.Shared/EntityEffects/Effects/EvenHealthChange.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.EntityEffects;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Version of <see cref="HealthChange"/> that distributes the healing to groups
-/// </summary>
-public sealed partial class EvenHealthChange : EntityEffect
-{
-    /// <summary>
-    /// Damage to heal, collected into entire damage groups.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<ProtoId<DamageGroupPrototype>, FixedPoint2> Damage = new();
-
-    /// <summary>
-    /// Should this effect scale the damage by the amount of chemical in the solution?
-    /// Useful for touch reactions, like styptic powder or acid.
-    /// Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
-    /// </summary>
-    [DataField]
-    public bool ScaleByQuantity;
-
-    /// <summary>
-    /// Should this effect ignore damage modifiers?
-    /// </summary>
-    [DataField]
-    public bool IgnoreResistances = true;
-
-    protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        var damages = new List<string>();
-        var heals = false;
-        var deals = false;
-
-        var damagableSystem = entSys.GetEntitySystem<DamageableSystem>();
-        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
-        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
-
-        foreach (var (group, amount) in Damage)
-        {
-            var groupProto = prototype.Index(group);
-
-            var sign = FixedPoint2.Sign(amount);
-            var mod = 1f;
-
-            if (sign < 0)
-            {
-                heals = true;
-                mod = universalReagentHealModifier;
-            }
-            else if (sign > 0)
-            {
-                deals = true;
-                mod = universalReagentDamageModifier;
-            }
-
-            damages.Add(
-                Loc.GetString("health-change-display",
-                    ("kind", groupProto.LocalizedName),
-                    ("amount", MathF.Abs(amount.Float() * mod)),
-                    ("deltasign", sign)
-                ));
-        }
-
-        var healsordeals = heals ? (deals ? "both" : "heals") : (deals ? "deals" : "none");
-        return Loc.GetString("reagent-effect-guidebook-even-health-change",
-            ("chance", Probability),
-            ("changes", ContentLocalizationManager.FormatList(damages)),
-            ("healsordeals", healsordeals));
-    }
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent<DamageableComponent>(args.TargetEntity, out var damageable))
-            return;
-
-        var protoMan = IoCManager.Resolve<IPrototypeManager>();
-
-        var scale = FixedPoint2.New(1);
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
-        }
-
-        var damagableSystem = args.EntityManager.System<DamageableSystem>();
-        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
-        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
-
-        var dspec = new DamageSpecifier();
-
-        foreach (var (group, amount) in Damage)
-        {
-            var groupProto = protoMan.Index(group);
-            var groupDamage = new Dictionary<string, FixedPoint2>();
-            foreach (var damageId in groupProto.DamageTypes)
-            {
-                var damageAmount = damageable.Damage.DamageDict.GetValueOrDefault(damageId);
-                if (damageAmount != FixedPoint2.Zero)
-                    groupDamage.Add(damageId, damageAmount);
-            }
-
-            var sum = groupDamage.Values.Sum();
-            foreach (var (damageId, damageAmount) in groupDamage)
-            {
-                var existing = dspec.DamageDict.GetOrNew(damageId);
-                dspec.DamageDict[damageId] = existing + damageAmount / sum * amount;
-            }
-        }
-
-        if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
-        {
-            foreach (var (type, val) in dspec.DamageDict)
-            {
-                if (val < 0f)
-                {
-                    dspec.DamageDict[type] = val * universalReagentHealModifier;
-                }
-                if (val > 0f)
-                {
-                    dspec.DamageDict[type] = val * universalReagentDamageModifier;
-                }
-            }
-        }
-
-        damagableSystem.TryChangeDamage(
-            args.TargetEntity,
-            dspec * scale,
-            IgnoreResistances,
-            interruptsDoAfters: false);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
new file mode 100644
index 0000000000..33b2041b37
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs
@@ -0,0 +1,114 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Evenly adjust the damage types in a damage group by up to a specified total on this entity.
+/// Total adjustment is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class EvenHealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, EvenHealthChange>
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
+    protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<EvenHealthChange> args)
+    {
+        var damageSpec = new DamageSpecifier();
+
+        foreach (var (group, amount) in args.Effect.Damage)
+        {
+            var groupProto = _proto.Index(group);
+            var groupDamage = new Dictionary<string, FixedPoint2>();
+            foreach (var damageId in groupProto.DamageTypes)
+            {
+                var damageAmount = entity.Comp.Damage.DamageDict.GetValueOrDefault(damageId);
+                if (damageAmount != FixedPoint2.Zero)
+                    groupDamage.Add(damageId, damageAmount);
+            }
+
+            var sum = groupDamage.Values.Sum();
+            foreach (var (damageId, damageAmount) in groupDamage)
+            {
+                var existing = damageSpec.DamageDict.GetOrNew(damageId);
+                damageSpec.DamageDict[damageId] = existing + damageAmount / sum * amount;
+            }
+        }
+
+        damageSpec *= args.Scale;
+
+        _damageable.TryChangeDamage(
+            entity,
+            damageSpec,
+            args.Effect.IgnoreResistances,
+            interruptsDoAfters: false,
+            damageable: entity.Comp);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class EvenHealthChange : EntityEffectBase<EvenHealthChange>
+{
+    /// <summary>
+    /// Damage to heal, collected into entire damage groups.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<ProtoId<DamageGroupPrototype>, FixedPoint2> Damage = new();
+
+    /// <summary>
+    /// Should this effect ignore damage modifiers?
+    /// </summary>
+    [DataField]
+    public bool IgnoreResistances = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        var damages = new List<string>();
+        var heals = false;
+        var deals = false;
+
+        var damagableSystem = entSys.GetEntitySystem<DamageableSystem>();
+        var universalReagentDamageModifier = damagableSystem.UniversalReagentDamageModifier;
+        var universalReagentHealModifier = damagableSystem.UniversalReagentHealModifier;
+
+        foreach (var (group, amount) in Damage)
+        {
+            var groupProto = prototype.Index(group);
+
+            var sign = FixedPoint2.Sign(amount);
+            float mod;
+
+            switch (sign)
+            {
+                case < 0:
+                    heals = true;
+                    mod = universalReagentHealModifier;
+                    break;
+                case > 0:
+                    deals = true;
+                    mod = universalReagentDamageModifier;
+                    break;
+                default:
+                    continue; // Don't need to show damage types of 0...
+            }
+
+            damages.Add(
+                Loc.GetString("health-change-display",
+                    ("kind", groupProto.LocalizedName),
+                    ("amount", MathF.Abs(amount.Float() * mod)),
+                    ("deltasign", sign)
+                ));
+        }
+
+        var healsordeals = heals ? deals ? "both" : "heals" : deals ? "deals" : "none";
+        return Loc.GetString("entity-effect-guidebook-even-health-change",
+            ("chance", Probability),
+            ("changes", ContentLocalizationManager.FormatList(damages)),
+            ("healsordeals", healsordeals));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs
new file mode 100644
index 0000000000..ecad4e47ad
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Database;
+using Content.Shared.EntityEffects.Effects.Transform;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <inheritdoc cref="EntityEffect"/>
+/// <seealso cref="Explosion"/>
+public sealed partial class Explode : EntityEffectBase<Explode>
+{
+    /// <summary>
+    /// Optional override for the explosion intensity.
+    /// </summary>
+    [DataField]
+    public float? Intensity;
+
+    /// <summary>
+    /// Optional override for the explosion radius.
+    /// </summary>
+    [DataField]
+    public float? Radius;
+
+    /// <summary>
+    /// Delete the entity with the explosion?
+    /// </summary>
+    [DataField]
+    public bool Delete = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-explosion", ("chance", Probability));
+
+    public override LogImpact? Impact => LogImpact.High;
+}
diff --git a/Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs b/Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs
deleted file mode 100644
index 11e776ac90..0000000000
--- a/Content.Shared/EntityEffects/Effects/ExtinguishReaction.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Atmos;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    public sealed partial class ExtinguishReaction : EntityEffect
-    {
-        /// <summary>
-        ///     Amount of firestacks reduced.
-        /// </summary>
-        [DataField]
-        public float FireStacksAdjustment = -1.5f;
-
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-extinguish-reaction", ("chance", Probability));
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            var ev = new ExtinguishEvent
-            {
-                FireStacksAdjustment = FireStacksAdjustment,
-            };
-
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                ev.FireStacksAdjustment *= (float)reagentArgs.Quantity;
-            }
-
-            args.EntityManager.EventBus.RaiseLocalEvent(args.TargetEntity, ref ev);
-        }
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/FlammableReaction.cs b/Content.Shared/EntityEffects/Effects/FlammableReaction.cs
deleted file mode 100644
index 9f7d504f4e..0000000000
--- a/Content.Shared/EntityEffects/Effects/FlammableReaction.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Database;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class FlammableReaction : EventEntityEffect<FlammableReaction>
-{
-    [DataField]
-    public float Multiplier = 0.05f;
-
-    // The fire stack multiplier if fire stacks already exist on target, only works if 0 or greater
-    [DataField]
-    public float MultiplierOnExisting = -1f;
-
-    public override bool ShouldLog => true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-flammable-reaction", ("chance", Probability));
-
-    public override LogImpact LogImpact => LogImpact.Medium;
-}
diff --git a/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs b/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
deleted file mode 100644
index c238e94010..0000000000
--- a/Content.Shared/EntityEffects/Effects/FlashReactionEffect.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-[DataDefinition]
-public sealed partial class FlashReactionEffect : EventEntityEffect<FlashReactionEffect>
-{
-    /// <summary>
-    ///     Flash range per unit of reagent.
-    /// </summary>
-    [DataField]
-    public float RangePerUnit = 0.2f;
-
-    /// <summary>
-    ///     Maximum flash range.
-    /// </summary>
-    [DataField]
-    public float MaxRange = 10f;
-
-    /// <summary>
-    ///     How much to entities are slowed down.
-    /// </summary>
-    [DataField]
-    public float SlowTo = 0.5f;
-
-    /// <summary>
-    ///     The time entities will be flashed.
-    ///     The default is chosen to be better than the hand flash so it is worth using it for grenades etc.
-    /// </summary>
-    [DataField]
-    public TimeSpan Duration = TimeSpan.FromSeconds(4);
-
-    /// <summary>
-    ///     The prototype ID used for the visual effect.
-    /// </summary>
-    [DataField]
-    public EntProtoId? FlashEffectPrototype = "ReactionFlash";
-
-    /// <summary>
-    ///     The sound the flash creates.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg");
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-flash-reaction-effect", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Glow.cs b/Content.Shared/EntityEffects/Effects/Glow.cs
deleted file mode 100644
index 394d406700..0000000000
--- a/Content.Shared/EntityEffects/Effects/Glow.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Makes a mob glow.
-/// </summary>
-public sealed partial class Glow : EntityEffect
-{
-    [DataField]
-    public float Radius = 2f;
-
-    [DataField]
-    public Color Color = Color.Black;
-
-    private static readonly List<Color> Colors = new()
-    {
-        Color.White,
-        Color.Red,
-        Color.Yellow,
-        Color.Green,
-        Color.Blue,
-        Color.Purple,
-        Color.Pink
-    };
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (Color == Color.Black)
-        {
-            var random = IoCManager.Resolve<IRobustRandom>();
-            Color = random.Pick(Colors);
-        }
-
-        var lightSystem = args.EntityManager.System<SharedPointLightSystem>();
-        var light = lightSystem.EnsureLight(args.TargetEntity);
-        lightSystem.SetRadius(args.TargetEntity, Radius, light);
-        lightSystem.SetColor(args.TargetEntity, Color, light);
-        lightSystem.SetCastShadows(args.TargetEntity, false, light); // this is expensive, and botanists make lots of plants
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
new file mode 100644
index 0000000000..05e4fe29ca
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs
@@ -0,0 +1,55 @@
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Causes this entity to glow.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class GlowEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Glow>
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedPointLightSystem _lightSystem = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Glow> args)
+    {
+        var color = args.Effect.Color;
+
+        if (color == Color.Black)
+        {
+            // TODO: When we get proper predicted RNG remove this check...
+            if (_net.IsClient)
+                return;
+
+            color = _random.Pick(Colors);
+        }
+
+        var light = _lightSystem.EnsureLight(entity);
+        _lightSystem.SetRadius(entity, args.Effect.Radius, light);
+        _lightSystem.SetColor(entity, color, light);
+        _lightSystem.SetCastShadows(entity, false, light); // this is expensive, and botanists make lots of plants
+    }
+
+    public static readonly List<Color> Colors = new()
+    {
+        Color.White,
+        Color.Red,
+        Color.Yellow,
+        Color.Green,
+        Color.Blue,
+        Color.Purple,
+        Color.Pink
+    };
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Glow : EntityEffectBase<Glow>
+{
+    [DataField]
+    public float Radius = 2f;
+
+    [DataField]
+    public Color Color = Color.Black;
+}
diff --git a/Content.Shared/EntityEffects/Effects/HealthChange.cs b/Content.Shared/EntityEffects/Effects/HealthChange.cs
deleted file mode 100644
index 17c24f6b5a..0000000000
--- a/Content.Shared/EntityEffects/Effects/HealthChange.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.EntityEffects;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using Robust.Shared.Prototypes;
-using System.Linq;
-using System.Text.Json.Serialization;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    /// <summary>
-    /// Default metabolism used for medicine reagents.
-    /// </summary>
-    public sealed partial class HealthChange : EntityEffect
-    {
-        /// <summary>
-        /// Damage to apply every cycle. Damage Ignores resistances.
-        /// </summary>
-        [DataField(required: true)]
-        [JsonPropertyName("damage")]
-        public DamageSpecifier Damage = default!;
-
-        /// <summary>
-        ///     Should this effect scale the damage by the amount of chemical in the solution?
-        ///     Useful for touch reactions, like styptic powder or acid.
-        ///     Only usable if the EntityEffectBaseArgs is an EntityEffectReagentArgs.
-        /// </summary>
-        [DataField]
-        [JsonPropertyName("scaleByQuantity")]
-        public bool ScaleByQuantity;
-
-        [DataField]
-        [JsonPropertyName("ignoreResistances")]
-        public bool IgnoreResistances = true;
-
-        protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        {
-            var damages = new List<string>();
-            var heals = false;
-            var deals = false;
-
-            var damageSpec = new DamageSpecifier(Damage);
-
-            var universalReagentDamageModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentDamageModifier;
-            var universalReagentHealModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentHealModifier;
-
-            if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
-            {
-                foreach (var (type, val) in damageSpec.DamageDict)
-                {
-                    if (val < 0f)
-                    {
-                        damageSpec.DamageDict[type] = val * universalReagentHealModifier;
-                    }
-                    if (val > 0f)
-                    {
-                        damageSpec.DamageDict[type] = val * universalReagentDamageModifier;
-                    }
-                }
-            }
-
-            damageSpec = entSys.GetEntitySystem<DamageableSystem>().ApplyUniversalAllModifiers(damageSpec);
-
-            foreach (var (kind, amount) in damageSpec.DamageDict)
-            {
-                var sign = FixedPoint2.Sign(amount);
-
-                if (sign < 0)
-                    heals = true;
-                if (sign > 0)
-                    deals = true;
-
-                damages.Add(
-                    Loc.GetString("health-change-display",
-                        ("kind", prototype.Index<DamageTypePrototype>(kind).LocalizedName),
-                        ("amount", MathF.Abs(amount.Float())),
-                        ("deltasign", sign)
-                    ));
-            }
-
-            var healsordeals = heals ? (deals ? "both" : "heals") : (deals ? "deals" : "none");
-
-            return Loc.GetString("reagent-effect-guidebook-health-change",
-                ("chance", Probability),
-                ("changes", ContentLocalizationManager.FormatList(damages)),
-                ("healsordeals", healsordeals));
-        }
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            var scale = FixedPoint2.New(1);
-            var damageSpec = new DamageSpecifier(Damage);
-
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale;
-            }
-
-            var universalReagentDamageModifier = args.EntityManager.System<DamageableSystem>().UniversalReagentDamageModifier;
-            var universalReagentHealModifier = args.EntityManager.System<DamageableSystem>().UniversalReagentHealModifier;
-
-            if (universalReagentDamageModifier != 1 || universalReagentHealModifier != 1)
-            {
-                foreach (var (type, val) in damageSpec.DamageDict)
-                {
-                    if (val < 0f)
-                    {
-                        damageSpec.DamageDict[type] = val * universalReagentHealModifier;
-                    }
-                    if (val > 0f)
-                    {
-                        damageSpec.DamageDict[type] = val * universalReagentDamageModifier;
-                    }
-                }
-            }
-
-            args.EntityManager.System<DamageableSystem>()
-                .TryChangeDamage(
-                    args.TargetEntity,
-                    damageSpec * scale,
-                    IgnoreResistances,
-                    interruptsDoAfters: false);
-        }
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
new file mode 100644
index 0000000000..89948cd2e4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs
@@ -0,0 +1,91 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Content.Shared.Localizations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Adjust the damages on this entity by specified amounts.
+/// Amounts are modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class HealthChangeEntityEffectSystem : EntityEffectSystem<DamageableComponent, HealthChange>
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+
+    protected override void Effect(Entity<DamageableComponent> entity, ref EntityEffectEvent<HealthChange> args)
+    {
+        var damageSpec = new DamageSpecifier(args.Effect.Damage);
+
+        damageSpec *= args.Scale;
+
+        _damageable.TryChangeDamage(
+                entity,
+                damageSpec,
+                args.Effect.IgnoreResistances,
+                interruptsDoAfters: false);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class HealthChange : EntityEffectBase<HealthChange>
+{
+    /// <summary>
+    /// Damage to apply every cycle. Damage Ignores resistances.
+    /// </summary>
+    [DataField(required: true)]
+    public DamageSpecifier Damage = default!;
+
+    [DataField]
+    public bool IgnoreResistances = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        {
+            var damages = new List<string>();
+            var heals = false;
+            var deals = false;
+
+            var damageSpec = new DamageSpecifier(Damage);
+
+            var universalReagentDamageModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentDamageModifier;
+            var universalReagentHealModifier = entSys.GetEntitySystem<DamageableSystem>().UniversalReagentHealModifier;
+
+            damageSpec = entSys.GetEntitySystem<DamageableSystem>().ApplyUniversalAllModifiers(damageSpec);
+
+            foreach (var (kind, amount) in damageSpec.DamageDict)
+            {
+                var sign = FixedPoint2.Sign(amount);
+                float mod;
+
+                switch (sign)
+                {
+                    case < 0:
+                        heals = true;
+                        mod = universalReagentHealModifier;
+                        break;
+                    case > 0:
+                        deals = true;
+                        mod = universalReagentDamageModifier;
+                        break;
+                    default:
+                        continue; // Don't need to show damage types of 0...
+                }
+
+                damages.Add(
+                    Loc.GetString("health-change-display",
+                        ("kind", prototype.Index<DamageTypePrototype>(kind).LocalizedName),
+                        ("amount", MathF.Abs(amount.Float() * mod)),
+                        ("deltasign", sign)
+                    ));
+            }
+
+            var healsordeals = heals ? (deals ? "both" : "heals") : (deals ? "deals" : "none");
+
+            return Loc.GetString("entity-effect-guidebook-health-change",
+                ("chance", Probability),
+                ("changes", ContentLocalizationManager.FormatList(damages)),
+                ("healsordeals", healsordeals));
+        }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Ignite.cs b/Content.Shared/EntityEffects/Effects/Ignite.cs
deleted file mode 100644
index 707ecc3208..0000000000
--- a/Content.Shared/EntityEffects/Effects/Ignite.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Ignites a mob.
-/// </summary>
-public sealed partial class Ignite : EventEntityEffect<Ignite>
-{
-    public override bool ShouldLog => true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability));
-
-    public override LogImpact LogImpact => LogImpact.Medium;
-}
diff --git a/Content.Shared/EntityEffects/Effects/MakeSentient.cs b/Content.Shared/EntityEffects/Effects/MakeSentient.cs
deleted file mode 100644
index 9c70eb452b..0000000000
--- a/Content.Shared/EntityEffects/Effects/MakeSentient.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Mind.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class MakeSentient : EventEntityEffect<MakeSentient>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-make-sentient", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs b/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
new file mode 100644
index 0000000000..4beb21454c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/MakeSentientEntityEffect.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class MakeSentient : EntityEffectBase<MakeSentient>
+{
+    /// <summary>
+    /// Description for the ghost role created by this effect.
+    /// </summary>
+    [DataField]
+    public LocId RoleDescription = "ghost-role-information-cognizine-description";
+
+    /// <summary>
+    /// Whether we give the target the ability to speak coherently.
+    /// </summary>
+    [DataField]
+    public bool AllowSpeech = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-make-sentient", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/MetaData/DestructibleActEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/MetaData/DestructibleActEntityEffectSystem.cs
new file mode 100644
index 0000000000..05fd826f2d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/MetaData/DestructibleActEntityEffectSystem.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Destructible;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.MetaData;
+
+
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class DestructibleActEntityEffectSystem : EntityEffectSystem<MetaDataComponent, DestructibleAct>
+{
+    [Dependency] private readonly SharedDestructibleSystem _destructible = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<DestructibleAct> args)
+    {
+        if ((args.Effect.Acts & ThresholdActs.Breakage) != 0)
+            _destructible.BreakEntity(entity);
+
+        if ((args.Effect.Acts & ThresholdActs.Destruction) != 0)
+            _destructible.DestroyEntity(entity.AsNullable());
+    }
+}
+
+/// <summary>
+/// Destroys or breaks an entity.
+/// </summary>
+public sealed partial class DestructibleAct : EntityEffectBase<DestructibleAct>
+{
+    /// <summary>
+    /// What acts should be triggered upon activation.
+    /// </summary>
+    [DataField]
+    public ThresholdActs Acts;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        if ((Acts & ThresholdActs.Destruction) != 0)
+            return Loc.GetString("entity-effect-guidebook-destroy", ("chance", Probability));
+
+        return Loc.GetString("entity-effect-guidebook-break", ("chance", Probability));
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs b/Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs
deleted file mode 100644
index 9f15652095..0000000000
--- a/Content.Shared/EntityEffects/Effects/ModifyBleedAmount.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class ModifyBleedAmount : EventEntityEffect<ModifyBleedAmount>
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public float Amount = -1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-bleed-amount", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount)));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs b/Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs
deleted file mode 100644
index 06c026f128..0000000000
--- a/Content.Shared/EntityEffects/Effects/ModifyBloodLevel.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class ModifyBloodLevel : EventEntityEffect<ModifyBloodLevel>
-{
-    [DataField]
-    public bool Scaled = false;
-
-    [DataField]
-    public FixedPoint2 Amount = 1.0f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-modify-blood-level", ("chance", Probability),
-            ("deltasign", MathF.Sign(Amount.Float())));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ModifyLungGas.cs b/Content.Shared/EntityEffects/Effects/ModifyLungGas.cs
deleted file mode 100644
index 45dc8c84c6..0000000000
--- a/Content.Shared/EntityEffects/Effects/ModifyLungGas.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Atmos;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class ModifyLungGas : EventEntityEffect<ModifyLungGas>
-{
-    [DataField("ratios", required: true)]
-    public Dictionary<Gas, float> Ratios = default!;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-}
diff --git a/Content.Shared/EntityEffects/Effects/MovespeedModifier.cs b/Content.Shared/EntityEffects/Effects/MovespeedModifier.cs
deleted file mode 100644
index 5e72746e32..0000000000
--- a/Content.Shared/EntityEffects/Effects/MovespeedModifier.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Default metabolism for stimulants and tranqs. Attempts to find a MovementSpeedModifier on the target,
-/// adding one if not there and to change the movespeed
-/// </summary>
-public sealed partial class MovespeedModifier : EntityEffect
-{
-    /// <summary>
-    /// How much the entities' walk speed is multiplied by.
-    /// </summary>
-    [DataField]
-    public float WalkSpeedModifier { get; set; } = 1;
-
-    /// <summary>
-    /// How much the entities' run speed is multiplied by.
-    /// </summary>
-    [DataField]
-    public float SprintSpeedModifier { get; set; } = 1;
-
-    /// <summary>
-    /// How long the modifier applies (in seconds).
-    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
-    /// </summary>
-    [DataField]
-    public float StatusLifetime = 2f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return Loc.GetString("reagent-effect-guidebook-movespeed-modifier",
-            ("chance", Probability),
-            ("walkspeed", WalkSpeedModifier),
-            ("time", StatusLifetime));
-    }
-
-    /// <summary>
-    /// Remove reagent at set rate, changes the movespeed modifiers and adds a MovespeedModifierMetabolismComponent if not already there.
-    /// </summary>
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var status = args.EntityManager.EnsureComponent<MovespeedModifierMetabolismComponent>(args.TargetEntity);
-
-        // Only refresh movement if we need to.
-        var modified = !status.WalkSpeedModifier.Equals(WalkSpeedModifier) ||
-                       !status.SprintSpeedModifier.Equals(SprintSpeedModifier);
-
-        status.WalkSpeedModifier = WalkSpeedModifier;
-        status.SprintSpeedModifier = SprintSpeedModifier;
-
-        // only going to scale application time
-        var statusLifetime = StatusLifetime;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            statusLifetime *= reagentArgs.Scale.Float();
-        }
-
-        IncreaseTimer(status, statusLifetime, args.EntityManager, args.TargetEntity);
-
-        if (modified)
-            args.EntityManager.System<MovementSpeedModifierSystem>().RefreshMovementSpeedModifiers(args.TargetEntity);
-    }
-    private void IncreaseTimer(MovespeedModifierMetabolismComponent status, float time, IEntityManager entityManager, EntityUid uid)
-    {
-        var gameTiming = IoCManager.Resolve<IGameTiming>();
-
-        var offsetTime = Math.Max(status.ModifierTimer.TotalSeconds, gameTiming.CurTime.TotalSeconds);
-
-        status.ModifierTimer = TimeSpan.FromSeconds(offsetTime + time);
-
-        entityManager.Dirty(uid, status);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Oxygenate.cs b/Content.Shared/EntityEffects/Effects/Oxygenate.cs
deleted file mode 100644
index e990a3fec6..0000000000
--- a/Content.Shared/EntityEffects/Effects/Oxygenate.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Oxygenate : EventEntityEffect<Oxygenate>
-{
-    [DataField]
-    public float Factor = 1f;
-
-    // JUSTIFICATION: This is internal magic that players never directly interact with.
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => null;
-}
diff --git a/Content.Shared/EntityEffects/Effects/Paralyze.cs b/Content.Shared/EntityEffects/Effects/Paralyze.cs
deleted file mode 100644
index 2a2270016b..0000000000
--- a/Content.Shared/EntityEffects/Effects/Paralyze.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared.Stunnable;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Paralyze : EntityEffect
-{
-    [DataField] public double ParalyzeTime = 2;
-
-    /// <remarks>
-    ///     true - refresh paralyze time,  false - accumulate paralyze time
-    /// </remarks>
-    [DataField] public bool Refresh = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString(
-            "reagent-effect-guidebook-paralyze",
-            ("chance", Probability),
-            ("time", ParalyzeTime)
-        );
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var paralyzeTime = ParalyzeTime;
-
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            paralyzeTime *= (double)reagentArgs.Scale;
-        }
-
-        var stunSystem = args.EntityManager.System<SharedStunSystem>();
-        _ = Refresh
-            ? stunSystem.TryUpdateParalyzeDuration(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime))
-            : stunSystem.TryAddParalyzeDuration(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime));
-    }
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
deleted file mode 100644
index 2c8046452b..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustAttribute.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-[ImplicitDataDefinitionForInheritors]
-public abstract partial class PlantAdjustAttribute<T> : EventEntityEffect<T> where T : PlantAdjustAttribute<T>
-{
-    [DataField]
-    public float Amount { get; protected set; } = 1;
-
-    /// <summary>
-    /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
-    /// </summary>
-    [DataField]
-    public abstract string GuidebookAttributeName { get; set; }
-
-    /// <summary>
-    /// Whether the attribute in question is a good thing. Used for guidebook descriptions to determine the color of the number.
-    /// </summary>
-    [DataField]
-    public virtual bool GuidebookIsAttributePositive { get; protected set; } = true;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        string color;
-        if (GuidebookIsAttributePositive ^ Amount < 0.0)
-        {
-            color = "green";
-        }
-        else
-        {
-            color = "red";
-        }
-        return Loc.GetString("reagent-effect-guidebook-plant-attribute", ("attribute", Loc.GetString(GuidebookAttributeName)), ("amount", Amount.ToString("0.00")), ("colorName", color), ("chance", Probability));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
deleted file mode 100644
index c1e71894e5..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustHealth.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustHealth : PlantAdjustAttribute<PlantAdjustHealth>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-health";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
deleted file mode 100644
index 6610adf708..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationLevel.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustMutationLevel : PlantAdjustAttribute<PlantAdjustMutationLevel>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-level";
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
deleted file mode 100644
index 91be222807..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustMutationMod.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustMutationMod : PlantAdjustAttribute<PlantAdjustMutationMod>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-mutation-mod";
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
deleted file mode 100644
index db01d5d060..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustNutrition.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustNutrition : PlantAdjustAttribute<PlantAdjustNutrition>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-nutrition";
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
deleted file mode 100644
index 971f05f32d..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// using Content.Server.Botany.Systems;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-/// <summary>
-///     Handles increase or decrease of plant potency.
-/// </summary>
-
-public sealed partial class PlantAdjustPotency : PlantAdjustAttribute<PlantAdjustPotency>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-potency";
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
deleted file mode 100644
index 610d02231b..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAdjustWater.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAdjustWater : PlantAdjustAttribute<PlantAdjustWater>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-water";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
deleted file mode 100644
index 36b8f57d08..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantAffectGrowth.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantAffectGrowth : PlantAdjustAttribute<PlantAffectGrowth>
-{
-    public override string GuidebookAttributeName { get; set; } = "plant-attribute-growth";
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs
deleted file mode 100644
index 66cfb66d4b..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantChangeStat.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantChangeStat : EventEntityEffect<PlantChangeStat>
-{
-    [DataField]
-    public string TargetValue;
-
-    [DataField]
-    public float MinValue;
-
-    [DataField]
-    public float MaxValue;
-
-    [DataField]
-    public int Steps;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        throw new NotImplementedException();
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
deleted file mode 100644
index 0dabf1f22b..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantCryoxadone.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantCryoxadone : EventEntityEffect<PlantCryoxadone>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-cryoxadone", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
deleted file mode 100644
index 9f16c35402..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-/// <summary>
-///     Handles removal of seeds on a plant.
-/// </summary>
-
-public sealed partial class PlantDestroySeeds : EventEntityEffect<PlantDestroySeeds>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("reagent-effect-guidebook-plant-seeds-remove", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
deleted file mode 100644
index 9feccbf224..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantDiethylamine.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantDiethylamine : EventEntityEffect<PlantDiethylamine>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-diethylamine", ("chance", Probability));
-}
-
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
deleted file mode 100644
index 9dc5140063..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantPhalanximine.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class PlantPhalanximine : EventEntityEffect<PlantPhalanximine>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-phalanximine", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
deleted file mode 100644
index 51ce353dbb..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-/// <summary>
-///     Handles restoral of seeds on a plant.
-/// </summary>
-public sealed partial class PlantRestoreSeeds : EventEntityEffect<PlantRestoreSeeds>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("reagent-effect-guidebook-plant-seeds-add", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs b/Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
deleted file mode 100644
index 6ba37c9be0..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMetabolism/RobustHarvest.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects.PlantMetabolism;
-
-public sealed partial class RobustHarvest : EventEntityEffect<RobustHarvest>
-{
-    [DataField]
-    public int PotencyLimit = 50;
-
-    [DataField]
-    public int PotencyIncrease = 3;
-
-    [DataField]
-    public int PotencySeedlessThreshold = 30;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("reagent-effect-guidebook-plant-robust-harvest", ("seedlesstreshold", PotencySeedlessThreshold), ("limit", PotencyLimit), ("increase", PotencyIncrease), ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs b/Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs
deleted file mode 100644
index 9a3408bb8e..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMutateChemicals.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Random;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     changes the chemicals available in a plant's produce
-/// </summary>
-public sealed partial class PlantMutateChemicals : EventEntityEffect<PlantMutateChemicals>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMutateGases.cs b/Content.Shared/EntityEffects/Effects/PlantMutateGases.cs
deleted file mode 100644
index 5eb5b1d07c..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMutateGases.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using System.Linq;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     changes the gases that a plant or produce create.
-/// </summary>
-public sealed partial class PlantMutateExudeGasses : EventEntityEffect<PlantMutateExudeGasses>
-{
-    [DataField]
-    public float MinValue = 0.01f;
-
-    [DataField]
-    public float MaxValue = 0.5f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
-
-/// <summary>
-///     changes the gases that a plant or produce consumes.
-/// </summary>
-public sealed partial class PlantMutateConsumeGasses : EventEntityEffect<PlantMutateConsumeGasses>
-{
-    [DataField]
-    public float MinValue = 0.01f;
-
-    [DataField]
-    public float MaxValue = 0.5f;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs b/Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs
deleted file mode 100644
index 84d6293185..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantMutateHarvest.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Upgrades a plant's harvest type.
-/// </summary>
-public sealed partial class PlantMutateHarvest : EventEntityEffect<PlantMutateHarvest>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs b/Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs
deleted file mode 100644
index e2acc4cb7c..0000000000
--- a/Content.Shared/EntityEffects/Effects/PlantSpeciesChange.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Changes a plant into one of the species its able to mutate into.
-/// </summary>
-public sealed partial class PlantSpeciesChange : EventEntityEffect<PlantSpeciesChange>
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        return "TODO";
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/Polymorph.cs b/Content.Shared/EntityEffects/Effects/Polymorph.cs
deleted file mode 100644
index 65711ff99a..0000000000
--- a/Content.Shared/EntityEffects/Effects/Polymorph.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Polymorph;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class Polymorph : EventEntityEffect<Polymorph>
-{
-    /// <summary>
-    ///     What polymorph prototype is used on effect
-    /// </summary>
-    [DataField("prototype", customTypeSerializer:typeof(PrototypeIdSerializer<PolymorphPrototype>))]
-    public string PolymorphPrototype { get; set; }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    => Loc.GetString("reagent-effect-guidebook-make-polymorph",
-            ("chance", Probability), ("entityname",
-                prototype.Index<EntityPrototype>(prototype.Index<PolymorphPrototype>(PolymorphPrototype).Configuration.Entity).Name));
-}
diff --git a/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs b/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
new file mode 100644
index 0000000000..c0d80dffaa
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/PolymorphEntityEffect.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Polymorph;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Polymorph : EntityEffectBase<Polymorph>
+{
+    /// <summary>
+    ///     What polymorph prototype is used on effect
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PolymorphPrototype> Prototype;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-make-polymorph",
+            ("chance", Probability),
+            ("entityname", prototype.Index<EntityPrototype>(prototype.Index(Prototype).Configuration.Entity).Name));
+}
diff --git a/Content.Shared/EntityEffects/Effects/PopupMessage.cs b/Content.Shared/EntityEffects/Effects/PopupMessage.cs
deleted file mode 100644
index a837f816e4..0000000000
--- a/Content.Shared/EntityEffects/Effects/PopupMessage.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Content.Shared.Popups;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.EntityEffects.Effects
-{
-    public sealed partial class PopupMessage : EntityEffect
-    {
-        [DataField(required: true)]
-        public string[] Messages = default!;
-
-        [DataField]
-        public PopupRecipients Type = PopupRecipients.Local;
-
-        [DataField]
-        public PopupType VisualType = PopupType.Small;
-
-        // JUSTIFICATION: This is purely cosmetic.
-        protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => null;
-
-        public override void Effect(EntityEffectBaseArgs args)
-        {
-            var popupSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedPopupSystem>();
-            var random = IoCManager.Resolve<IRobustRandom>();
-
-            var msg = random.Pick(Messages);
-            var msgArgs = new (string, object)[]
-            {
-                ("entity", args.TargetEntity),
-            };
-
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                msgArgs = new (string, object)[]
-                {
-                    ("entity", reagentArgs.TargetEntity),
-                    ("organ", reagentArgs.OrganEntity.GetValueOrDefault()),
-                };
-            }
-
-            if (Type == PopupRecipients.Local)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, args.TargetEntity, VisualType);
-            else if (Type == PopupRecipients.Pvs)
-                popupSys.PopupEntity(Loc.GetString(msg, msgArgs), args.TargetEntity, VisualType);
-        }
-    }
-
-    public enum PopupRecipients
-    {
-        Pvs,
-        Local
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ReduceRotting.cs b/Content.Shared/EntityEffects/Effects/ReduceRotting.cs
deleted file mode 100644
index b5f2a7ae7e..0000000000
--- a/Content.Shared/EntityEffects/Effects/ReduceRotting.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-using Content.Shared.Atmos.Rotting;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Reduces the rotting accumulator on the patient, making them revivable.
-/// </summary>
-public sealed partial class ReduceRotting : EntityEffect
-{
-    [DataField("seconds")]
-    public double RottingAmount = 10;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-reduce-rotting",
-            ("chance", Probability),
-            ("time", RottingAmount));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            if (reagentArgs.Scale != 1f)
-                return;
-        }
-
-        var rottingSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedRottingSystem>();
-
-        rottingSys.ReduceAccumulator(args.TargetEntity, TimeSpan.FromSeconds(RottingAmount));
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs b/Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs
deleted file mode 100644
index 009cf914d5..0000000000
--- a/Content.Shared/EntityEffects/Effects/ResetNarcolepsy.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Reset narcolepsy timer
-/// </summary>
-public sealed partial class ResetNarcolepsy : EventEntityEffect<ResetNarcolepsy>
-{
-    /// <summary>
-    /// The # of seconds the effect resets the narcolepsy timer to
-    /// </summary>
-    [DataField("TimerReset")]
-    public TimeSpan TimerReset = TimeSpan.FromSeconds(600);
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-reset-narcolepsy", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
new file mode 100644
index 0000000000..973b139fa4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Traits.Assorted;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Resets the narcolepsy timer on a given entity.
+/// The new duration of the timer is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ResetNarcolepsyEntityEffectSystem : EntityEffectSystem<NarcolepsyComponent, ResetNarcolepsy>
+{
+    [Dependency] private readonly NarcolepsySystem _narcolepsy = default!;
+
+    protected override void Effect(Entity<NarcolepsyComponent> entity, ref EntityEffectEvent<ResetNarcolepsy> args)
+    {
+        var timer = args.Effect.TimerReset * args.Scale;
+
+        _narcolepsy.AdjustNarcolepsyTimer(entity.AsNullable(), timer);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ResetNarcolepsy : EntityEffectBase<ResetNarcolepsy>
+{
+    /// <summary>
+    /// The time we set our narcolepsy timer to.
+    /// </summary>
+    [DataField("TimerReset")]
+    public TimeSpan TimerReset = TimeSpan.FromSeconds(600);
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-reset-narcolepsy", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/SatiateHunger.cs b/Content.Shared/EntityEffects/Effects/SatiateHunger.cs
deleted file mode 100644
index 3e7af8833c..0000000000
--- a/Content.Shared/EntityEffects/Effects/SatiateHunger.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Attempts to find a HungerComponent on the target,
-/// and to update it's hunger values.
-/// </summary>
-public sealed partial class SatiateHunger : EntityEffect
-{
-    private const float DefaultNutritionFactor = 3.0f;
-
-    /// <summary>
-    ///     How much hunger is satiated.
-    ///     Is multiplied by quantity if used with EntityEffectReagentArgs.
-    /// </summary>
-    [DataField("factor")] public float NutritionFactor { get; set; } = DefaultNutritionFactor;
-
-    //Remove reagent at set rate, satiate hunger if a HungerComponent can be found
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var entman = args.EntityManager;
-        if (!entman.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
-            return;
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            entman.System<HungerSystem>().ModifyHunger(reagentArgs.TargetEntity, NutritionFactor * (float) reagentArgs.Quantity, hunger);
-        }
-        else
-        {
-            entman.System<HungerSystem>().ModifyHunger(args.TargetEntity, NutritionFactor, hunger);
-        }
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-satiate-hunger", ("chance", Probability), ("relative", NutritionFactor / DefaultNutritionFactor));
-}
diff --git a/Content.Shared/EntityEffects/Effects/SatiateThirst.cs b/Content.Shared/EntityEffects/Effects/SatiateThirst.cs
deleted file mode 100644
index 21a055b528..0000000000
--- a/Content.Shared/EntityEffects/Effects/SatiateThirst.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// Default metabolism for drink reagents. Attempts to find a ThirstComponent on the target,
-/// and to update it's thirst values.
-/// </summary>
-public sealed partial class SatiateThirst : EntityEffect
-{
-    private const float DefaultHydrationFactor = 3.0f;
-
-    /// How much thirst is satiated each tick. Not currently tied to
-    /// rate or anything.
-    [DataField("factor")]
-    public float HydrationFactor { get; set; } = DefaultHydrationFactor;
-
-    /// Satiate thirst if a ThirstComponent can be found
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var uid = args.TargetEntity;
-        if (args.EntityManager.TryGetComponent(uid, out ThirstComponent? thirst))
-            args.EntityManager.System<ThirstSystem>().ModifyThirst(uid, thirst, HydrationFactor);
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-satiate-thirst", ("chance", Probability), ("relative",  HydrationFactor / DefaultHydrationFactor));
-}
diff --git a/Content.Shared/EntityEffects/Effects/Slipify.cs b/Content.Shared/EntityEffects/Effects/Slipify.cs
deleted file mode 100644
index c152b8b010..0000000000
--- a/Content.Shared/EntityEffects/Effects/Slipify.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared.Physics;
-using Content.Shared.Slippery;
-using Content.Shared.StepTrigger.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Makes a mob slippery.
-/// </summary>
-public sealed partial class Slipify : EntityEffect
-{
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var fixtureSystem = args.EntityManager.System<FixtureSystem>();
-        var colWakeSystem = args.EntityManager.System<CollisionWakeSystem>();
-        var slippery = args.EntityManager.EnsureComponent<SlipperyComponent>(args.TargetEntity);
-        args.EntityManager.Dirty(args.TargetEntity, slippery);
-        args.EntityManager.EnsureComponent<StepTriggerComponent>(args.TargetEntity);
-        // Need a fixture with a slip layer in order to actually do the slipping
-        var fixtures = args.EntityManager.EnsureComponent<FixturesComponent>(args.TargetEntity);
-        var body = args.EntityManager.EnsureComponent<PhysicsComponent>(args.TargetEntity);
-        var shape = fixtures.Fixtures["fix1"].Shape;
-        fixtureSystem.TryCreateFixture(args.TargetEntity, shape, "slips", 1, false, (int)CollisionGroup.SlipLayer, manager: fixtures, body: body);
-        // Need to disable collision wake so that mobs can collide with and slip on it
-        var collisionWake = args.EntityManager.EnsureComponent<CollisionWakeComponent>(args.TargetEntity);
-        colWakeSystem.SetEnabled(args.TargetEntity, false, collisionWake);
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        throw new NotImplementedException();
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
new file mode 100644
index 0000000000..602e5e923a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs
@@ -0,0 +1,44 @@
+using System.Linq;
+using Content.Shared.Physics;
+using Content.Shared.Slippery;
+using Content.Shared.StepTrigger.Components;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// This effect permanently creates a slippery fixture for this entity and then makes this entity slippery like soap.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class SlipifyEntityEffectSystem : EntityEffectSystem<FixturesComponent, Slipify>
+{
+    [Dependency] private readonly CollisionWakeSystem _collisionWake = default!;
+    [Dependency] private readonly FixtureSystem _fixture = default!;
+
+    protected override void Effect(Entity<FixturesComponent> entity, ref EntityEffectEvent<Slipify> args)
+    {
+        EnsureComp<SlipperyComponent>(entity, out var slippery);
+        slippery.SlipData = args.Effect.Slippery;
+
+        Dirty(entity, slippery);
+
+        EnsureComp<StepTriggerComponent>(entity);
+
+        if (entity.Comp.Fixtures.FirstOrDefault(x => x.Value.Hard).Value.Shape is not { } shape)
+            return;
+
+        _fixture.TryCreateFixture(entity, shape, "slips", 1, false, (int)CollisionGroup.SlipLayer, manager: entity.Comp);
+
+        // Need to disable collision wake so that mobs can collide with and slip on it
+        EnsureComp<CollisionWakeComponent>(entity, out var collisionWake);
+        _collisionWake.SetEnabled(entity, false, collisionWake);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Slipify : EntityEffectBase<Slipify>
+{
+    [DataField]
+    public SlipperyEffectEntry Slippery = new();
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
new file mode 100644
index 0000000000..ef96723cff
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs
@@ -0,0 +1,59 @@
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+// TODO: This should be removed and changed to an "AbsorbentSolutionComponent"
+/// <summary>
+/// Creates a reagent in a specified solution owned by this entity.
+/// Quantity is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed class AddReagentToSolutionEntityEffectSystem : EntityEffectSystem<SolutionContainerManagerComponent, AddReagentToSolution>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionContainerManagerComponent> entity, ref EntityEffectEvent<AddReagentToSolution> args)
+    {
+        var solution = args.Effect.Solution;
+        var reagent = args.Effect.Reagent;
+
+        if (!_solutionContainer.TryGetSolution((entity, entity), solution, out var solutionContainer))
+            return;
+
+        _solutionContainer.TryAddReagent(solutionContainer.Value, reagent, args.Scale * args.Effect.StrengthModifier);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AddReagentToSolution : EntityEffectBase<AddReagentToSolution>
+{
+    /// <summary>
+    ///     Prototype of the reagent we're adding.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<ReagentPrototype> Reagent;
+
+    ///<summary>
+    ///     Solution we're looking for
+    /// </summary>
+    [DataField(required: true)]
+    public string? Solution = "reagents";
+
+    ///<summary>
+    ///     A modifier for how much reagent we're creating.
+    /// </summary>
+    [DataField]
+    public float StrengthModifier = 1.0f;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return prototype.Resolve(Reagent, out ReagentPrototype? proto)
+            ? Loc.GetString("entity-effect-guidebook-add-to-solution-reaction",
+                ("chance", Probability),
+                ("reagent", proto.LocalizedName))
+            : null;
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
new file mode 100644
index 0000000000..334a63a95a
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+/// <summary>
+/// Adjust a reagent in this solution by an amount modified by scale.
+/// Quantity is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AdjustReagentEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustReagent>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustReagent> args)
+    {
+        var quantity = args.Effect.Amount * args.Scale;
+        var reagent = args.Effect.Reagent;
+
+        if (quantity > 0)
+            _solutionContainer.TryAddReagent(entity, reagent, quantity);
+        else
+            _solutionContainer.RemoveReagent(entity, reagent, -quantity);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustReagent : EntityEffectBase<AdjustReagent>
+{
+    /// <summary>
+    ///     The reagent ID to add or remove.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<ReagentPrototype> Reagent;
+
+    [DataField(required: true)]
+    public FixedPoint2 Amount;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return prototype.Resolve(Reagent, out ReagentPrototype? proto)
+            ? Loc.GetString("entity-effect-guidebook-adjust-reagent-reagent",
+                ("chance", Probability),
+                ("deltasign", MathF.Sign(Amount.Float())),
+                ("reagent", proto.LocalizedName),
+                ("amount", MathF.Abs(Amount.Float())))
+            : null;
+    }
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs
new file mode 100644
index 0000000000..51259956d8
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentsByGroupEntityEffectSystem.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Body.Prototypes;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+/// <summary>
+/// Adjust all reagents in this solution which are metabolized by a given metabolism group.
+/// Quantity is modified by scale, quantity is per reagent and not a total.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class AdjustReagentsByGroupEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustReagentsByGroup>
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustReagentsByGroup> args)
+    {
+        var quantity = args.Effect.Amount * args.Scale;
+        var group = args.Effect.Group;
+        var solution = entity.Comp.Solution;
+
+        foreach (var quant in solution.Contents.ToArray())
+        {
+            var proto = _proto.Index<ReagentPrototype>(quant.Reagent.Prototype);
+            if (proto.Metabolisms == null || !proto.Metabolisms.ContainsKey(group))
+                continue;
+
+            if (quantity > 0)
+                _solutionContainer.TryAddReagent(entity, proto.ID, quantity);
+            else
+                _solutionContainer.RemoveReagent(entity, proto.ID, -quantity);
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustReagentsByGroup : EntityEffectBase<AdjustReagentsByGroup>
+{
+
+    /// <summary>
+    ///     The metabolism group being adjusted. All reagents in an affected solution with this group will be adjusted.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<MetabolismGroupPrototype> Group;
+
+    [DataField(required: true)]
+    public FixedPoint2 Amount;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
new file mode 100644
index 0000000000..13175cfed1
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Database;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AreaReactionEffect : EntityEffectBase<AreaReactionEffect>
+{
+    /// <summary>
+    /// How many seconds will the effect stay, counting after fully spreading.
+    /// </summary>
+    [DataField("duration")] public float Duration = 10;
+
+    /// <summary>
+    /// How big of a reaction scale we need for 1 smoke entity.
+    /// </summary>
+    [DataField] public float OverflowThreshold = 2.5f;
+
+    /// <summary>
+    /// The entity prototype that is being spread over an area.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId PrototypeId;
+
+    /// <summary>
+    /// Sound that will get played when this reaction effect occurs.
+    /// </summary>
+    [DataField(required: true)] public SoundSpecifier Sound = default!;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-area-reaction",
+            ("duration", Duration)
+        );
+
+    public override LogImpact? Impact => LogImpact.High;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
new file mode 100644
index 0000000000..c0188fdfb4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs
@@ -0,0 +1,145 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Solution;
+
+// TODO: Energy conservation!!! Once HeatContainers are merged nuke this and everything in SolutionContainerSystem to respect energy conservation!
+/// <summary>
+/// Sets the temperature of this solution to a fixed value.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed class SetSolutionTemperatureEntityEffectSystem : EntityEffectSystem<SolutionComponent, SetSolutionTemperature>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<SetSolutionTemperature> args)
+    {
+        _solutionContainer.SetTemperature(entity, args.Effect.Temperature);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class SetSolutionTemperature : EntityEffectBase<SetSolutionTemperature>
+{
+    /// <summary>
+    ///     The temperature to set the solution to.
+    /// </summary>
+    [DataField(required: true)]
+    public float Temperature;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-set-solution-temperature-effect",
+            ("chance", Probability),
+            ("temperature", Temperature));
+}
+
+/// <summary>
+/// Adjusts the temperature of this solution by a given amount.
+/// The temperature adjustment is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed class AdjustSolutionTemperatureEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustSolutionTemperature>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustSolutionTemperature> args)
+    {
+        var solution = entity.Comp.Solution;
+        var temperature = Math.Clamp(solution.Temperature + args.Scale * args.Effect.Delta, args.Effect.MinTemp, args.Effect.MaxTemp);
+
+        _solutionContainer.SetTemperature(entity, temperature);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustSolutionTemperature : EntityEffectBase<AdjustSolutionTemperature>
+{
+    /// <summary>
+    ///     The change in temperature.
+    /// </summary>
+    [DataField(required: true)]
+    public float Delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField]
+    public float MinTemp;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField]
+    public float MaxTemp = float.PositiveInfinity;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability),
+            ("deltasign", MathF.Sign(Delta)),
+            ("mintemp", MinTemp),
+            ("maxtemp", MaxTemp));
+}
+
+/// <summary>
+/// Adjusts the thermal energy of this solution by a given amount.
+/// The energy adjustment is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed class AdjustSolutionThermalEnergyEntityEffectSystem : EntityEffectSystem<SolutionComponent, AdjustSolutionThermalEnergy>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void Effect(Entity<SolutionComponent> entity, ref EntityEffectEvent<AdjustSolutionThermalEnergy> args)
+    {
+        var solution = entity.Comp.Solution;
+
+        var delta = args.Scale * args.Effect.Delta;
+
+        // Don't adjust thermal energy if we're already at or above max temperature.
+        switch (delta)
+        {
+            case > 0:
+                if (solution.Temperature >= args.Effect.MaxTemp)
+                    return;
+                break;
+            case < 0:
+                if (solution.Temperature <= args.Effect.MinTemp)
+                    return;
+                break;
+            default:
+                return;
+        }
+
+        _solutionContainer.AddThermalEnergyClamped(entity, delta, args.Effect.MinTemp, args.Effect.MaxTemp);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class AdjustSolutionThermalEnergy : EntityEffectBase<AdjustSolutionThermalEnergy>
+{
+    /// <summary>
+    ///     The change in thermal energy.
+    /// </summary>
+    [DataField(required: true)]
+    public float Delta;
+
+    /// <summary>
+    ///     The minimum temperature this effect can reach.
+    /// </summary>
+    [DataField]
+    public float MinTemp;
+
+    /// <summary>
+    ///     The maximum temperature this effect can reach.
+    /// </summary>
+    [DataField]
+    public float MaxTemp = float.PositiveInfinity;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-adjust-solution-temperature-effect",
+            ("chance", Probability),
+            ("deltasign", MathF.Sign(Delta)),
+            ("mintemp", MinTemp),
+            ("maxtemp", MaxTemp));
+}
diff --git a/Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs b/Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs
deleted file mode 100644
index 30ac6c3d77..0000000000
--- a/Content.Shared/EntityEffects/Effects/SolutionTemperatureEffects.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-///     Sets the temperature of the solution involved with the reaction to a new value.
-/// </summary>
-[DataDefinition]
-public sealed partial class SetSolutionTemperatureEffect : EntityEffect
-{
-    /// <summary>
-    ///     The temperature to set the solution to.
-    /// </summary>
-    [DataField("temperature", required: true)] private float _temperature;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-set-solution-temperature-effect",
-            ("chance", Probability), ("temperature", _temperature));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var solution = reagentArgs.Source;
-            if (solution == null)
-                return;
-
-            solution.Temperature = _temperature;
-
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-}
-
-/// <summary>
-///     Adjusts the temperature of the solution involved in the reaction.
-/// </summary>
-[DataDefinition]
-public sealed partial class AdjustSolutionTemperatureEffect : EntityEffect
-{
-    /// <summary>
-    ///     The change in temperature.
-    /// </summary>
-    [DataField("delta", required: true)] private float _delta;
-
-    /// <summary>
-    ///     The minimum temperature this effect can reach.
-    /// </summary>
-    [DataField("minTemp")] private float _minTemp = 0.0f;
-
-    /// <summary>
-    ///     The maximum temperature this effect can reach.
-    /// </summary>
-    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-    /// <summary>
-    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-    /// </summary>
-    [DataField("scaled")] private bool _scaled;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var solution = reagentArgs.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            var deltaT = _scaled ? _delta * (float) reagentArgs.Quantity : _delta;
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-}
-
-/// <summary>
-///     Adjusts the thermal energy of the solution involved in the reaction.
-/// </summary>
-public sealed partial class AdjustSolutionThermalEnergyEffect : EntityEffect
-{
-    /// <summary>
-    ///     The change in energy.
-    /// </summary>
-    [DataField("delta", required: true)] private float _delta;
-
-    /// <summary>
-    ///     The minimum temperature this effect can reach.
-    /// </summary>
-    [DataField("minTemp")] private float _minTemp = 0.0f;
-
-    /// <summary>
-    ///     The maximum temperature this effect can reach.
-    /// </summary>
-    [DataField("maxTemp")] private float _maxTemp = float.PositiveInfinity;
-
-    /// <summary>
-    ///     If true, then scale ranges by intensity. If not, the ranges are the same regardless of reactant amount.
-    /// </summary>
-    [DataField("scaled")] private bool _scaled;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (args is EntityEffectReagentArgs reagentArgs)
-        {
-            var solution = reagentArgs.Source;
-            if (solution == null || solution.Volume == 0)
-                return;
-
-            if (_delta > 0 && solution.Temperature >= _maxTemp)
-                return;
-            if (_delta < 0 && solution.Temperature <= _minTemp)
-                return;
-
-            var heatCap = solution.GetHeatCapacity(null);
-            var deltaT = _scaled
-                ? _delta / heatCap * (float) reagentArgs.Quantity
-                : _delta / heatCap;
-
-            solution.Temperature = Math.Clamp(solution.Temperature + deltaT, _minTemp, _maxTemp);
-
-            return;
-        }
-
-        // TODO: Someone needs to figure out how to do this for non-reagent effects.
-        throw new NotImplementedException();
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-adjust-solution-temperature-effect",
-            ("chance", Probability), ("deltasign", MathF.Sign(_delta)), ("mintemp", _minTemp), ("maxtemp", _maxTemp));
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
new file mode 100644
index 0000000000..b028da1595
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/BaseStatusEffectEntityEffect.cs
@@ -0,0 +1,35 @@
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Entity effect that specifically deals with new status effects.
+/// </summary>
+/// <typeparam name="T">The entity effect type, typically for status effects which need systems to pass arguments</typeparam>
+public abstract partial class BaseStatusEntityEffect<T> : EntityEffectBase<T> where T : BaseStatusEntityEffect<T>
+{
+    /// <summary>
+    /// How long the modifier applies (in seconds).
+    /// Is scaled by reagent amount if used with an EntityEffectReagentArgs.
+    /// </summary>
+    [DataField]
+    public TimeSpan? Time = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Update;
+
+    /// <summary>
+    /// Delay before the effect starts. If another effect is added with a shorter delay, it takes precedence.
+    /// </summary>
+    [DataField]
+    public TimeSpan Delay;
+}
+
+public enum StatusEffectMetabolismType
+{
+    Update,
+    Add,
+    Remove,
+    Set,
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
new file mode 100644
index 0000000000..553300be72
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Drunk;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies the drunk status effect to this entity.
+/// The duration of the effect is equal to <see cref="Drunk.BoozePower"/> modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class DrunkEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Drunk>
+{
+    [Dependency] private readonly SharedDrunkSystem _drunk = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Drunk> args)
+    {
+        var boozePower = args.Effect.BoozePower * args.Scale;
+
+        _drunk.TryApplyDrunkenness(entity, boozePower);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Drunk : EntityEffectBase<Drunk>
+{
+    /// <summary>
+    ///     BoozePower is how long each metabolism cycle will make the drunk effect last for.
+    /// </summary>
+    [DataField]
+    public TimeSpan BoozePower = TimeSpan.FromSeconds(3f);
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-drunk", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
new file mode 100644
index 0000000000..b5a208f2c7
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.Electrocution;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+// TODO: When Electrocution is moved to new Status, make this use StatusEffectsContainerComponent.
+/// <summary>
+/// Electrocutes this entity for a given amount of damage and time.
+/// The shock damage applied by this effect is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ElectrocuteEntityEffectSystem : EntityEffectSystem<StatusEffectsComponent, Electrocute>
+{
+    [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!;
+
+    // TODO: When electrocution is new status, change this to new status
+    protected override void Effect(Entity<StatusEffectsComponent> entity, ref EntityEffectEvent<Electrocute> args)
+    {
+        var effect = args.Effect;
+
+        _electrocution.TryDoElectrocution(entity, null, (int)(args.Scale * effect.ShockDamage), effect.ElectrocuteTime, effect.Refresh, ignoreInsulation: effect.BypassInsulation);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Electrocute : EntityEffectBase<Electrocute>
+{
+    /// <summary>
+    /// Time we electrocute this entity
+    /// </summary>
+    [DataField] public TimeSpan ElectrocuteTime = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// Shock damage we apply to the entity.
+    /// </summary>
+    [DataField] public int ShockDamage = 5;
+
+    /// <summary>
+    /// Do we refresh the duration? Or add more duration if it already exists.
+    /// </summary>
+    [DataField] public bool Refresh = true;
+
+    /// <summary>
+    /// Should we by bypassing insulation?
+    /// </summary>
+    [DataField] public bool BypassInsulation = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime.TotalSeconds));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
deleted file mode 100644
index 652c1b90a1..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-///     Adds a generic status effect to the entity,
-///     not worrying about things like how to affect the time it lasts for
-///     or component fields or anything. Just adds a component to an entity
-///     for a given time. Easy.
-/// </summary>
-/// <remarks>
-///     Can be used for things like adding accents or something. I don't know. Go wild.
-/// </remarks>
-[Obsolete("Use ModifyStatusEffect with StatusEffectNewSystem instead")]
-public sealed partial class GenericStatusEffect : EntityEffect
-{
-    [DataField(required: true)]
-    public string Key = default!;
-
-    [DataField]
-    public string Component = String.Empty;
-
-    [DataField]
-    public float Time = 2.0f;
-
-    /// <remarks>
-    ///     true - refresh status effect time,  false - accumulate status effect time
-    /// </remarks>
-    [DataField]
-    public bool Refresh = true;
-
-    /// <summary>
-    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
-
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        if (Type == StatusEffectMetabolismType.Add && Component != String.Empty)
-        {
-            statusSys.TryAddStatusEffect(args.TargetEntity, Key, TimeSpan.FromSeconds(time), Refresh, Component);
-        }
-        else if (Type == StatusEffectMetabolismType.Remove)
-        {
-            statusSys.TryRemoveTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
-        }
-        else if (Type == StatusEffectMetabolismType.Set)
-        {
-            statusSys.TrySetTime(args.TargetEntity, Key, TimeSpan.FromSeconds(time));
-        }
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
-        "reagent-effect-guidebook-status-effect",
-        ("chance", Probability),
-        ("type", Type),
-        ("time", Time),
-        ("key", $"reagent-effect-status-effect-{Key}"));
-}
-
-public enum StatusEffectMetabolismType
-{
-    Update,
-    Add,
-    Remove,
-    Set
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
new file mode 100644
index 0000000000..2d870a433c
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs
@@ -0,0 +1,64 @@
+using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies a Generic Status Effect to this entity, which is a timed Component.
+/// The amount of time the Component is applied is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+[Obsolete("Use ModifyStatusEffect instead")]
+public sealed partial class GenericStatusEffectEntityEffectSystem : EntityEffectSystem<MetaDataComponent, GenericStatusEffect>
+{
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<GenericStatusEffect> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                if (args.Effect.Component != String.Empty)
+                    _status.TryAddStatusEffect(entity, args.Effect.Key, time, true, args.Effect.Component);
+                break;
+            case StatusEffectMetabolismType.Add:
+                if (args.Effect.Component != String.Empty)
+                    _status.TryAddStatusEffect(entity, args.Effect.Key, time, false, args.Effect.Component);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _status.TryRemoveTime(entity, args.Effect.Key, time);
+                break;
+            case StatusEffectMetabolismType.Set:
+                _status.TrySetTime(entity, args.Effect.Key, time);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class GenericStatusEffect : EntityEffectBase<GenericStatusEffect>
+{
+    [DataField(required: true)]
+    public string Key = default!;
+
+    [DataField]
+    public string Component = String.Empty;
+
+    [DataField]
+    public TimeSpan Time = TimeSpan.FromSeconds(2f);
+
+    /// <summary>
+    ///     Should this effect add the status effect, remove time from it, or set its cooldown?
+    /// </summary>
+    [DataField]
+    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Update;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString(
+        "entity-effect-guidebook-status-effect-old",
+        ("chance", Probability),
+        ("type", Type),
+        ("time", Time.TotalSeconds),
+        ("key", $"entity-effect-status-effect-{Key}"));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs
deleted file mode 100644
index 891c791b07..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/Jitter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Jittering;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-///     Adds the jitter status effect to a mob.
-///     This doesn't use generic status effects because it needs to
-///     take in some parameters that JitterSystem needs.
-/// </summary>
-public sealed partial class Jitter : EntityEffect
-{
-    [DataField]
-    public float Amplitude = 10.0f;
-
-    [DataField]
-    public float Frequency = 4.0f;
-
-    [DataField]
-    public float Time = 2.0f;
-
-    /// <remarks>
-    ///     true - refresh jitter time,  false - accumulate jitter time
-    /// </remarks>
-    [DataField]
-    public bool Refresh = true;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        args.EntityManager.EntitySysManager.GetEntitySystem<SharedJitteringSystem>()
-            .DoJitter(args.TargetEntity, TimeSpan.FromSeconds(time), Refresh, Amplitude, Frequency);
-    }
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Loc.GetString("reagent-effect-guidebook-jittering", ("chance", Probability));
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
new file mode 100644
index 0000000000..3b445da747
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs
@@ -0,0 +1,45 @@
+using Content.Shared.Jittering;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+// TODO: When Jittering is moved to new Status, make this use StatusEffectsContainerComponent.
+/// <summary>
+/// Applies the Jittering Status Effect to this entity.
+/// The amount of time the Jittering is applied is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class JitterEntityEffectSystem : EntityEffectSystem<StatusEffectsComponent, Jitter>
+{
+    [Dependency] private readonly SharedJitteringSystem _jittering = default!;
+
+    protected override void Effect(Entity<StatusEffectsComponent> entity, ref EntityEffectEvent<Jitter> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+
+        _jittering.DoJitter(entity, TimeSpan.FromSeconds(time), args.Effect.Refresh, args.Effect.Amplitude, args.Effect.Frequency);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Jitter : EntityEffectBase<Jitter>
+{
+    [DataField]
+    public float Amplitude = 10.0f;
+
+    [DataField]
+    public float Frequency = 4.0f;
+
+    [DataField]
+    public float Time = 2.0f;
+
+    /// <remarks>
+    ///     true - refresh jitter time,  false - accumulate jitter time
+    /// </remarks>
+    [DataField]
+    public bool Refresh = true;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("entity-effect-guidebook-jittering", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs
deleted file mode 100644
index 59ca5da0f7..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdown.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using Content.Shared.Stunnable;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Changes the knockdown timer on an entity or causes knockdown.
-/// </summary>
-[UsedImplicitly]
-public sealed partial class ModifyKnockdown : EntityEffect
-{
-    /// <summary>
-    /// Should we only affect those with crawler component? Note if this is false, it will paralyze non-crawler's instead.
-    /// </summary>
-    [DataField]
-    public bool Crawling;
-
-    /// <summary>
-    /// Should we drop items when we fall?
-    /// </summary>
-    [DataField]
-    public bool Drop;
-
-    /// <summary>
-    /// Time for which knockdown should be applied. Behaviour changes according to <see cref="StatusEffectMetabolismType"/>.
-    /// </summary>
-    [DataField]
-    public TimeSpan Time = TimeSpan.FromSeconds(0.5);
-
-    /// <summary>
-    /// Should this effect add the status effect, remove time from it, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-    /// <summary>
-    /// Should this effect add knockdown?, remove time from it?, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public bool Refresh = true;
-
-    /// <inheritdoc />
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var stunSys = args.EntityManager.EntitySysManager.GetEntitySystem<SharedStunSystem>();
-
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        switch (Type)
-        {
-            case StatusEffectMetabolismType.Update:
-                if (Crawling)
-                {
-                    stunSys.TryCrawling(args.TargetEntity, time, drop: Drop);
-                }
-                else
-                {
-                    stunSys.TryKnockdown(args.TargetEntity, time, drop: Drop);
-                }
-                break;
-            case StatusEffectMetabolismType.Add:
-                if (Crawling)
-                {
-                    stunSys.TryCrawling(args.TargetEntity, time, false, drop: Drop);
-                }
-                else
-                {
-                    stunSys.TryKnockdown(args.TargetEntity, time, false, drop: Drop);
-                }
-                break;
-            case StatusEffectMetabolismType.Remove:
-                    stunSys.AddKnockdownTime(args.TargetEntity, -time);
-                break;
-            case StatusEffectMetabolismType.Set:
-                if (Crawling)
-                {
-                    stunSys.TryCrawling(args.TargetEntity, time, drop: Drop);
-                }
-                else
-                {
-                    stunSys.TryKnockdown(args.TargetEntity, time, drop: Drop);
-                }
-                stunSys.SetKnockdownTime(args.TargetEntity, time);
-                break;
-        }
-    }
-
-    /// <inheritdoc />
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString(
-            "reagent-effect-guidebook-knockdown",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time.TotalSeconds)
-        );
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
new file mode 100644
index 0000000000..5e01774ce4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs
@@ -0,0 +1,72 @@
+using Content.Shared.Standing;
+using Content.Shared.Stunnable;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies knockdown to this entity.
+/// Duration is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyKnockdownEntityEffectSystem : EntityEffectSystem<StandingStateComponent, ModifyKnockdown>
+{
+    [Dependency] private readonly SharedStunSystem _stun = default!;
+
+    protected override void Effect(Entity<StandingStateComponent> entity, ref EntityEffectEvent<ModifyKnockdown> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                if (args.Effect.Crawling)
+                    _stun.TryCrawling(entity.Owner, time, drop: args.Effect.Drop);
+                else
+                    _stun.TryKnockdown(entity.Owner, time, drop: args.Effect.Drop);
+                break;
+            case StatusEffectMetabolismType.Add:
+                if (args.Effect.Crawling)
+                    _stun.TryCrawling(entity.Owner, time, false, drop: args.Effect.Drop);
+                else
+                    _stun.TryKnockdown(entity.Owner, time, false, drop: args.Effect.Drop);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _stun.AddKnockdownTime(entity.Owner, - time ?? TimeSpan.Zero);
+                break;
+            case StatusEffectMetabolismType.Set:
+                if (args.Effect.Crawling)
+                    _stun.TryCrawling(entity.Owner, drop: args.Effect.Drop);
+                else
+                    _stun.TryKnockdown(entity.Owner, time, drop: args.Effect.Drop);
+                _stun.SetKnockdownTime(entity.Owner, time ?? TimeSpan.Zero);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyKnockdown : BaseStatusEntityEffect<ModifyKnockdown>
+{
+    /// <summary>
+    /// Should we only affect those with crawler component? Note if this is false, it will paralyze non-crawler's instead.
+    /// </summary>
+    [DataField]
+    public bool Crawling;
+
+    /// <summary>
+    /// Should we drop items when we fall?
+    /// </summary>
+    [DataField]
+    public bool Drop;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Time == null
+        ? null
+        : Loc.GetString(
+            "entity-effect-guidebook-knockdown",
+            ("chance", Probability),
+            ("type", Type),
+            ("time", Time.Value.TotalSeconds)
+        );
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
new file mode 100644
index 0000000000..c6260eb71d
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs
@@ -0,0 +1,50 @@
+using Content.Shared.StatusEffectNew;
+using Content.Shared.Stunnable;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies the paralysis status effect to this entity.
+/// Duration is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyParalysisEntityEffectSystem : EntityEffectSystem<MetaDataComponent, ModifyParalysis>
+{
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<ModifyParalysis> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                _stun.TryUpdateParalyzeDuration(entity, time);
+                break;
+            case StatusEffectMetabolismType.Add:
+                _stun.TryAddParalyzeDuration(entity, time);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _status.TryRemoveTime(entity, SharedStunSystem.StunId, time);
+                break;
+            case StatusEffectMetabolismType.Set:
+                _status.TrySetStatusEffectDuration(entity, SharedStunSystem.StunId, time);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyParalysis : BaseStatusEntityEffect<ModifyParalysis>
+{
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Time == null
+            ? null // Not gonna make a whole new looc for something that shouldn't ever exist.
+            : Loc.GetString(
+            "entity-effect-guidebook-paralyze",
+            ("chance", Probability),
+            ("time", Time.Value.TotalSeconds)
+        );
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
deleted file mode 100644
index d7bf6482bd..0000000000
--- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffect.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Content.Shared.StatusEffectNew;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects.StatusEffects;
-
-/// <summary>
-/// Changes status effects on entities: Adds, removes or sets time.
-/// </summary>
-[UsedImplicitly]
-public sealed partial class ModifyStatusEffect : EntityEffect
-{
-    [DataField(required: true)]
-    public EntProtoId EffectProto;
-
-    /// <summary>
-    /// Time for which status effect should be applied. Behaviour changes according to <see cref="Refresh" />.
-    /// </summary>
-    [DataField]
-    public float Time = 2.0f;
-
-    /// <summary>
-    /// Delay before the effect starts. If another effect is added with a shorter delay, it takes precedence.
-    /// </summary>
-    [DataField]
-    public float Delay = 0f;
-
-    /// <summary>
-    /// Should this effect add the status effect, remove time from it, or set its cooldown?
-    /// </summary>
-    [DataField]
-    public StatusEffectMetabolismType Type = StatusEffectMetabolismType.Add;
-
-    /// <inheritdoc />
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        var statusSys = args.EntityManager.EntitySysManager.GetEntitySystem<StatusEffectsSystem>();
-
-        var time = Time;
-        if (args is EntityEffectReagentArgs reagentArgs)
-            time *= reagentArgs.Scale.Float();
-
-        var duration = TimeSpan.FromSeconds(time);
-        switch (Type)
-        {
-            case StatusEffectMetabolismType.Update:
-                statusSys.TryUpdateStatusEffectDuration(args.TargetEntity, EffectProto, duration, Delay > 0 ? TimeSpan.FromSeconds(Delay) : null);
-                break;
-            case StatusEffectMetabolismType.Add:
-                statusSys.TryAddStatusEffectDuration(args.TargetEntity, EffectProto, duration, Delay > 0 ? TimeSpan.FromSeconds(Delay) : null);
-                break;
-            case StatusEffectMetabolismType.Remove:
-                statusSys.TryAddTime(args.TargetEntity, EffectProto, -duration);
-                break;
-            case StatusEffectMetabolismType.Set:
-                statusSys.TrySetStatusEffectDuration(args.TargetEntity, EffectProto, duration, TimeSpan.FromSeconds(Delay));
-                break;
-        }
-    }
-
-    /// <inheritdoc />
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-        Delay > 0
-        ? Loc.GetString(
-            "reagent-effect-guidebook-status-effect-delay",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time),
-            ("key", prototype.Index(EffectProto).Name),
-            ("delay", Delay))
-        : Loc.GetString(
-            "reagent-effect-guidebook-status-effect",
-            ("chance", Probability),
-            ("type", Type),
-            ("time", Time),
-            ("key", prototype.Index(EffectProto).Name)
-        );
-}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
new file mode 100644
index 0000000000..b42c3f2950
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs
@@ -0,0 +1,65 @@
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies a given status effect to this entity.
+/// Duration is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class ModifyStatusEffectEntityEffectSystem : EntityEffectSystem<MetaDataComponent, ModifyStatusEffect>
+{
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<ModifyStatusEffect> args)
+    {
+        var time = args.Effect.Time * args.Scale;
+        var delay = args.Effect.Delay;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                _status.TryUpdateStatusEffectDuration(entity, args.Effect.EffectProto, time, delay);
+                break;
+            case StatusEffectMetabolismType.Add:
+                if (time != null)
+                    _status.TryAddStatusEffectDuration(entity, args.Effect.EffectProto, time.Value, delay);
+                else
+                    _status.TryUpdateStatusEffectDuration(entity, args.Effect.EffectProto, time, delay);
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _status.TryRemoveTime(entity, args.Effect.EffectProto, time);
+                break;
+            case StatusEffectMetabolismType.Set:
+                _status.TrySetStatusEffectDuration(entity, args.Effect.EffectProto, time, delay);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class ModifyStatusEffect : BaseStatusEntityEffect<ModifyStatusEffect>
+{
+    /// <summary>
+    /// Prototype of the status effect we're modifying.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId EffectProto;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Time == null
+            ? Loc.GetString(
+                "entity-effect-guidebook-status-effect-indef",
+                ("chance", Probability),
+                ("type", Type),
+                ("key", prototype.Index(EffectProto).Name),
+                ("delay", Delay.TotalSeconds))
+            : Loc.GetString(
+                "entity-effect-guidebook-status-effect",
+                ("chance", Probability),
+                ("type", Type),
+                ("time", Time.Value.TotalSeconds),
+                ("key", prototype.Index(EffectProto).Name),
+                ("delay", Delay.TotalSeconds));
+}
diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
new file mode 100644
index 0000000000..ed9923f856
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs
@@ -0,0 +1,92 @@
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.StatusEffects;
+
+/// <summary>
+/// Applies a given movement speed modifier status effect to this entity.
+/// Duration is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class MovementSpeedModifierEntityEffectSystem : EntityEffectSystem<MovementSpeedModifierComponent, MovementSpeedModifier>
+{
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+    [Dependency] private readonly MovementModStatusSystem _movementModStatus = default!;
+
+    protected override void Effect(Entity<MovementSpeedModifierComponent> entity, ref EntityEffectEvent<MovementSpeedModifier> args)
+    {
+        var proto = args.Effect.EffectProto;
+        var sprintMod = args.Effect.SprintSpeedModifier;
+        var walkMod = args.Effect.WalkSpeedModifier;
+
+        switch (args.Effect.Type)
+        {
+            case StatusEffectMetabolismType.Update:
+                _movementModStatus.TryUpdateMovementSpeedModDuration(
+                    entity,
+                    proto,
+                    args.Effect.Time * args.Scale,
+                    sprintMod,
+                    walkMod);
+                break;
+            case StatusEffectMetabolismType.Add:
+                if (args.Effect.Time != null)
+                {
+                    _movementModStatus.TryAddMovementSpeedModDuration(
+                        entity,
+                        proto,
+                        args.Effect.Time.Value * args.Scale,
+                        sprintMod,
+                        walkMod);
+                }
+                else
+                {
+                    _movementModStatus.TryUpdateMovementSpeedModDuration(
+                        entity,
+                        proto,
+                        args.Effect.Time * args.Scale,
+                        sprintMod,
+                        walkMod);
+                }
+                break;
+            case StatusEffectMetabolismType.Remove:
+                _status.TryRemoveTime(entity, args.Effect.EffectProto, args.Effect.Time * args.Scale);
+                break;
+            case StatusEffectMetabolismType.Set:
+                _status.TrySetStatusEffectDuration(entity, proto, args.Effect.Time * args.Scale);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class MovementSpeedModifier : BaseStatusEntityEffect<MovementSpeedModifier>
+{
+    /// <summary>
+    /// How much the entities' walk speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float WalkSpeedModifier = 1f;
+
+    /// <summary>
+    /// How much the entities' run speed is multiplied by.
+    /// </summary>
+    [DataField]
+    public float SprintSpeedModifier = 1f;
+
+    /// <summary>
+    /// Movement speed modifier prototype we're adding. Adding in case we ever want more than one prototype that boosts speed.
+    /// </summary>
+    [DataField]
+    public EntProtoId EffectProto = MovementModStatusSystem.ReagentSpeed;
+
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+    Time == null
+        ? null // Not gonna make a whole new looc for something that shouldn't ever exist.
+        : Loc.GetString("entity-effect-guidebook-movespeed-modifier",
+            ("chance", Probability),
+            ("sprintspeed", SprintSpeedModifier),
+            ("time", Time.Value.TotalSeconds));
+}
diff --git a/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
new file mode 100644
index 0000000000..ea7c2dc8d4
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/TemplateEntityEffectSystem.cs
@@ -0,0 +1,21 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// A brief summary of the effect.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class TemplateEntityEffectSystem : EntityEffectSystem<MetaDataComponent, Template>
+{
+    protected override void Effect(Entity<MetaDataComponent> entity, ref EntityEffectEvent<Template> args)
+    {
+        // Effect goes here.
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Template : EntityEffectBase<Template>
+{
+    public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
+}
diff --git a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
new file mode 100644
index 0000000000..2cbb6d6dad
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs
@@ -0,0 +1,56 @@
+using Content.Shared.Database;
+using Content.Shared.Emp;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Transform;
+
+/// <summary>
+/// Creates an EMP at this entity's coordinates.
+/// Range is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class EmpEntityEffectSystem : EntityEffectSystem<TransformComponent, Emp>
+{
+    [Dependency] private readonly SharedEmpSystem _emp = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<Emp> args)
+    {
+        var range = MathF.Min(args.Effect.RangeModifier * args.Scale, args.Effect.MaxRange);
+
+        _emp.EmpPulse(_xform.GetMapCoordinates(entity, xform: entity.Comp), range, args.Effect.EnergyConsumption, args.Effect.Duration);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Emp : EntityEffectBase<Emp>
+{
+    /// <summary>
+    ///     Impulse range per unit of quantity
+    /// </summary>
+    [DataField]
+    public float RangeModifier = 0.5f;
+
+    /// <summary>
+    ///     Maximum impulse range
+    /// </summary>
+    [DataField]
+    public float MaxRange = 10;
+
+    /// <summary>
+    ///     How much energy will be drain from sources
+    /// </summary>
+    [DataField]
+    public float EnergyConsumption = 12500;
+
+    /// <summary>
+    ///     Amount of time entities will be disabled
+    /// </summary>
+    [DataField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(15);
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-emp-reaction-effect", ("chance", Probability));
+
+    public override LogImpact? Impact => LogImpact.Medium;
+}
diff --git a/Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
similarity index 65%
rename from Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
rename to Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
index bc9af15092..907c4e321f 100644
--- a/Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
@@ -1,19 +1,18 @@
-using Content.Shared.Database;
+using Content.Shared.Database;
 using Content.Shared.Explosion;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using System.Text.Json.Serialization;
 
-namespace Content.Shared.EntityEffects.Effects;
+namespace Content.Shared.EntityEffects.Effects.Transform;
 
-[DataDefinition]
-public sealed partial class ExplosionReactionEffect : EventEntityEffect<ExplosionReactionEffect>
+/// <inheritdoc cref="EntityEffect"/>
+/// <seealso cref="Explode"/>
+public sealed partial class Explosion : EntityEffectBase<Explosion>
 {
     /// <summary>
     ///     The type of explosion. Determines damage types and tile break chance scaling.
     /// </summary>
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
-    public string ExplosionType = default!;
+    [DataField(required: true)]
+    public ProtoId<ExplosionPrototype> ExplosionType;
 
     /// <summary>
     ///     The max intensity the explosion can have at a given tile. Places an upper limit of damage and tile break
@@ -51,9 +50,8 @@ public sealed partial class ExplosionReactionEffect : EventEntityEffect<Explosio
     [DataField]
     public float TileBreakScale = 1f;
 
-    public override bool ShouldLog => true;
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-explosion", ("chance", Probability));
 
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-explosion-reaction-effect", ("chance", Probability));
-    public override LogImpact LogImpact => LogImpact.High;
+    public override LogImpact? Impact => LogImpact.High;
 }
diff --git a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs
new file mode 100644
index 0000000000..df788e94d6
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs
@@ -0,0 +1,81 @@
+using Content.Shared.Flash;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects.Transform;
+
+/// <summary>
+/// Creates a Flash at this entity's coordinates.
+/// Range is modified by scale.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class FlashEntityEffectSystem : EntityEffectSystem<TransformComponent, Flash>
+{
+    [Dependency] private readonly SharedFlashSystem _flash = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<Flash> args)
+    {
+        var range = MathF.Min(args.Scale * args.Effect.RangePerUnit, args.Effect.MaxRange);
+
+        _flash.FlashArea(
+            entity,
+            null,
+            range,
+            args.Effect.Duration,
+            slowTo: args.Effect.SlowTo,
+            sound: args.Effect.Sound);
+
+        if (args.Effect.FlashEffectPrototype == null)
+            return;
+
+        var uid = PredictedSpawnAtPosition(args.Effect.FlashEffectPrototype, _xform.GetMoverCoordinates(entity));
+
+        _pointLight.SetRadius(uid, MathF.Max(1.1f, range));
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class Flash : EntityEffectBase<Flash>
+{
+    /// <summary>
+    ///     Flash range per unit of reagent.
+    /// </summary>
+    [DataField]
+    public float RangePerUnit = 0.2f;
+
+    /// <summary>
+    ///     Maximum flash range.
+    /// </summary>
+    [DataField]
+    public float MaxRange = 10f;
+
+    /// <summary>
+    ///     How much to entities are slowed down.
+    /// </summary>
+    [DataField]
+    public float SlowTo = 0.5f;
+
+    /// <summary>
+    ///     The time entities will be flashed.
+    ///     The default is chosen to be better than the hand flash so it is worth using it for grenades etc.
+    /// </summary>
+    [DataField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(4);
+
+    /// <summary>
+    ///     The prototype ID used for the visual effect.
+    /// </summary>
+    [DataField]
+    public EntProtoId? FlashEffectPrototype = "ReactionFlash";
+
+    /// <summary>
+    ///     The sound the flash creates.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg");
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-flash-reaction-effect", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
new file mode 100644
index 0000000000..5381d5e01e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
@@ -0,0 +1,86 @@
+using Content.Shared.Popups;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.EntityEffects.Effects.Transform;
+
+/// <summary>
+/// Creates a text popup to appear at this entity's coordinates.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
+public sealed partial class PopupMessageEntityEffectSystem : EntityEffectSystem<TransformComponent, PopupMessage>
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    protected override void Effect(Entity<TransformComponent> entity, ref EntityEffectEvent<PopupMessage> args)
+    {
+        // TODO: When we get proper random prediction remove this check.
+        if (_net.IsClient)
+            return;
+
+        var msg = Loc.GetString(_random.Pick(args.Effect.Messages), ("entity", entity));
+
+        switch ((args.Effect.Method, args.Effect.Type))
+        {
+            case (PopupMethod.PopupEntity, PopupRecipients.Local):
+                _popup.PopupEntity(msg, entity, entity, args.Effect.VisualType);
+                break;
+            case (PopupMethod.PopupEntity, PopupRecipients.Pvs):
+                _popup.PopupEntity(msg, entity, args.Effect.VisualType);
+                break;
+            case (PopupMethod.PopupCoordinates, PopupRecipients.Local):
+                _popup.PopupCoordinates(msg, Transform(entity).Coordinates, entity, args.Effect.VisualType);
+                break;
+            case (PopupMethod.PopupCoordinates, PopupRecipients.Pvs):
+                _popup.PopupCoordinates(msg, Transform(entity).Coordinates, args.Effect.VisualType);
+                break;
+        }
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class PopupMessage : EntityEffectBase<PopupMessage>
+{
+    /// <summary>
+    /// Array of messages that can popup.
+    /// Only one is chosen when the effect is applied.
+    /// </summary>
+    [DataField(required: true)]
+    public string[] Messages = default!;
+
+    /// <summary>
+    /// Whether to just the entity we're affecting, or everyone around them.
+    /// </summary>
+    [DataField]
+    public PopupRecipients Type = PopupRecipients.Local;
+
+    /// <summary>
+    /// Which popup API method to use.
+    /// Use PopupCoordinates in case the entity will be deleted while the popup is shown.
+    /// </summary>
+    [DataField]
+    public PopupMethod Method = PopupMethod.PopupEntity;
+
+    /// <summary>
+    /// Size of the popup.
+    /// </summary>
+    [DataField]
+    public PopupType VisualType = PopupType.Small;
+}
+
+[Serializable, NetSerializable]
+public enum PopupRecipients : byte
+{
+    Pvs,
+    Local,
+}
+
+[Serializable, NetSerializable]
+public enum PopupMethod : byte
+{
+    PopupEntity,
+    PopupCoordinates,
+}
diff --git a/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
new file mode 100644
index 0000000000..c54912191e
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Washes the cream pie off of this entity face.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+/// TODO: This can probably be made into a generic "CleanEntityEffect" which multiple components listen to...
+public sealed partial class WashCreamPieEntityEffectSystem : EntityEffectSystem<CreamPiedComponent, WashCreamPie>
+{
+    [Dependency] private readonly SharedCreamPieSystem _creamPie = default!;
+
+    protected override void Effect(Entity<CreamPiedComponent> entity, ref EntityEffectEvent<WashCreamPie> args)
+    {
+        _creamPie.SetCreamPied(entity, entity.Comp, false);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class WashCreamPie : EntityEffectBase<WashCreamPie>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
+}
diff --git a/Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs b/Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs
deleted file mode 100644
index e6992a3ec8..0000000000
--- a/Content.Shared/EntityEffects/Effects/WashCreamPieReaction.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-public sealed partial class WashCreamPieReaction : EntityEffect
-{
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-wash-cream-pie-reaction", ("chance", Probability));
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (!args.EntityManager.TryGetComponent(args.TargetEntity, out CreamPiedComponent? creamPied)) return;
-
-        args.EntityManager.System<SharedCreamPieSystem>().SetCreamPied(args.TargetEntity, creamPied, false);
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/WearableReaction.cs b/Content.Shared/EntityEffects/Effects/WearableReaction.cs
deleted file mode 100644
index 08c28f9821..0000000000
--- a/Content.Shared/EntityEffects/Effects/WearableReaction.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Content.Shared.Inventory;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects.Effects;
-
-/// <summary>
-/// A reaction effect that spawns a PrototypeID in the entity's Slot, and attempts to consume the reagent if EntityEffectReagentArgs.
-/// Used to implement the water droplet effect for arachnids.
-/// </summary>
-public sealed partial class WearableReaction : EntityEffect
-{
-    /// <summary>
-    /// Minimum quantity of reagent required to trigger this effect.
-    /// Only used with EntityEffectReagentArgs.
-    /// </summary>
-    [DataField]
-    public float AmountThreshold = 1f;
-
-    /// <summary>
-    /// Slot to spawn the item into.
-    /// </summary>
-    [DataField(required: true)]
-    public string Slot;
-
-    /// <summary>
-    /// Prototype ID of item to spawn.
-    /// </summary>
-    [DataField(required: true)]
-    public string PrototypeID;
-
-    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
-
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        // SpawnItemInSlot returns false if slot is already occupied
-        if (args.EntityManager.System<InventorySystem>().SpawnItemInSlot(args.TargetEntity, Slot, PrototypeID))
-        {
-            if (args is EntityEffectReagentArgs reagentArgs)
-            {
-                if (reagentArgs.Reagent == null || reagentArgs.Quantity < AmountThreshold)
-                    return;
-                reagentArgs.Source?.RemoveReagent(reagentArgs.Reagent.ID, AmountThreshold);
-            }
-        }
-    }
-}
diff --git a/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
new file mode 100644
index 0000000000..ea0e6f0e34
--- /dev/null
+++ b/Content.Shared/EntityEffects/Effects/ZombieEntityEffectsSystem.cs
@@ -0,0 +1,67 @@
+using Content.Shared.Mobs.Components;
+using Content.Shared.Zombies;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.EntityEffects.Effects;
+
+/// <summary>
+/// Causes the zombie infection on this entity.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class CauseZombieInfectionEntityEffectsSystem : EntityEffectSystem<MobStateComponent, CauseZombieInfection>
+{
+    // MobState because you have to die to become a zombie...
+    protected override void Effect(Entity<MobStateComponent> entity, ref EntityEffectEvent<CauseZombieInfection> args)
+    {
+        if (HasComp<ZombieImmuneComponent>(entity) || HasComp<IncurableZombieComponent>(entity))
+            return;
+
+        EnsureComp<ZombifyOnDeathComponent>(entity);
+        EnsureComp<PendingZombieComponent>(entity);
+    }
+}
+
+/// <summary>
+/// Cures the Zombie infection on this entity and optionally inoculates them against future infection.
+/// </summary>
+/// <inheritdoc cref="EntityEffectSystem{T, TEffect}"/>
+public sealed partial class CureZombieInfectionEntityEffectsSystem : EntityEffectSystem<MobStateComponent, CureZombieInfection>
+{
+    // MobState because you have to die to become a zombie...
+    protected override void Effect(Entity<MobStateComponent> entity, ref EntityEffectEvent<CureZombieInfection> args)
+    {
+        if (HasComp<IncurableZombieComponent>(entity))
+            return;
+
+        RemComp<ZombifyOnDeathComponent>(entity);
+        RemComp<PendingZombieComponent>(entity);
+
+        if (args.Effect.Innoculate)
+            EnsureComp<ZombieImmuneComponent>(entity);
+    }
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class CauseZombieInfection : EntityEffectBase<CauseZombieInfection>
+{
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+        => Loc.GetString("entity-effect-guidebook-cause-zombie-infection", ("chance", Probability));
+}
+
+/// <inheritdoc cref="EntityEffect"/>
+public sealed partial class CureZombieInfection : EntityEffectBase<CureZombieInfection>
+{
+    /// <summary>
+    /// Do we also protect against future infections?
+    /// </summary>
+    [DataField]
+    public bool Innoculate;
+
+    public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        if (Innoculate)
+            return Loc.GetString("entity-effect-guidebook-innoculate-zombie-infection", ("chance", Probability));
+
+        return Loc.GetString("entity-effect-guidebook-cure-zombie-infection", ("chance", Probability));
+    }
+}
diff --git a/Content.Shared/EntityEffects/EntityEffect.cs b/Content.Shared/EntityEffects/EntityEffect.cs
index 998759006f..072ff8a61a 100644
--- a/Content.Shared/EntityEffects/EntityEffect.cs
+++ b/Content.Shared/EntityEffects/EntityEffect.cs
@@ -1,145 +1,62 @@
-using System.Linq;
-using System.Text.Json.Serialization;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Database;
-using Content.Shared.FixedPoint;
-using Content.Shared.Localizations;
-using JetBrains.Annotations;
+using Content.Shared.EntityConditions;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Toolshed.TypeParsers;
 
 namespace Content.Shared.EntityEffects;
 
 /// <summary>
-///     Entity effects describe behavior that occurs on different kinds of triggers, e.g. when a reagent is ingested and metabolized by some
-///     organ. They only trigger when all of <see cref="Conditions"/> are satisfied.
+/// A basic instantaneous effect which can be applied to an entity via events.
 /// </summary>
 [ImplicitDataDefinitionForInheritors]
-[MeansImplicitUse]
 public abstract partial class EntityEffect
 {
-    private protected string _id => this.GetType().Name;
-    /// <summary>
-    ///     The list of conditions required for the effect to activate. Not required.
-    /// </summary>
-    [DataField("conditions")]
-    public EntityEffectCondition[]? Conditions;
+    public abstract void RaiseEvent(EntityUid target, IEntityEffectRaiser raiser, float scale, EntityUid? user);
 
-    public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
-
-    protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys);
+    [DataField]
+    public EntityCondition[]? Conditions;
 
     /// <summary>
-    ///     What's the chance, from 0 to 1, that this effect will occur?
+    /// If our scale is less than this value, the effect fails.
     /// </summary>
-    [DataField("probability")]
+    [DataField]
+    public virtual float MinScale { get; private set; }
+
+    /// <summary>
+    /// If true, then it allows the scale multiplier to go above 1.
+    /// </summary>
+    [DataField]
+    public virtual bool Scaling { get; private set; }
+
+    // TODO: This should be an entity condition but guidebook relies on it heavily for formatting...
+    /// <summary>
+    /// Probability of the effect occuring.
+    /// </summary>
+    [DataField]
     public float Probability = 1.0f;
 
-    public virtual LogImpact LogImpact { get; private set; } = LogImpact.Low;
+    public virtual string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => null;
 
     /// <summary>
-    ///     Should this entity effect log at all?
+    /// If this effect is logged, how important is the log?
     /// </summary>
-    public virtual bool ShouldLog { get; private set; } = false;
+    [ViewVariables]
+    public virtual LogImpact? Impact => null;
 
-    public abstract void Effect(EntityEffectBaseArgs args);
-
-    /// <summary>
-    /// Produces a localized, bbcode'd guidebook description for this effect.
-    /// </summary>
-    /// <returns></returns>
-    public string? GuidebookEffectDescription(IPrototypeManager prototype, IEntitySystemManager entSys)
-    {
-        var effect = ReagentEffectGuidebookText(prototype, entSys);
-        if (effect is null)
-            return null;
-
-        return Loc.GetString(ReagentEffectFormat, ("effect", effect), ("chance", Probability),
-            ("conditionCount", Conditions?.Length ?? 0),
-            ("conditions",
-                ContentLocalizationManager.FormatList(Conditions?.Select(x => x.GuidebookExplanation(prototype)).ToList() ??
-                                                        new List<string>())));
-    }
-}
-
-public static class EntityEffectExt
-{
-    public static bool ShouldApply(this EntityEffect effect, EntityEffectBaseArgs args,
-        IRobustRandom? random = null)
-    {
-        if (random == null)
-            random = IoCManager.Resolve<IRobustRandom>();
-
-        if (effect.Probability < 1.0f && !random.Prob(effect.Probability))
-            return false;
-
-        if (effect.Conditions != null)
-        {
-            foreach (var cond in effect.Conditions)
-            {
-                if (!cond.Condition(args))
-                    return false;
-            }
-        }
-
-        return true;
-    }
-}
-
-[ByRefEvent]
-public struct ExecuteEntityEffectEvent<T> where T : EntityEffect
-{
-    public T Effect;
-    public EntityEffectBaseArgs Args;
-
-    public ExecuteEntityEffectEvent(T effect, EntityEffectBaseArgs args)
-    {
-        Effect = effect;
-        Args = args;
-    }
+    [ViewVariables]
+    public virtual LogType LogType => LogType.EntityEffect;
 }
 
 /// <summary>
-///     EntityEffectBaseArgs only contains the target of an effect.
-///     If a trigger wants to include more info (e.g. the quantity of the chemical triggering the effect), it can be extended (see EntityEffectReagentArgs).
+/// Used to store an <see cref="EntityEffect"/> so it can be raised without losing the type of the condition.
 /// </summary>
-public record class EntityEffectBaseArgs
+/// <typeparam name="T">The Condition wer are raising.</typeparam>
+public abstract partial class EntityEffectBase<T> : EntityEffect where T : EntityEffectBase<T>
 {
-    public EntityUid TargetEntity;
-
-    public IEntityManager EntityManager = default!;
-
-    public EntityEffectBaseArgs(EntityUid targetEntity, IEntityManager entityManager)
+    public override void RaiseEvent(EntityUid target, IEntityEffectRaiser raiser, float scale, EntityUid? user)
     {
-        TargetEntity = targetEntity;
-        EntityManager = entityManager;
-    }
-}
-
-public record class EntityEffectReagentArgs : EntityEffectBaseArgs
-{
-    public EntityUid? OrganEntity;
-
-    public Solution? Source;
-
-    public FixedPoint2 Quantity;
-
-    public ReagentPrototype? Reagent;
-
-    public ReactionMethod? Method;
-
-    public FixedPoint2 Scale;
-
-    public EntityEffectReagentArgs(EntityUid targetEntity, IEntityManager entityManager, EntityUid? organEntity, Solution? source, FixedPoint2 quantity, ReagentPrototype? reagent, ReactionMethod? method, FixedPoint2 scale) : base(targetEntity, entityManager)
-    {
-        OrganEntity = organEntity;
-        Source = source;
-        Quantity = quantity;
-        Reagent = reagent;
-        Method = method;
-        Scale = scale;
+        if (this is not T type)
+            return;
+
+        raiser.RaiseEffectEvent(target, type, scale, user);
     }
 }
diff --git a/Content.Shared/EntityEffects/EntityEffectCondition.cs b/Content.Shared/EntityEffects/EntityEffectCondition.cs
deleted file mode 100644
index 4c27b1e6ed..0000000000
--- a/Content.Shared/EntityEffects/EntityEffectCondition.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Text.Json.Serialization;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.EntityEffects;
-
-[ImplicitDataDefinitionForInheritors]
-[MeansImplicitUse]
-public abstract partial class EntityEffectCondition
-{
-    [JsonPropertyName("id")] private protected string _id => this.GetType().Name;
-
-    public abstract bool Condition(EntityEffectBaseArgs args);
-
-    /// <summary>
-    /// Effect explanations are of the form "[chance to] [action] when [condition] and [condition]"
-    /// </summary>
-    /// <param name="prototype"></param>
-    /// <returns></returns>
-    public abstract string GuidebookExplanation(IPrototypeManager prototype);
-}
-
-[ByRefEvent]
-public struct CheckEntityEffectConditionEvent<T> where T : EntityEffectCondition
-{
-    public T Condition;
-    public EntityEffectBaseArgs Args;
-    public bool Result;
-}
diff --git a/Content.Shared/EntityEffects/EntityEffectEvent.cs b/Content.Shared/EntityEffects/EntityEffectEvent.cs
new file mode 100644
index 0000000000..aa9baad23b
--- /dev/null
+++ b/Content.Shared/EntityEffects/EntityEffectEvent.cs
@@ -0,0 +1,27 @@
+namespace Content.Shared.EntityEffects;
+
+/// <summary>
+/// An Event carrying an entity effect.
+/// </summary>
+/// <param name="Effect">The Effect</param>
+/// <param name="Scale">A strength scalar for the effect, defaults to 1 and typically only goes under for incomplete reactions.</param>
+/// <param name="User">The entity causing the effect.</param>
+[ByRefEvent, Access(typeof(SharedEntityEffectsSystem))]
+public readonly record struct EntityEffectEvent<T>(T Effect, float Scale, EntityUid? User) where T : EntityEffectBase<T>
+{
+    /// <summary>
+    /// The Condition being raised in this event
+    /// </summary>
+    public readonly T Effect = Effect;
+
+    /// <summary>
+    /// The Scale modifier of this Effect.
+    /// </summary>
+    public readonly float Scale = Scale;
+
+    /// <summary>
+    /// The entity that caused this effect.
+    /// Used for admin logs and prediction purposes.
+    /// </summary>
+    public readonly EntityUid? User = User;
+}
diff --git a/Content.Shared/EntityEffects/EventEntityEffect.cs b/Content.Shared/EntityEffects/EventEntityEffect.cs
deleted file mode 100644
index 22cd035867..0000000000
--- a/Content.Shared/EntityEffects/EventEntityEffect.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Content.Shared.EntityEffects;
-
-public abstract partial class EventEntityEffect<T> : EntityEffect where T : EntityEffect
-{
-    public override void Effect(EntityEffectBaseArgs args)
-    {
-        if (this is not T type)
-            return;
-        var ev = new ExecuteEntityEffectEvent<T>(type, args);
-        args.EntityManager.EventBus.RaiseEvent(EventSource.Local, ref ev);
-    }
-}
diff --git a/Content.Shared/EntityEffects/EventEntityEffectCondition.cs b/Content.Shared/EntityEffects/EventEntityEffectCondition.cs
deleted file mode 100644
index f36b1771b2..0000000000
--- a/Content.Shared/EntityEffects/EventEntityEffectCondition.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Content.Shared.EntityEffects;
-
-public abstract partial class EventEntityEffectCondition<T> : EntityEffectCondition where T : EventEntityEffectCondition<T>
-{
-    public override bool Condition(EntityEffectBaseArgs args)
-    {
-        if (this is not T type)
-            return false;
-
-        var evt = new CheckEntityEffectConditionEvent<T> { Condition = type, Args = args };
-        args.EntityManager.EventBus.RaiseEvent(EventSource.Local, ref evt);
-        return evt.Result;
-    }
-}
diff --git a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
new file mode 100644
index 0000000000..7eed94a099
--- /dev/null
+++ b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs
@@ -0,0 +1,168 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.EntityConditions;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.EntityEffects;
+
+/// <summary>
+/// This handles entity effects.
+/// Specifically it handles the receiving of events for causing entity effects, and provides
+/// public API for other systems to take advantage of entity effects.
+/// </summary>
+public sealed partial class SharedEntityEffectsSystem : EntitySystem, IEntityEffectRaiser
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
+    [Dependency] private readonly SharedEntityConditionsSystem _condition = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<ReactiveComponent, ReactionEntityEvent>(OnReactive);
+    }
+
+    private void OnReactive(Entity<ReactiveComponent> entity, ref ReactionEntityEvent args)
+    {
+        if (args.Reagent.ReactiveEffects == null || entity.Comp.ReactiveGroups == null)
+            return;
+
+        var scale = args.ReagentQuantity.Quantity.Float();
+
+        foreach (var (key, val) in args.Reagent.ReactiveEffects)
+        {
+            if (!val.Methods.Contains(args.Method))
+                continue;
+
+            if (!entity.Comp.ReactiveGroups.TryGetValue(key, out var group))
+                continue;
+
+            if (!group.Contains(args.Method))
+                continue;
+
+            ApplyEffects(entity, val.Effects, scale);
+        }
+
+        if (entity.Comp.Reactions == null)
+            return;
+
+        foreach (var entry in entity.Comp.Reactions)
+        {
+            if (!entry.Methods.Contains(args.Method))
+                continue;
+
+            if (entry.Reagents == null || entry.Reagents.Contains(args.Reagent.ID))
+                ApplyEffects(entity, entry.Effects, scale);
+        }
+    }
+
+    /// <summary>
+    /// Applies a list of entity effects to a target entity.
+    /// </summary>
+    /// <param name="target">Entity being targeted by the effects</param>
+    /// <param name="effects">Effects we're applying to the entity</param>
+    /// <param name="scale">Optional scale multiplier for the effects</param>
+    /// <param name="user">The entity causing the effect.</param>
+    public void ApplyEffects(EntityUid target, EntityEffect[] effects, float scale = 1f, EntityUid? user = null)
+    {
+        // do all effects, if conditions apply
+        foreach (var effect in effects)
+        {
+            TryApplyEffect(target, effect, scale, user);
+        }
+    }
+
+    /// <summary>
+    /// Applies an entity effect to a target if all conditions pass.
+    /// </summary>
+    /// <param name="target">Target we're applying an effect to</param>
+    /// <param name="effect">Effect we're applying</param>
+    /// <param name="scale">Optional scale multiplier for the effect.</param>
+    /// <param name="user">The entity causing the effect.</param>
+    /// <returns>True if all conditions pass!</returns>
+    public bool TryApplyEffect(EntityUid target, EntityEffect effect, float scale = 1f, EntityUid? user = null)
+    {
+        if (scale < effect.MinScale)
+            return false;
+
+        // TODO: Replace with proper random prediciton when it exists.
+        if (effect.Probability <= 1f)
+        {
+            var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(target).Id, 0);
+            var rand = new System.Random(seed);
+            if (!rand.Prob(effect.Probability))
+                return false;
+        }
+
+        // See if conditions apply
+        if (!_condition.TryConditions(target, effect.Conditions))
+            return false;
+
+        ApplyEffect(target, effect, scale, user);
+        return true;
+    }
+
+    /// <summary>
+    /// Applies an <see cref="EntityEffect"/> to a given target.
+    /// This doesn't check conditions so you should only call this if you know what you're doing!
+    /// </summary>
+    /// <param name="target">Target we're applying an effect to</param>
+    /// <param name="effect">Effect we're applying</param>
+    /// <param name="scale">Optional scale multiplier for the effect.</param>
+    /// <param name="user">The entity causing the effect.</param>
+    public void ApplyEffect(EntityUid target, EntityEffect effect, float scale = 1f, EntityUid? user = null)
+    {
+        // Clamp the scale if the effect doesn't allow scaling.
+        if (!effect.Scaling)
+            scale = Math.Min(scale, 1f);
+
+        if (effect.Impact is { } level)
+        {
+            _adminLog.Add(
+                effect.LogType,
+                level,
+                $"Entity effect {effect.GetType().Name:effect}"
+                + $" applied on entity {target:entity}"
+                + $" at {Transform(target).Coordinates:coordinates}"
+                + $" with a scale multiplier of {scale}"
+            );
+        }
+
+        effect.RaiseEvent(target, this, scale, user);
+    }
+
+    /// <summary>
+    /// Raises an effect to an entity. You should not be calling this unless you know what you're doing.
+    /// </summary>
+    public void RaiseEffectEvent<T>(EntityUid target, T effect, float scale, EntityUid? user) where T : EntityEffectBase<T>
+    {
+        var effectEv = new EntityEffectEvent<T>(effect, scale, user);
+        RaiseLocalEvent(target, ref effectEv);
+    }
+}
+
+/// <summary>
+/// This is a basic abstract entity effect containing all the data an entity effect needs to affect entities with effects...
+/// </summary>
+/// <typeparam name="T">The Component that is required for the effect</typeparam>
+/// <typeparam name="TEffect">The Entity Effect itself</typeparam>
+public abstract partial class EntityEffectSystem<T, TEffect> : EntitySystem where T : Component where TEffect : EntityEffectBase<TEffect>
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<T, EntityEffectEvent<TEffect>>(Effect);
+    }
+
+    protected abstract void Effect(Entity<T> entity, ref EntityEffectEvent<TEffect> args);
+}
+
+/// <summary>
+/// Used to raise an EntityEffect without losing the type of effect.
+/// </summary>
+public interface IEntityEffectRaiser
+{
+    void RaiseEffectEvent<T>(EntityUid target, T effect, float scale, EntityUid? user) where T : EntityEffectBase<T>;
+}
diff --git a/Content.Shared/FingerprintReader/FingerprintReaderComponent.cs b/Content.Shared/FingerprintReader/FingerprintReaderComponent.cs
index 166551cfe7..2f8a9232ff 100644
--- a/Content.Shared/FingerprintReader/FingerprintReaderComponent.cs
+++ b/Content.Shared/FingerprintReader/FingerprintReaderComponent.cs
@@ -20,16 +20,4 @@ public sealed partial class FingerprintReaderComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool IgnoreGloves;
-
-    /// <summary>
-    /// The popup to show when access is denied due to fingerprint mismatch.
-    /// </summary>
-    [DataField]
-    public LocId? FailPopup;
-
-    /// <summary>
-    /// The popup to show when access is denied due to wearing gloves.
-    /// </summary>
-    [DataField]
-    public LocId? FailGlovesPopup;
 }
diff --git a/Content.Shared/FingerprintReader/FingerprintReaderSystem.cs b/Content.Shared/FingerprintReader/FingerprintReaderSystem.cs
index aa7d190c34..73b06cac9b 100644
--- a/Content.Shared/FingerprintReader/FingerprintReaderSystem.cs
+++ b/Content.Shared/FingerprintReader/FingerprintReaderSystem.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Forensics.Components;
 using Content.Shared.Inventory;
+using Content.Shared.Lock;
 using Content.Shared.Popups;
 using JetBrains.Annotations;
 
@@ -12,15 +13,45 @@ public sealed class FingerprintReaderSystem : EntitySystem
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FingerprintReaderComponent, FindAvailableLocksEvent>(OnFindAvailableLocks);
+        SubscribeLocalEvent<FingerprintReaderComponent, CheckUserHasLockAccessEvent>(OnCheckLockAccess);
+    }
+
+    private void OnFindAvailableLocks(Entity<FingerprintReaderComponent> ent, ref FindAvailableLocksEvent args)
+    {
+        args.FoundReaders |= LockTypes.Fingerprint;
+    }
+
+    private void OnCheckLockAccess(Entity<FingerprintReaderComponent> ent, ref CheckUserHasLockAccessEvent args)
+    {
+        // Are we looking for a fingerprint lock?
+        if (!args.FoundReaders.HasFlag(LockTypes.Fingerprint))
+            return;
+
+        // If the user has access to this lock, we pass it into the event.
+        if (IsAllowed(ent.Owner, args.User, out var denyReason))
+            args.HasAccess |= LockTypes.Fingerprint;
+        else
+            args.DenyReason = denyReason;
+    }
+
     /// <summary>
     /// Checks if the given user has fingerprint access to the target entity.
     /// </summary>
     /// <param name="target">The target entity.</param>
     /// <param name="user">User trying to gain access.</param>
+    /// <param name="showPopup">Whether to display a popup with the reason you are not allowed to access this.</param>
+    /// <param name="denyReason">The reason why access was denied.</param>
     /// <returns>True if access was granted, otherwise false.</returns>
+    // TODO: Remove showPopup, just keeping it here for backwards compatibility while I refactor mail
     [PublicAPI]
-    public bool IsAllowed(Entity<FingerprintReaderComponent?> target, EntityUid user, bool showPopup = true)
+    public bool IsAllowed(Entity<FingerprintReaderComponent?> target, EntityUid user, [NotNullWhen(false)] out string? denyReason, bool showPopup = true)
     {
+        denyReason = null;
         if (!Resolve(target, ref target.Comp, false))
             return true;
 
@@ -30,8 +61,11 @@ public sealed class FingerprintReaderSystem : EntitySystem
         // Check for gloves first
         if (!target.Comp.IgnoreGloves && TryGetBlockingGloves(user, out var gloves))
         {
-            if (target.Comp.FailGlovesPopup != null && showPopup)
-                _popup.PopupClient(Loc.GetString(target.Comp.FailGlovesPopup, ("blocker", gloves)), target, user);
+            denyReason = Loc.GetString("fingerprint-reader-fail-gloves", ("blocker", gloves));
+
+            if (showPopup)
+                _popup.PopupClient(denyReason, target, user);
+
             return false;
         }
 
@@ -39,8 +73,10 @@ public sealed class FingerprintReaderSystem : EntitySystem
         if (!TryComp<FingerprintComponent>(user, out var fingerprint) || fingerprint.Fingerprint == null ||
             !target.Comp.AllowedFingerprints.Contains(fingerprint.Fingerprint))
         {
-            if (target.Comp.FailPopup != null && showPopup)
-                _popup.PopupClient(Loc.GetString(target.Comp.FailPopup), target, user);
+            denyReason = Loc.GetString("fingerprint-reader-fail");
+
+            if (showPopup)
+                _popup.PopupClient(denyReason, target, user);
 
             return false;
         }
diff --git a/Content.Shared/Flash/Components/FlashImmunityComponent.cs b/Content.Shared/Flash/Components/FlashImmunityComponent.cs
index 149c27c517..8015f31e70 100644
--- a/Content.Shared/Flash/Components/FlashImmunityComponent.cs
+++ b/Content.Shared/Flash/Components/FlashImmunityComponent.cs
@@ -15,4 +15,10 @@ public sealed partial class FlashImmunityComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool Enabled = true;
+
+    /// <summary>
+    /// Should the flash protection be shown when examining the entity?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ShowInExamine = true;
 }
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index 02513aa91b..dad8e6d156 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -206,7 +206,7 @@ public abstract class SharedFlashSystem : EntitySystem
         foreach (var entity in _entSet)
         {
             // TODO: Use RandomPredicted https://github.com/space-wizards/RobustToolbox/pull/5849
-            var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(entity).Id });
+            var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(entity).Id);
             var rand = new System.Random(seed);
             if (!rand.Prob(probability))
                 continue;
@@ -268,6 +268,7 @@ public abstract class SharedFlashSystem : EntitySystem
 
     private void OnExamine(Entity<FlashImmunityComponent> ent, ref ExaminedEvent args)
     {
-        args.PushMarkup(Loc.GetString("flash-protection"));
+        if (ent.Comp.ShowInExamine)
+            args.PushMarkup(Loc.GetString("flash-protection"));
     }
 }
diff --git a/Content.Shared/Fluids/Components/EvaporationComponent.cs b/Content.Shared/Fluids/Components/EvaporationComponent.cs
index 88cea52945..b3b3ac12d4 100644
--- a/Content.Shared/Fluids/Components/EvaporationComponent.cs
+++ b/Content.Shared/Fluids/Components/EvaporationComponent.cs
@@ -8,14 +8,15 @@ namespace Content.Shared.Fluids.Components;
 /// <summary>
 /// Added to puddles that contain water so it may evaporate over time.
 /// </summary>
-[NetworkedComponent, AutoGenerateComponentPause]
+[NetworkedComponent, AutoGenerateComponentPause, AutoGenerateComponentState]
 [RegisterComponent, Access(typeof(SharedPuddleSystem))]
 public sealed partial class EvaporationComponent : Component
 {
     /// <summary>
     /// The next time we remove the EvaporationSystem reagent amount from this entity.
     /// </summary>
-    [AutoPausedField, DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan NextTick;
 
     /// <summary>
diff --git a/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs b/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs
new file mode 100644
index 0000000000..b2bbcb2942
--- /dev/null
+++ b/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs
@@ -0,0 +1,170 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.DragDrop;
+using Content.Shared.FixedPoint;
+using Content.Shared.Item;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Fluids.EntitySystems;
+
+/// <summary>
+/// Handles drag and drop of various solutions.
+/// </summary>
+/// <remarks>
+/// The thing dragged always "gives" its reagents away for consistent UX.
+/// </remarks>
+/// <seealso cref="DumpableSolutionComponent" />
+/// <seealso cref="DrainableSolutionComponent" />
+/// <seealso cref="RefillableSolutionComponent" />
+public sealed class SolutionDumpingSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solContainer = default!;
+
+    private EntityQuery<ItemComponent> _itemQuery;
+    private EntityQuery<RefillableSolutionComponent> _refillableQuery;
+    private EntityQuery<DumpableSolutionComponent> _dumpQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DrainableSolutionComponent, CanDragEvent>(OnDrainableCanDrag);
+        SubscribeLocalEvent<DrainableSolutionComponent, CanDropDraggedEvent>(OnDrainableCanDragDropped);
+
+        //SubscribeLocalEvent<RefillableSolutionComponent, DragDropDraggedEvent>(OnRefillableDragged); For if you want to refill a container by dragging it into another one. Can't find a use for that currently.
+        SubscribeLocalEvent<DrainableSolutionComponent, DragDropDraggedEvent>(OnDrainableDragged);
+
+        SubscribeLocalEvent<DumpableSolutionComponent, DrainedTargetEvent>(OnDrainedToDumpableDragged);
+
+        // We use queries for these since CanDropDraggedEvent gets called pretty rapidly
+        _itemQuery = GetEntityQuery<ItemComponent>();
+        _refillableQuery = GetEntityQuery<RefillableSolutionComponent>();
+        _dumpQuery = GetEntityQuery<DumpableSolutionComponent>();
+    }
+
+    private void OnDrainableCanDrag(Entity<DrainableSolutionComponent> ent, ref CanDragEvent args)
+    {
+        if (_itemQuery.HasComp(ent))
+            args.Handled = true;
+    }
+
+    private void OnDrainableCanDragDropped(Entity<DrainableSolutionComponent> ent, ref CanDropDraggedEvent args)
+    {
+        // Easily drawn-from thing can be dragged onto easily refillable thing.
+        if (!_dumpQuery.HasComp(args.Target))
+            return;
+
+        args.CanDrop = true;
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// For when you are pouring something out from the container.
+    /// </summary>
+    private void OnDrainableDragged(Entity<DrainableSolutionComponent> sourceContainer, ref DragDropDraggedEvent args)
+    {
+        // Raising an event to be able to drain into various kind of fillable components.
+        var ev = new DrainedTargetEvent(args.User, sourceContainer, sourceContainer.Comp.Solution);
+        RaiseLocalEvent(args.Target, ref ev);
+    }
+
+    // Note: I feel that DumpableSolutionComponent is kind of redundant and only used to support unlimited containers,
+    // and even then that should probably be refactored out (see to-do below).
+    // It might be worth having the distinction if we want to separate "dump all" vs "pour some" functionalities,
+    // but then we probably want to do a proper pass on how RefillableSolutionComponent is handled.
+    private void OnDrainedToDumpableDragged(Entity<DumpableSolutionComponent> ent, ref DrainedTargetEvent args)
+    {
+        if (!_solContainer.TryGetDumpableSolution((ent, ent.Comp),
+                out var targetSolEnt,
+                out var targetSol))
+            return;
+
+        // Check openness, hands, source being empty, and target being full.
+        if (!DragInteractionChecks(args.User,
+                args.Source,
+                ent.Owner,
+                args.SourceSolution,
+                targetSol,
+                out var sourceEnt,
+                !ent.Comp.Unlimited))
+            return;
+
+        if (ent.Comp.Unlimited)
+        {
+            // Unlimited means we're dumping into an infinite buffer, so we
+            // have to be careful that we don't trigger any reactions. This
+            // means SolutionContainerSystem.AddSolution can't be used!
+            // TODO: This should be replaced with proper support for unlimited solutions, rather than cheating by bypassing UpdateChemicals using AddSolution. We can already avoid reactions using CanReact = false, this cheat just bypasses solution overflow.
+            targetSol.AddSolution(
+                _solContainer.SplitSolution(sourceEnt.Value, sourceEnt.Value.Comp.Solution.Volume),
+                _protoMan);
+            // Solution.AddSolution doesn't dirty targetSol for us
+            Dirty(targetSolEnt.Value);
+        }
+        else
+        {
+            _solContainer.TryAddSolution(targetSolEnt.Value,
+                _solContainer.SplitSolution(sourceEnt.Value, targetSol.AvailableVolume));
+        }
+
+        _audio.PlayPredicted(AbsorbentComponent.DefaultTransferSound, ent, args.User);
+    }
+
+    // Common checks between dragging handlers.
+    private bool DragInteractionChecks(EntityUid user,
+        EntityUid sourceContainer,
+        EntityUid targetContainer,
+        string sourceSolutionName,
+        Solution targetSol,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? sourceSolEnt,
+        bool checkAvailableVolume = true)
+    {
+        sourceSolEnt = null;
+        if (!_actionBlocker.CanComplexInteract(user))
+        {
+            _popup.PopupClient(Loc.GetString("mopping-system-no-hands"), user, user);
+            return false;
+        }
+
+        if (!_solContainer.TryGetSolution(sourceContainer, sourceSolutionName, out sourceSolEnt)
+            || sourceSolEnt.Value.Comp.Solution.Volume == FixedPoint2.Zero)
+        {
+            _popup.PopupClient(Loc.GetString("mopping-system-empty", ("used", sourceContainer)),
+                sourceContainer,
+                user);
+            return false;
+        }
+
+        if (checkAvailableVolume && targetSol.AvailableVolume == FixedPoint2.Zero)
+        {
+            _popup.PopupClient(Loc.GetString("mopping-system-full", ("used", targetContainer)), targetContainer, user);
+            return false;
+        }
+
+        // Both things need to be open. If the entity has nothing to close, it will count as "open".
+        return !_openable.IsClosed(sourceContainer, user, predicted: true)
+               && !_openable.IsClosed(targetContainer, user, predicted: true);
+    }
+}
+
+/// <summary>
+/// Raised directed on a target being drained into.
+/// </summary>
+[ByRefEvent]
+public record struct DrainedTargetEvent(EntityUid User, EntityUid Source, string SourceSolution)
+{
+    public readonly EntityUid User = User;
+    public readonly EntityUid Source = Source;
+    public readonly string SourceSolution = SourceSolution;
+    public bool Handled = false;
+}
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
index 8b937ed1a7..9854560204 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
@@ -1,15 +1,87 @@
+using System.Linq;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Content.Shared.Fluids.Components;
 
 namespace Content.Shared.Fluids;
 
 public abstract partial class SharedPuddleSystem
 {
+    private static readonly TimeSpan EvaporationCooldown = TimeSpan.FromSeconds(1);
+
+    private void OnEvaporationMapInit(Entity<EvaporationComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextTick = _timing.CurTime + EvaporationCooldown;
+        Dirty(ent);
+    }
+
+    private void UpdateEvaporation(EntityUid uid, Solution solution)
+    {
+        if (_evaporationQuery.HasComp(uid))
+            return;
+
+        if (solution.GetTotalPrototypeQuantity(GetEvaporatingReagents(solution)) > FixedPoint2.Zero)
+        {
+            var evaporation = AddComp<EvaporationComponent>(uid);
+            evaporation.NextTick = _timing.CurTime + EvaporationCooldown;
+            Dirty<EvaporationComponent>((uid, evaporation));
+            return;
+        }
+
+        RemComp<EvaporationComponent>(uid);
+    }
+
+    private void TickEvaporation()
+    {
+        var query = EntityQueryEnumerator<EvaporationComponent, PuddleComponent>();
+        var curTime = _timing.CurTime;
+        while (query.MoveNext(out var uid, out var evaporation, out var puddle))
+        {
+            if (evaporation.NextTick > curTime)
+                continue;
+
+            // Necessary to keep client and server in sync so they don't drift
+            evaporation.NextTick += EvaporationCooldown;
+            Dirty(uid, evaporation);
+
+            if (!_solutionContainerSystem.ResolveSolution(uid, puddle.SolutionName, ref puddle.Solution, out var puddleSolution))
+                continue;
+
+            // If we have multiple evaporating reagents in one puddle, just take the average evaporation speed and apply
+            // that to all of them.
+            var evaporationSpeeds = GetEvaporationSpeeds(puddleSolution);
+            if (evaporationSpeeds.Count == 0)
+                continue;
+
+            // Can't use .Average because FixedPoint2
+            var evaporationSpeed = evaporationSpeeds.Values.Sum() / evaporationSpeeds.Count;
+            var reagentProportions = evaporationSpeeds.ToDictionary(kv => kv.Key,
+                kv => puddleSolution.GetTotalPrototypeQuantity(kv.Key) / puddleSolution.Volume);
+
+            // Still have to iterate over one-by-one since the full solution could have non-evaporating solutions.
+            foreach (var (reagent, factor) in reagentProportions)
+            {
+                var reagentTick = evaporation.EvaporationAmount * EvaporationCooldown.TotalSeconds * evaporationSpeed * factor;
+                puddleSolution.SplitSolutionWithOnly(reagentTick, reagent);
+            }
+
+            // Despawn if we're done
+            if (puddleSolution.Volume == FixedPoint2.Zero)
+            {
+                // Spawn a *sparkle*
+                SpawnAttachedTo(evaporation.EvaporationEffect, Transform(uid).Coordinates);
+                PredictedQueueDel(uid);
+            }
+
+            _solutionContainerSystem.UpdateChemicals(puddle.Solution.Value);
+        }
+    }
+
+
     public string[] GetEvaporatingReagents(Solution solution)
     {
-        var evaporatingReagents = new List<string>();
-        foreach (ReagentPrototype solProto in solution.GetReagentPrototypes(_prototypeManager).Keys)
+        List<string> evaporatingReagents = [];
+        foreach (var solProto in solution.GetReagentPrototypes(_prototypeManager).Keys)
         {
             if (solProto.EvaporationSpeed > FixedPoint2.Zero)
                 evaporatingReagents.Add(solProto.ID);
@@ -19,8 +91,8 @@ public abstract partial class SharedPuddleSystem
 
     public string[] GetAbsorbentReagents(Solution solution)
     {
-        var absorbentReagents = new List<string>();
-        foreach (ReagentPrototype solProto in solution.GetReagentPrototypes(_prototypeManager).Keys)
+        List<string> absorbentReagents = [];
+        foreach (var solProto in solution.GetReagentPrototypes(_prototypeManager).Keys)
         {
             if (solProto.Absorbent)
                 absorbentReagents.Add(solProto.ID);
@@ -34,13 +106,13 @@ public abstract partial class SharedPuddleSystem
     }
 
     /// <summary>
-    /// Gets the evaporating speed of the reagents within a solution.
-    /// The speed at which a solution evaporates is the sum of the speed of all evaporating reagents in it.
+    /// Gets a mapping of evaporating speed of the reagents within a solution.
+    /// The speed at which a solution evaporates is the average of the speed of all evaporating reagents in it.
     /// </summary>
     public Dictionary<string, FixedPoint2> GetEvaporationSpeeds(Solution solution)
     {
-        var evaporatingSpeeds = new Dictionary<string, FixedPoint2>();
-        foreach (ReagentPrototype solProto in solution.GetReagentPrototypes(_prototypeManager).Keys)
+        Dictionary<string, FixedPoint2> evaporatingSpeeds = [];
+        foreach (var solProto in solution.GetReagentPrototypes(_prototypeManager).Keys)
         {
             if (solProto.EvaporationSpeed > FixedPoint2.Zero)
             {
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
index 7d65dd2424..05062aed2e 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
@@ -1,24 +1,34 @@
+using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
 using Content.Shared.Spillable;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee;
+using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Player;
 
 namespace Content.Shared.Fluids;
 
 public abstract partial class SharedPuddleSystem
 {
-    [Dependency] protected readonly OpenableSystem Openable = default!;
+    private static readonly FixedPoint2 MeleeHitTransferProportion = 0.25;
 
     protected virtual void InitializeSpillable()
     {
         SubscribeLocalEvent<SpillableComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<SpillableComponent, GetVerbsEvent<Verb>>(AddSpillVerb);
+        SubscribeLocalEvent<SpillableComponent, MeleeHitEvent>(SplashOnMeleeHit, after: [typeof(OpenableSystem)]);
+        SubscribeLocalEvent<SpillableComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
     }
 
     private void OnExamined(Entity<SpillableComponent> entity, ref ExaminedEvent args)
@@ -37,7 +47,10 @@ public abstract partial class SharedPuddleSystem
         if (!args.CanAccess || !args.CanInteract || args.Hands == null)
             return;
 
-        if (!_solutionContainerSystem.TryGetSolution(args.Target, entity.Comp.SolutionName, out var soln, out var solution))
+        if (!_solutionContainerSystem.TryGetSolution(args.Target,
+                entity.Comp.SolutionName,
+                out var soln,
+                out var solution))
             return;
 
         if (Openable.IsClosed(args.Target))
@@ -74,7 +87,12 @@ public abstract partial class SharedPuddleSystem
             var user = args.User;
             verb.Act = () =>
             {
-                _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, entity.Comp.SpillDelay ?? 0, new SpillDoAfterEvent(), entity.Owner, target: entity.Owner)
+                _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager,
+                    user,
+                    entity.Comp.SpillDelay ?? 0,
+                    new SpillDoAfterEvent(),
+                    entity.Owner,
+                    target: entity.Owner)
                 {
                     BreakOnDamage = true,
                     BreakOnMove = true,
@@ -86,4 +104,89 @@ public abstract partial class SharedPuddleSystem
         verb.DoContactInteraction = true;
         args.Verbs.Add(verb);
     }
+
+    private void SplashOnMeleeHit(Entity<SpillableComponent> entity, ref MeleeHitEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // When attacking someone reactive with a spillable entity,
+        // splash a little on them (touch react)
+        // If this also has solution transfer, then assume the transfer amount is how much we want to spill.
+        // Otherwise let's say they want to spill a quarter of its max volume.
+
+        if (!_solutionContainerSystem.TryGetDrainableSolution(entity.Owner, out var soln, out var solution))
+            return;
+
+        var hitCount = args.HitEntities.Count;
+
+        var totalSplit = FixedPoint2.Min(solution.MaxVolume * MeleeHitTransferProportion, solution.Volume);
+        if (TryComp<SolutionTransferComponent>(entity, out var transfer))
+            totalSplit = FixedPoint2.Min(transfer.TransferAmount, solution.Volume);
+
+        // a little lame, but reagent quantity is not very balanced and we don't want people
+        // spilling like 100u of reagent on someone at once!
+        totalSplit = FixedPoint2.Min(totalSplit, entity.Comp.MaxMeleeSpillAmount);
+
+        if (totalSplit == 0)
+            return;
+
+        // Optionally allow further melee handling occur
+        args.Handled = entity.Comp.PreventMelee;
+
+        // First update the hit count so anything that is not reactive wont count towards the total!
+        foreach (var hit in args.HitEntities)
+        {
+            if (!_reactiveQuery.HasComp(hit))
+                hitCount -= 1;
+        }
+
+        foreach (var hit in args.HitEntities)
+        {
+            if (!_reactiveQuery.HasComp(hit))
+                continue;
+
+            var splitSolution = _solutionContainerSystem.SplitSolution(soln.Value, totalSplit / hitCount);
+
+            AdminLogger.Add(LogType.MeleeHit,
+                $"{ToPrettyString(args.User):actor} "
+                + $"splashed {SharedSolutionContainerSystem.ToPrettyString(splitSolution):solution} "
+                + $"from {ToPrettyString(entity.Owner):entity} onto {ToPrettyString(hit):target}");
+
+            Reactive.DoEntityReaction(hit, splitSolution, ReactionMethod.Touch);
+
+            Popups.PopupClient(Loc.GetString("spill-melee-hit-attacker",
+                    ("amount", totalSplit / hitCount),
+                    ("spillable", entity.Owner),
+                    ("target", Identity.Entity(hit, EntityManager, args.User))),
+                hit,
+                args.User);
+            Popups.PopupEntity(
+                Loc.GetString("spill-melee-hit-others",
+                    ("attacker", Identity.Entity(args.User, EntityManager)),
+                    ("spillable", entity.Owner),
+                    ("target", Identity.Entity(hit, EntityManager))),
+                hit,
+                Filter.PvsExcept(args.User),
+                true,
+                PopupType.SmallCaution);
+        }
+    }
+
+    /// <summary>
+    /// Prevent Pacified entities from throwing items that can spill liquids.
+    /// </summary>
+    private void OnAttemptPacifiedThrow(Entity<SpillableComponent> ent, ref AttemptPacifiedThrowEvent args)
+    {
+        // Don’t care about closed containers.
+        if (Openable.IsClosed(ent))
+            return;
+
+        // Don’t care about empty containers.
+        if (!_solutionContainerSystem.TryGetSolution(ent.Owner, ent.Comp.SolutionName, out _, out var solution)
+            || solution.Volume <= 0)
+            return;
+
+        args.Cancel("pacified-cannot-throw-spill");
+    }
 }
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs
index 2d0fffa37b..a2ea262796 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.cs
@@ -1,26 +1,46 @@
 using System.Linq;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.DoAfter;
-using Content.Shared.DragDrop;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
+using Content.Shared.Friction;
+using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
+using Content.Shared.Slippery;
 using Content.Shared.StepTrigger.Components;
+using Content.Shared.StepTrigger.Systems;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Fluids;
 
 public abstract partial class SharedPuddleSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
+    [Dependency] protected readonly OpenableSystem Openable = default!;
+    [Dependency] protected readonly ReactiveSystem Reactive = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] protected readonly SharedPopupSystem Popups = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly SpeedModifierContactsSystem _speedModContacts = default!;
+    [Dependency] private readonly StepTriggerSystem _stepTrigger = default!;
+    [Dependency] private readonly TileFrictionController _tile = default!;
 
     private string[] _standoutReagents = [];
 
@@ -31,25 +51,53 @@ public abstract partial class SharedPuddleSystem : EntitySystem
 
     public const float MediumThreshold = 0.6f;
 
+    // Using local deletion queue instead of the standard queue so that we can easily "undelete" if a puddle
+    // loses & then gains reagents in a single tick.
+    private HashSet<EntityUid> _deletionQueue = [];
+
+    private EntityQuery<StepTriggerComponent> _stepTriggerQuery;
+    private EntityQuery<ReactiveComponent> _reactiveQuery;
+    private EntityQuery<EvaporationComponent> _evaporationQuery;
+
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<RefillableSolutionComponent, CanDragEvent>(OnRefillableCanDrag);
-        SubscribeLocalEvent<DumpableSolutionComponent, CanDropTargetEvent>(OnDumpCanDropTarget);
-        SubscribeLocalEvent<DrainableSolutionComponent, CanDropTargetEvent>(OnDrainCanDropTarget);
-        SubscribeLocalEvent<RefillableSolutionComponent, CanDropDraggedEvent>(OnRefillableCanDropDragged);
-
+        // Shouldn't need re-anchoring.
+        SubscribeLocalEvent<PuddleComponent, AnchorStateChangedEvent>(OnAnchorChanged);
         SubscribeLocalEvent<PuddleComponent, SolutionContainerChangedEvent>(OnSolutionUpdate);
         SubscribeLocalEvent<PuddleComponent, GetFootstepSoundEvent>(OnGetFootstepSound);
         SubscribeLocalEvent<PuddleComponent, ExaminedEvent>(HandlePuddleExamined);
         SubscribeLocalEvent<PuddleComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
 
+        SubscribeLocalEvent<EvaporationComponent, MapInitEvent>(OnEvaporationMapInit);
+
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
 
+        _stepTriggerQuery = GetEntityQuery<StepTriggerComponent>();
+        _reactiveQuery = GetEntityQuery<ReactiveComponent>();
+        _evaporationQuery = GetEntityQuery<EvaporationComponent>();
+
         CacheStandsout();
         InitializeSpillable();
     }
 
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        foreach (var ent in _deletionQueue)
+        {
+            // It's possible to have items in the queue that are already being deleted but threw a
+            // SolutionContainerChangedEvent as a part of their shutdown, like during a round restart.
+            if (!TerminatingOrDeleted(ent))
+                PredictedDel(ent);
+        }
+
+        _deletionQueue.Clear();
+
+        TickEvaporation();
+    }
+
     private void OnPrototypesReloaded(PrototypesReloadedEventArgs ev)
     {
         if (ev.WasModified<ReagentPrototype>())
@@ -64,44 +112,22 @@ public abstract partial class SharedPuddleSystem : EntitySystem
         _standoutReagents = [.. _prototypeManager.EnumeratePrototypes<ReagentPrototype>().Where(x => x.Standsout).Select(x => x.ID)];
     }
 
-    protected virtual void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContainerChangedEvent args)
+    private void OnSolutionUpdate(Entity<PuddleComponent> entity, ref SolutionContainerChangedEvent args)
     {
         if (args.SolutionId != entity.Comp.SolutionName)
             return;
 
-        UpdateAppearance((entity, entity.Comp));
-    }
-
-    private void OnRefillableCanDrag(Entity<RefillableSolutionComponent> entity, ref CanDragEvent args)
-    {
-        args.Handled = true;
-    }
-
-    private void OnDumpCanDropTarget(Entity<DumpableSolutionComponent> entity, ref CanDropTargetEvent args)
-    {
-        if (HasComp<DrainableSolutionComponent>(args.Dragged))
+        if (args.Solution.Volume <= 0)
         {
-            args.CanDrop = true;
-            args.Handled = true;
-        }
-    }
-
-    private void OnDrainCanDropTarget(Entity<DrainableSolutionComponent> entity, ref CanDropTargetEvent args)
-    {
-        if (HasComp<RefillableSolutionComponent>(args.Dragged))
-        {
-            args.CanDrop = true;
-            args.Handled = true;
-        }
-    }
-
-    private void OnRefillableCanDropDragged(Entity<RefillableSolutionComponent> entity, ref CanDropDraggedEvent args)
-    {
-        if (!HasComp<DrainableSolutionComponent>(args.Target) && !HasComp<DumpableSolutionComponent>(args.Target))
+            _deletionQueue.Add(entity);
             return;
+        }
 
-        args.CanDrop = true;
-        args.Handled = true;
+        _deletionQueue.Remove(entity);
+        UpdateSlip((entity, entity.Comp), args.Solution);
+        UpdateSlow(entity, args.Solution);
+        UpdateEvaporation(entity, args.Solution);
+        UpdateAppearance((entity, entity.Comp));
     }
 
     private void OnGetFootstepSound(Entity<PuddleComponent> entity, ref GetFootstepSoundEvent args)
@@ -122,12 +148,12 @@ public abstract partial class SharedPuddleSystem : EntitySystem
     {
         using (args.PushGroup(nameof(PuddleComponent)))
         {
-            if (TryComp<StepTriggerComponent>(entity, out var slippery) && slippery.Active)
+            if (_stepTriggerQuery.TryComp(entity, out var slippery) && slippery.Active)
             {
                 args.PushMarkup(Loc.GetString("puddle-component-examine-is-slippery-text"));
             }
 
-            if (HasComp<EvaporationComponent>(entity) &&
+            if (_evaporationQuery.HasComp(entity) &&
                 _solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.SolutionName,
                     ref entity.Comp.Solution, out var solution))
             {
@@ -143,6 +169,12 @@ public abstract partial class SharedPuddleSystem : EntitySystem
         }
     }
 
+    private void OnAnchorChanged(Entity<PuddleComponent> entity, ref AnchorStateChangedEvent args)
+    {
+        if (!args.Anchored)
+            PredictedQueueDel(entity.Owner);
+    }
+
     // Workaround for https://github.com/space-wizards/space-station-14/pull/35314
     private void OnEntRemoved(Entity<PuddleComponent> ent, ref EntRemovedFromContainerMessage args)
     {
@@ -191,6 +223,122 @@ public abstract partial class SharedPuddleSystem : EntitySystem
         _appearance.SetData(ent, PuddleVisuals.SolutionColor, color, appearance);
     }
 
+    private void UpdateSlip(Entity<PuddleComponent> entity, Solution solution)
+    {
+        if (!_stepTriggerQuery.TryComp(entity, out var comp))
+            return;
+
+        // Ensure we actually have the component
+        EnsureComp<TileFrictionModifierComponent>(entity);
+        EnsureComp<SlipperyComponent>(entity, out var slipComp);
+
+        // This is the base amount of reagent needed before a puddle can be considered slippery. Is defined based on
+        // the sprite threshold for a puddle larger than 5 pixels.
+        var smallPuddleThreshold = FixedPoint2.New(entity.Comp.OverflowVolume.Float() * LowThreshold);
+
+        // Stores how many units of slippery reagents a puddle has
+        var slipperyUnits = FixedPoint2.Zero;
+        // Stores how many units of super slippery reagents a puddle has
+        var superSlipperyUnits = FixedPoint2.Zero;
+
+        // These three values will be averaged later and all start at zero so the calculations work
+        // A cumulative weighted amount of minimum speed to slip values
+        var puddleFriction = FixedPoint2.Zero;
+        // A cumulative weighted amount of minimum speed to slip values
+        var slipStepTrigger = FixedPoint2.Zero;
+        // A cumulative weighted amount of launch multipliers from slippery reagents
+        var launchMult = FixedPoint2.Zero;
+        // A cumulative weighted amount of stun times from slippery reagents
+        var stunTimer = TimeSpan.Zero;
+        // A cumulative weighted amount of knockdown times from slippery reagents
+        var knockdownTimer = TimeSpan.Zero;
+
+        // Check if the puddle is big enough to slip in to avoid doing unnecessary logic
+        if (solution.Volume <= smallPuddleThreshold)
+        {
+            _stepTrigger.SetActive(entity, false, comp);
+            _tile.SetModifier(entity, 1f);
+            slipComp.SlipData.SlipFriction = 1f;
+            slipComp.AffectsSliding = false;
+            Dirty(entity, slipComp);
+            return;
+        }
+
+        slipComp.AffectsSliding = true;
+
+        foreach (var (reagent, quantity) in solution.Contents)
+        {
+            var reagentProto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
+
+            // Calculate the minimum speed needed to slip in the puddle. Average the overall slip thresholds for all reagents
+            var deltaSlipTrigger = reagentProto.SlipData?.RequiredSlipSpeed ?? entity.Comp.DefaultSlippery;
+            slipStepTrigger += quantity * deltaSlipTrigger;
+
+            // Aggregate Friction based on quantity
+            puddleFriction += reagentProto.Friction * quantity;
+
+            if (reagentProto.SlipData == null)
+                continue;
+
+            slipperyUnits += quantity;
+            // Aggregate launch speed based on quantity
+            launchMult += reagentProto.SlipData.LaunchForwardsMultiplier * quantity;
+            // Aggregate stun times based on quantity
+            stunTimer += reagentProto.SlipData.StunTime * (float)quantity;
+            knockdownTimer += reagentProto.SlipData.KnockdownTime * (float)quantity;
+
+            if (reagentProto.SlipData.SuperSlippery)
+                superSlipperyUnits += quantity;
+        }
+
+        // Turn on the step trigger if it's slippery
+        _stepTrigger.SetActive(entity, slipperyUnits > smallPuddleThreshold, comp);
+
+        // This is based of the total volume and not just the slippery volume because there is a default
+        // slippery for all reagents even if they aren't technically slippery.
+        slipComp.SlipData.RequiredSlipSpeed = (float)(slipStepTrigger / solution.Volume);
+        _stepTrigger.SetRequiredTriggerSpeed(entity, slipComp.SlipData.RequiredSlipSpeed);
+
+        // Divide these both by only total amount of slippery reagents.
+        // A puddle with 10 units of lube vs a puddle with 10 of lube and 20 catchup should stun and launch forward the same amount.
+        if (slipperyUnits > 0)
+        {
+            slipComp.SlipData.LaunchForwardsMultiplier = (float)(launchMult/slipperyUnits);
+            slipComp.SlipData.StunTime = (stunTimer/(float)slipperyUnits);
+            slipComp.SlipData.KnockdownTime = (knockdownTimer/(float)slipperyUnits);
+        }
+
+        // Only make it super slippery if there is enough super slippery units for its own puddle
+        slipComp.SlipData.SuperSlippery = superSlipperyUnits >= smallPuddleThreshold;
+
+        // Lower tile friction based on how slippery it is, lets items slide across a puddle of lube
+        slipComp.SlipData.SlipFriction = (float)(puddleFriction/solution.Volume);
+        _tile.SetModifier(entity, slipComp.SlipData.SlipFriction);
+
+        Dirty(entity, slipComp);
+    }
+
+    private void UpdateSlow(EntityUid uid, Solution solution)
+    {
+        var maxViscosity = 0f;
+        foreach (var (reagent, _) in solution.Contents)
+        {
+            var reagentProto = _prototypeManager.Index<ReagentPrototype>(reagent.Prototype);
+            maxViscosity = Math.Max(maxViscosity, reagentProto.Viscosity);
+        }
+
+        if (maxViscosity > 0)
+        {
+            var comp = EnsureComp<SpeedModifierContactsComponent>(uid);
+            var speed = 1 - maxViscosity;
+            _speedModContacts.ChangeSpeedModifiers(uid, speed, comp);
+        }
+        else
+        {
+            RemComp<SpeedModifierContactsComponent>(uid);
+        }
+    }
+
     public void DoTileReactions(TileRef tileRef, Solution solution)
     {
         for (var i = solution.Contents.Count - 1; i >= 0; i--)
@@ -213,11 +361,11 @@ public abstract partial class SharedPuddleSystem : EntitySystem
     // replicate those, and I am not enough of a wizard to attempt implementing that.
 
     /// <summary>
-    ///     First splashes reagent on reactive entities near the spilling entity, then spills the rest regularly to a
-    ///     puddle. This is intended for 'destructive' spills, like when entities are destroyed or thrown.
+    /// First splashes reagent on reactive entities near the spilling entity, then spills the rest regularly to a
+    /// puddle. This is intended for 'destructive' spills, like when entities are destroyed or thrown.
     /// </summary>
     /// <remarks>
-    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"> and return false.
+    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"/> and return false.
     /// </remarks>
     public abstract bool TrySplashSpillAt(EntityUid uid,
         EntityCoordinates coordinates,
@@ -227,29 +375,19 @@ public abstract partial class SharedPuddleSystem : EntitySystem
         EntityUid? user = null);
 
     /// <summary>
-    ///     Spills solution at the specified coordinates.
+    /// Spills solution at the specified coordinates.
     /// Will add to an existing puddle if present or create a new one if not.
     /// </summary>
     /// <remarks>
-    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"> and return false.
+    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"/> and return false.
     /// </remarks>
     public abstract bool TrySpillAt(EntityCoordinates coordinates, Solution solution, out EntityUid puddleUid, bool sound = true);
 
-    /// <summary>
-    /// <see cref="TrySpillAt(EntityCoordinates, Solution, out EntityUid, bool)"/>
-    /// </summary>
-    /// <remarks>
-    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"> and return false.
-    /// </remarks>
+    /// <inheritdoc cref="TrySpillAt(EntityCoordinates, Solution, out EntityUid, bool)"/>
     public abstract bool TrySpillAt(EntityUid uid, Solution solution, out EntityUid puddleUid, bool sound = true,
         TransformComponent? transformComponent = null);
 
-    /// <summary>
-    /// <see cref="TrySpillAt(EntityCoordinates, Solution, out EntityUid, bool)"/>
-    /// </summary>
-    /// <remarks>
-    /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"> and return false.
-    /// </remarks>
+    /// <inheritdoc cref="TrySpillAt(EntityCoordinates, Solution, out EntityUid, bool)"/>
     public abstract bool TrySpillAt(TileRef tileRef, Solution solution, out EntityUid puddleUid, bool sound = true,
         bool tileReact = true);
 
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
index 8431e27658..2060ee892f 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
@@ -419,6 +419,9 @@ public abstract partial class SharedHandsSystem
         return GetHeldItem(ent, handId) == null;
     }
 
+    /// <summary>
+    /// Counts the number of hands on this entity.
+    /// </summary>
     public int GetHandCount(Entity<HandsComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp, false))
@@ -427,6 +430,9 @@ public abstract partial class SharedHandsSystem
         return ent.Comp.Hands.Count;
     }
 
+    /// <summary>
+    /// Counts the number of hands that are empty.
+    /// </summary>
     public int CountFreeHands(Entity<HandsComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp, false))
@@ -442,11 +448,19 @@ public abstract partial class SharedHandsSystem
         return free;
     }
 
-    public int CountFreeableHands(Entity<HandsComponent> hands)
+    /// <summary>
+    /// Counts the number of hands that are empty or can be emptied by dropping an item.
+    /// Unremoveable items will cause a hand to not be freeable.
+    /// </summary>
+    /// <param name="except">The hand this entity is in will be ignored when counting.</param>
+    public int CountFreeableHands(Entity<HandsComponent> hands, EntityUid? except = null)
     {
         var freeable = 0;
         foreach (var name in hands.Comp.Hands.Keys)
         {
+            if (except != null && GetHeldItem(hands.AsNullable(), name) == except)
+                continue;
+
             if (HandIsEmpty(hands.AsNullable(), name) || CanDropHeld(hands, name))
                 freeable++;
         }
diff --git a/Content.Shared/IdentityManagement/Components/IdentityComponent.cs b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
index 86c07b307f..4646ccc835 100644
--- a/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
+++ b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
@@ -14,8 +14,12 @@ namespace Content.Shared.IdentityManagement.Components;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class IdentityComponent : Component
 {
+    /// <summary>
+    /// The slot which carries around the entity representing the carrier's
+    /// perceived identity. May be null if the component is not initialized.
+    /// </summary>
     [ViewVariables]
-    public ContainerSlot IdentityEntitySlot = default!;
+    public ContainerSlot? IdentityEntitySlot;
 }
 
 /// <summary>
@@ -32,7 +36,7 @@ public sealed class IdentityRepresentation
     public string? PresumedName;
     public string? PresumedJob;
 
-    public IdentityRepresentation(string trueName, Gender trueGender, string ageString, string? presumedName=null, string? presumedJob=null)
+    public IdentityRepresentation(string trueName, Gender trueGender, string ageString, string? presumedName = null, string? presumedJob = null)
     {
         TrueName = trueName;
         TrueGender = trueGender;
diff --git a/Content.Shared/IdentityManagement/Identity.cs b/Content.Shared/IdentityManagement/Identity.cs
index 836adfcdf8..ac71194279 100644
--- a/Content.Shared/IdentityManagement/Identity.cs
+++ b/Content.Shared/IdentityManagement/Identity.cs
@@ -13,7 +13,13 @@ public static class Identity
     /// <summary>
     ///     Returns the name that should be used for this entity for identity purposes.
     /// </summary>
-    public static string Name(EntityUid uid, IEntityManager ent, EntityUid? viewer=null)
+    /// <remarks>
+    /// This will return the true identity of the entity if called before the
+    /// identity component has been initialized — this may occur for example if
+    /// the client raises an event in response to an entity entering PVS for
+    /// the first time.
+    /// </remarks>
+    public static string Name(EntityUid uid, IEntityManager ent, EntityUid? viewer = null)
     {
         if (!uid.IsValid())
             return string.Empty;
@@ -27,7 +33,7 @@ public static class Identity
         if (!ent.TryGetComponent<IdentityComponent>(uid, out var identity))
             return uidName;
 
-        var ident = identity.IdentityEntitySlot.ContainedEntity;
+        var ident = identity.IdentityEntitySlot?.ContainedEntity;
         if (ident is null)
             return uidName;
 
@@ -52,6 +58,7 @@ public static class Identity
     /// <param name="viewer">
     ///     If this entity can see through identities, this method will always return the actual target entity.
     /// </param>
+    /// <inheritdoc cref="Name" path="remarks" />
     public static EntityUid Entity(EntityUid uid, IEntityManager ent, EntityUid? viewer = null)
     {
         if (!ent.TryGetComponent<IdentityComponent>(uid, out var identity))
@@ -60,7 +67,7 @@ public static class Identity
         if (viewer != null && CanSeeThroughIdentity(uid, viewer.Value, ent))
             return uid;
 
-        return identity.IdentityEntitySlot.ContainedEntity ?? uid;
+        return identity.IdentityEntitySlot?.ContainedEntity ?? uid;
     }
 
     public static bool CanSeeThroughIdentity(EntityUid uid, EntityUid viewer, IEntityManager ent)
diff --git a/Content.Shared/IdentityManagement/IdentitySystem.cs b/Content.Shared/IdentityManagement/IdentitySystem.cs
index 7c559df629..6b11085715 100644
--- a/Content.Shared/IdentityManagement/IdentitySystem.cs
+++ b/Content.Shared/IdentityManagement/IdentitySystem.cs
@@ -78,11 +78,17 @@ public sealed class IdentitySystem : EntitySystem
     // Creates an identity entity, and store it in the identity container
     private void OnMapInit(Entity<IdentityComponent> ent, ref MapInitEvent args)
     {
+        if (ent.Comp.IdentityEntitySlot is not { } slot)
+        {
+            Log.Error($"Uninitialized IdentityEntitySlot for {ToPrettyString(ent.Owner)}.");
+            return;
+        }
+
         var ident = Spawn(null, Transform(ent).Coordinates);
 
         _metaData.SetEntityName(ident, "identity");
         QueueIdentityUpdate(ent);
-        _container.Insert(ident, ent.Comp.IdentityEntitySlot);
+        _container.Insert(ident, slot);
     }
 
     private void OnComponentInit(Entity<IdentityComponent> ent, ref ComponentInit args)
@@ -132,7 +138,7 @@ public sealed class IdentitySystem : EntitySystem
     /// </summary>
     private void UpdateIdentityInfo(Entity<IdentityComponent> ent)
     {
-        if (ent.Comp.IdentityEntitySlot.ContainedEntity is not { } ident)
+        if (ent.Comp.IdentityEntitySlot?.ContainedEntity is not { } ident)
             return;
 
         var representation = GetIdentityRepresentation(ent.Owner);
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index ae038b63f3..cb5ef864b9 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -16,7 +16,6 @@ using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Inventory;
@@ -31,7 +30,6 @@ public abstract partial class InventorySystem
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly SharedStrippableSystem _strippable = default!;
@@ -468,7 +466,7 @@ public abstract partial class InventorySystem
         // we check if any items were dropped, and make a popup if they were.
         // the reason we check for > 1 is because the first item is always the one we are trying to unequip,
         // whereas we only want to notify for extra dropped items.
-        if (!silent && _gameTiming.IsFirstTimePredicted && firstRun && itemsDropped > 1)
+        if (!silent && firstRun && itemsDropped > 1)
             _popup.PopupClient(Loc.GetString("inventory-component-dropped-from-unequip", ("items", itemsDropped - 1)), target, target);
 
         // TODO: Inventory needs a hot cleanup hoo boy
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index a9f5201401..fb1b639ac0 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -9,7 +9,6 @@ using Content.Shared.Contraband;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Events;
 using Content.Shared.Electrocution;
-using Content.Shared.Emoting;
 using Content.Shared.Explosion;
 using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.Flash;
diff --git a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
index bae411f356..530dcb437b 100644
--- a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
+++ b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
@@ -292,7 +292,7 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem
 
         // Get a random entry to spawn.
         // TODO: Replace with RandomPredicted once the engine PR is merged
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_gameTiming.CurTick.Value, GetNetEntity(ent).Id });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_gameTiming.CurTick.Value, GetNetEntity(ent).Id);
         var rand = new System.Random(seed);
 
         var index = rand.Next(butcherable.SpawnedEntities.Count);
diff --git a/Content.Shared/Light/Components/ImplicitRoofComponent.cs b/Content.Shared/Light/Components/ImplicitRoofComponent.cs
index b457bac3e4..08afe883b7 100644
--- a/Content.Shared/Light/Components/ImplicitRoofComponent.cs
+++ b/Content.Shared/Light/Components/ImplicitRoofComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Light.Components;
 
 /// <summary>
-/// Assumes the entire attached grid is rooved.
+/// Assumes the entire attached grid is rooved. This component will get removed if the grid has RoofComponent.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ImplicitRoofComponent : Component
diff --git a/Content.Shared/Light/Components/RoofComponent.cs b/Content.Shared/Light/Components/RoofComponent.cs
index 47de333af0..4457a952eb 100644
--- a/Content.Shared/Light/Components/RoofComponent.cs
+++ b/Content.Shared/Light/Components/RoofComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Light.Components;
 
 /// <summary>
-/// Will draw shadows over tiles flagged as roof tiles on the attached grid.
+/// Will draw shadows over tiles flagged as roof tiles on the attached grid. ImplicitRoofComponent will get removed if the grid has this component.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class RoofComponent : Component
diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs
index 1e5f0fdd50..822ec78f9b 100644
--- a/Content.Shared/Lock/LockComponent.cs
+++ b/Content.Shared/Lock/LockComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Access.Components;
 using Content.Shared.DoAfter;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
@@ -47,11 +46,37 @@ public sealed partial class LockComponent : Component
     public bool UnlockOnClick = true;
 
     /// <summary>
-    /// Whether the lock requires access validation through <see cref="AccessReaderComponent"/>
+    /// Whether or not the lock is locked when used it hand.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool LockInHand;
+
+    /// <summary>
+    /// Whether or not the lock is unlocked when used in hand.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool UnlockInHand;
+
+    /// <summary>
+    /// Whether access requirements should be checked for this lock.
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool UseAccess = true;
 
+    /// <summary>
+    /// What readers should be checked to determine if an entity has access.
+    /// If null, all possible readers are checked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LockTypes? CheckedLocks;
+
+    /// <summary>
+    /// Whether any reader needs to be accessed to operate this lock.
+    /// By default, all readers need to be able to be accessed.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CheckForAnyReaders;
+
     /// <summary>
     /// The sound played when unlocked.
     /// </summary>
@@ -96,6 +121,12 @@ public sealed partial class LockComponent : Component
     [DataField]
     [AutoNetworkedField]
     public TimeSpan UnlockTime;
+
+    /// <summary>
+    /// Whether this lock can be locked again after being unlocked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool AllowRepeatedLocking = true;
 }
 
 /// <summary>
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 2abb45d878..95a681dc38 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -1,5 +1,3 @@
-using Content.Shared.Access.Components;
-using Content.Shared.Access.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Construction.Components;
 using Content.Shared.DoAfter;
@@ -7,6 +5,7 @@ using Content.Shared.Emag.Systems;
 using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
@@ -16,6 +15,7 @@ using Content.Shared.Wires;
 using Content.Shared.Item.ItemToggle.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Lock;
@@ -26,7 +26,6 @@ namespace Content.Shared.Lock;
 [UsedImplicitly]
 public sealed class LockSystem : EntitySystem
 {
-    [Dependency] private readonly AccessReaderSystem _accessReader = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
@@ -35,6 +34,8 @@ public sealed class LockSystem : EntitySystem
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
 
+    private readonly LocId _defaultDenyReason = "lock-comp-has-user-access-fail";
+
     /// <inheritdoc />
     public override void Initialize()
     {
@@ -42,6 +43,7 @@ public sealed class LockSystem : EntitySystem
 
         SubscribeLocalEvent<LockComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<LockComponent, ActivateInWorldEvent>(OnActivated, before: [typeof(ActivatableUISystem)]);
+        SubscribeLocalEvent<LockComponent, UseInHandEvent>(OnUseInHand, before: [typeof(ActivatableUISystem)]);
         SubscribeLocalEvent<LockComponent, StorageOpenAttemptEvent>(OnStorageOpenAttempt);
         SubscribeLocalEvent<LockComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<LockComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleLockVerb);
@@ -84,6 +86,23 @@ public sealed class LockSystem : EntitySystem
         }
     }
 
+    private void OnUseInHand(EntityUid uid, LockComponent lockComp, UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (lockComp.Locked && lockComp.UnlockInHand)
+        {
+            args.Handled = true;
+            TryUnlock(uid, args.User, lockComp);
+        }
+        else if (!lockComp.Locked && lockComp.LockInHand)
+        {
+            args.Handled = true;
+            TryLock(uid, args.User, lockComp);
+        }
+    }
+
     private void OnStorageOpenAttempt(EntityUid uid, LockComponent component, ref StorageOpenAttemptEvent args)
     {
         if (!component.Locked)
@@ -125,7 +144,7 @@ public sealed class LockSystem : EntitySystem
         if (!CanToggleLock(uid, user, quiet: false))
             return false;
 
-        if (lockComp.UseAccess && !HasUserAccess(uid, user, quiet: false))
+        if (lockComp.UseAccess && !HasUserAccess(uid, user, false))
             return false;
 
         if (!skipDoAfter && lockComp.LockTime != TimeSpan.Zero)
@@ -224,7 +243,7 @@ public sealed class LockSystem : EntitySystem
         if (!CanToggleLock(uid, user, quiet: false))
             return false;
 
-        if (lockComp.UseAccess && !HasUserAccess(uid, user, quiet: false))
+        if (lockComp.UseAccess && !HasUserAccess(uid, user, false))
             return false;
 
         if (!skipDoAfter && lockComp.UnlockTime != TimeSpan.Zero)
@@ -273,33 +292,69 @@ public sealed class LockSystem : EntitySystem
     /// Raises an event for other components to check whether or not
     /// the entity can be locked in its current state.
     /// </summary>
-    public bool CanToggleLock(EntityUid uid, EntityUid user, bool quiet = true)
+    public bool CanToggleLock(Entity<LockComponent?> ent, EntityUid user, bool quiet = true)
     {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
         if (!_actionBlocker.CanComplexInteract(user))
             return false;
 
+        if (!ent.Comp.Locked && !ent.Comp.AllowRepeatedLocking)
+            return false;
+
         var ev = new LockToggleAttemptEvent(user, quiet);
-        RaiseLocalEvent(uid, ref ev, true);
+        RaiseLocalEvent(ent, ref ev, true);
         if (ev.Cancelled)
             return false;
 
-        var userEv = new UserLockToggleAttemptEvent(uid, quiet);
+        var userEv = new UserLockToggleAttemptEvent(ent, quiet);
         RaiseLocalEvent(user, ref userEv, true);
         return !userEv.Cancelled;
     }
 
-    // TODO: this should be a helper on AccessReaderSystem since so many systems copy paste it
-    private bool HasUserAccess(EntityUid uid, EntityUid user, AccessReaderComponent? reader = null, bool quiet = true)
+    /// <summary>
+    /// Checks whether the user has access to locks on an entity.
+    /// </summary>
+    /// <param name="ent">The entity we check for locks.</param>
+    /// <param name="user">The user we check for access.</param>
+    /// <param name="quiet">Whether to display a popup if user has no access.</param>
+    /// <returns>True if the user has access, otherwise False.</returns>
+    [PublicAPI]
+    public bool HasUserAccess(Entity<LockComponent?> ent, EntityUid user, bool quiet = true)
     {
-        // Not having an AccessComponent means you get free access. woo!
-        if (!Resolve(uid, ref reader, false))
+        // Entity literally has no lock. Congratulations.
+        if (!Resolve(ent, ref ent.Comp, false))
             return true;
 
-        if (_accessReader.IsAllowed(user, uid, reader))
+        var checkedReaders = LockTypes.None;
+        if (ent.Comp.CheckedLocks is null)
+        {
+            var lockEv = new FindAvailableLocksEvent(user);
+            RaiseLocalEvent(ent, ref lockEv);
+            checkedReaders = lockEv.FoundReaders;
+        }
+
+        // If no locks are found, you have access. Woo!
+        if (checkedReaders == LockTypes.None)
+            return true;
+
+        var accessEv = new CheckUserHasLockAccessEvent(user, checkedReaders);
+        RaiseLocalEvent(ent, ref accessEv);
+
+        // If we check for any, as long as user has access to any of the locks we grant access.
+        if (accessEv.HasAccess != LockTypes.None && ent.Comp.CheckForAnyReaders)
+            return true;
+
+        if (accessEv.HasAccess == checkedReaders)
             return true;
 
         if (!quiet)
-            _sharedPopupSystem.PopupClient(Loc.GetString("lock-comp-has-user-access-fail"), uid, user);
+        {
+            var denyReason = accessEv.DenyReason ?? Loc.GetString(_defaultDenyReason);
+            _sharedPopupSystem.PopupClient(denyReason, ent, user);
+        }
+
         return false;
     }
 
@@ -466,3 +521,35 @@ public sealed class LockSystem : EntitySystem
         }
     }
 }
+
+/// <summary>
+/// Raised on an entity to check whether it has any readers that can prevent it from being opened.
+/// </summary>
+/// <param name="User">The person attempting to open the entity.</param>
+/// <param name="FoundReaders">What readers were found. This should not be set when raising the event.</param>
+[ByRefEvent]
+public record struct FindAvailableLocksEvent(EntityUid User, LockTypes FoundReaders = LockTypes.None);
+
+/// <summary>
+/// Raised on an entity to check if the user has access (ID, Fingerprint, etc) to said entity.
+/// </summary>
+/// <param name="User">The user we are checking.</param>
+/// <param name="FoundReaders">What readers we are attempting to verify access for.</param>
+/// <param name="HasAccess">Which readers the user has access to. This should not be set when raising the event.</param>
+[ByRefEvent]
+public record struct CheckUserHasLockAccessEvent(EntityUid User, LockTypes FoundReaders = LockTypes.None, LockTypes HasAccess = LockTypes.None, string? DenyReason = null);
+
+/// <summary>
+/// Enum of all readers a lock can be "locked" by.
+/// Used to determine what you need in order to access the lock.
+/// For example, an entity with <see cref="AccessReaderComponent"/> will have the Access type, which is gathered by an event and handled by the respective system.
+/// </summary>
+[Flags]
+[Serializable, NetSerializable]
+public enum LockTypes : byte
+{
+    None, // Default state, means the lock is not restricted.
+    Access, // Means there is an AccessReader currently present.
+    Fingerprint, // Means there is a FingerprintReader currently present.
+    All = Access | Fingerprint,
+}
diff --git a/Content.Shared/Medical/Healing/HealingSystem.cs b/Content.Shared/Medical/Healing/HealingSystem.cs
index b737914dcb..2ac2c50871 100644
--- a/Content.Shared/Medical/Healing/HealingSystem.cs
+++ b/Content.Shared/Medical/Healing/HealingSystem.cs
@@ -87,9 +87,9 @@ public sealed class HealingSystem : EntitySystem
         var dontRepeat = false;
         if (TryComp<StackComponent>(args.Used.Value, out var stackComp))
         {
-            _stacks.Use(args.Used.Value, 1, stackComp);
+            _stacks.ReduceCount((args.Used.Value, stackComp), 1);
 
-            if (_stacks.GetCount(args.Used.Value, stackComp) <= 0)
+            if (_stacks.GetCount((args.Used.Value, stackComp)) <= 0)
                 dontRepeat = true;
         }
         else
diff --git a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
index 99ac22e330..a56ff9e683 100644
--- a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
+++ b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
@@ -19,6 +19,7 @@ namespace Content.Shared.Movement.Systems;
 /// </remarks>
 public sealed class MovementModStatusSystem : EntitySystem
 {
+    public static readonly EntProtoId ReagentSpeed = "ReagentSpeedStatusEffect";
     public static readonly EntProtoId VomitingSlowdown = "VomitingSlowdownStatusEffect";
     public static readonly EntProtoId TaserSlowdown = "TaserSlowdownStatusEffect";
     public static readonly EntProtoId FlashSlowdown = "FlashSlowdownStatusEffect";
diff --git a/Content.Shared/Ninja/Components/BombingTargetComponent.cs b/Content.Shared/Ninja/Components/BombingTargetComponent.cs
deleted file mode 100644
index c429eb6880..0000000000
--- a/Content.Shared/Ninja/Components/BombingTargetComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Ninja.Components;
-
-/// <summary>
-/// Makes this warp point a valid bombing target for ninja's spider charge.
-/// </summary>
-[RegisterComponent]
-public sealed partial class BombingTargetComponent : Component;
diff --git a/Content.Shared/Nutrition/Components/FoodComponent.cs b/Content.Shared/Nutrition/Components/FoodComponent.cs
deleted file mode 100644
index 5f1ec41717..0000000000
--- a/Content.Shared/Nutrition/Components/FoodComponent.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using Content.Shared.Body.Components;
-using Content.Shared.FixedPoint;
-using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Nutrition.Components;
-[Obsolete("Migration to Content.Shared.Nutrition.Components.EdibleComponent is required")]
-[RegisterComponent, Access(typeof(FoodSystem), typeof(FoodSequenceSystem))]
-public sealed partial class FoodComponent : Component
-{
-    [DataField]
-    public string Solution = "food";
-
-    [DataField]
-    public SoundSpecifier UseSound = new SoundCollectionSpecifier("eating");
-
-    [DataField]
-    public List<EntProtoId> Trash = new();
-
-    [DataField]
-    public FixedPoint2? TransferAmount = FixedPoint2.New(5);
-
-    /// <summary>
-    /// Acceptable utensil to use
-    /// </summary>
-    [DataField]
-    public UtensilType Utensil = UtensilType.Fork; //There are more "solid" than "liquid" food
-
-    /// <summary>
-    /// Is utensil required to eat this food
-    /// </summary>
-    [DataField]
-    public bool UtensilRequired;
-
-    /// <summary>
-    ///     If this is set to true, food can only be eaten if you have a stomach with a
-    ///     <see cref="StomachComponent.SpecialDigestible"/> that includes this entity in its whitelist,
-    ///     rather than just being digestible by anything that can eat food.
-    ///     Whitelist the food component to allow eating of normal food.
-    /// </summary>
-    [DataField]
-    public bool RequiresSpecialDigestion;
-
-    /// <summary>
-    ///     Stomachs required to digest this entity.
-    ///     Used to simulate 'ruminant' digestive systems (which can digest grass)
-    /// </summary>
-    [DataField]
-    public int RequiredStomachs = 1;
-
-    /// <summary>
-    /// The localization identifier for the eat message. Needs a "food" entity argument passed to it.
-    /// </summary>
-    [DataField]
-    public LocId EatMessage = "edible-nom";
-
-    /// <summary>
-    /// How long it takes to eat the food personally.
-    /// </summary>
-    [DataField]
-    public float Delay = 1;
-
-    /// <summary>
-    ///     This is how many seconds it takes to force feed someone this food.
-    ///     Should probably be smaller for small items like pills.
-    /// </summary>
-    [DataField]
-    public float ForceFeedDelay = 3;
-
-    /// <summary>
-    /// For mobs that are food, requires killing them before eating.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public bool RequireDead = true;
-}
diff --git a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs b/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
deleted file mode 100644
index a599a1e74e..0000000000
--- a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-using Content.Shared.Administration.Logs;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Database;
-using Content.Shared.Forensics;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Inventory;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Popups;
-using Content.Shared.Verbs;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-
-namespace Content.Shared.Nutrition.EntitySystems;
-
-/// <summary>
-/// Handles feeding attempts both on yourself and on the target.
-/// </summary>
-[Obsolete("Migration to Content.Shared.Nutrition.EntitySystems.IngestionSystem is required")]
-public sealed class FoodSystem : EntitySystem
-{
-    [Dependency] private readonly FlavorProfileSystem _flavorProfile = default!;
-    [Dependency] private readonly IngestionSystem _ingestion = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-
-    public const float MaxFeedDistance = 1.0f;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<FoodComponent, UseInHandEvent>(OnUseFoodInHand, after: new[] { typeof(OpenableSystem), typeof(InventorySystem) });
-        SubscribeLocalEvent<FoodComponent, AfterInteractEvent>(OnFeedFood);
-
-        SubscribeLocalEvent<FoodComponent, GetVerbsEvent<AlternativeVerb>>(AddEatVerb);
-
-        SubscribeLocalEvent<FoodComponent, BeforeIngestedEvent>(OnBeforeFoodEaten);
-        SubscribeLocalEvent<FoodComponent, IngestedEvent>(OnFoodEaten);
-        SubscribeLocalEvent<FoodComponent, FullyEatenEvent>(OnFoodFullyEaten);
-
-        SubscribeLocalEvent<FoodComponent, GetUtensilsEvent>(OnGetUtensils);
-
-        SubscribeLocalEvent<FoodComponent, IsDigestibleEvent>(OnIsFoodDigestible);
-
-        SubscribeLocalEvent<FoodComponent, EdibleEvent>(OnFood);
-
-        SubscribeLocalEvent<FoodComponent, GetEdibleTypeEvent>(OnGetEdibleType);
-
-        SubscribeLocalEvent<FoodComponent, BeforeFullySlicedEvent>(OnBeforeFullySliced);
-    }
-
-    /// <summary>
-    /// Eat or drink an item
-    /// </summary>
-    private void OnUseFoodInHand(Entity<FoodComponent> entity, ref UseInHandEvent ev)
-    {
-        if (ev.Handled)
-            return;
-
-        ev.Handled = _ingestion.TryIngest(ev.User, ev.User, entity);
-    }
-
-    /// <summary>
-    /// Feed someone else
-    /// </summary>
-    private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent args)
-    {
-        if (args.Handled || args.Target == null || !args.CanReach)
-            return;
-
-        args.Handled = _ingestion.TryIngest(args.User, args.Target.Value, entity);
-    }
-
-    private void AddEatVerb(Entity<FoodComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        var user = args.User;
-
-        if (entity.Owner == user || !args.CanInteract || !args.CanAccess)
-            return;
-
-        if (!_ingestion.TryGetIngestionVerb(user, entity, IngestionSystem.Food, out var verb))
-            return;
-
-        args.Verbs.Add(verb);
-    }
-
-    private void OnBeforeFoodEaten(Entity<FoodComponent> food, ref BeforeIngestedEvent args)
-    {
-        if (args.Cancelled || args.Solution is not { } solution)
-            return;
-
-        // Set it to transfer amount if it exists, otherwise eat the whole volume if possible.
-        args.Transfer = food.Comp.TransferAmount ?? solution.Volume;
-    }
-
-    private void OnFoodEaten(Entity<FoodComponent> entity, ref IngestedEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = true;
-
-        _audio.PlayPredicted(entity.Comp.UseSound, args.Target, args.User, AudioParams.Default.WithVolume(-1f).WithVariation(0.20f));
-
-        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(entity.Owner, args.Target, args.Split);
-
-        if (args.ForceFed)
-        {
-            var targetName = Identity.Entity(args.Target, EntityManager);
-            var userName = Identity.Entity(args.User, EntityManager);
-            _popup.PopupEntity(Loc.GetString("edible-force-feed-success", ("user", userName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Food)), ("flavors", flavors)), entity, entity);
-
-            _popup.PopupClient(Loc.GetString("edible-force-feed-success-user", ("target", targetName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Food))), args.User, args.User);
-
-            // log successful forced feeding
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):user} forced {ToPrettyString(args.User):target} to eat {ToPrettyString(entity):food}");
-        }
-        else
-        {
-            _popup.PopupClient(Loc.GetString(entity.Comp.EatMessage, ("food", entity.Owner), ("flavors", flavors)), args.User, args.User);
-
-            // log successful voluntary eating
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity):food}");
-        }
-
-        // BREAK OUR UTENSILS
-        if (_ingestion.TryGetUtensils(args.User, entity, out var utensils))
-        {
-            foreach (var utensil in utensils)
-            {
-                _ingestion.TryBreak(utensil, args.User);
-            }
-        }
-
-        if (_ingestion.GetUsesRemaining(entity, entity.Comp.Solution, args.Split.Volume) > 0)
-        {
-            // Leave some of the consumer's DNA on the consumed item...
-            var ev = new TransferDnaEvent
-            {
-                Donor = args.Target,
-                Recipient = entity,
-                CanDnaBeCleaned = false,
-            };
-            RaiseLocalEvent(args.Target, ref ev);
-
-            args.Repeat = !args.ForceFed;
-            return;
-        }
-
-        // Food is always destroyed...
-        args.Destroy = true;
-    }
-
-    private void OnFoodFullyEaten(Entity<FoodComponent> food, ref FullyEatenEvent args)
-    {
-        if (food.Comp.Trash.Count == 0)
-            return;
-
-        var position = _transform.GetMapCoordinates(food);
-        var trashes = food.Comp.Trash;
-        var tryPickup = _hands.IsHolding(args.User, food, out _);
-
-        foreach (var trash in trashes)
-        {
-            var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
-
-            // If the user is holding the item
-            if (tryPickup)
-            {
-                // Put the trash in the user's hand
-                _hands.TryPickupAnyHand(args.User, spawnedTrash);
-            }
-        }
-    }
-
-    private void OnFood(Entity<FoodComponent> food, ref EdibleEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (args.Cancelled || args.Solution != null)
-            return;
-
-        if (food.Comp.UtensilRequired && !_ingestion.HasRequiredUtensils(args.User, food.Comp.Utensil))
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        // Check this last
-        _solutionContainer.TryGetSolution(food.Owner, food.Comp.Solution, out args.Solution);
-        args.Time += TimeSpan.FromSeconds(food.Comp.Delay);
-    }
-
-    private void OnGetUtensils(Entity<FoodComponent> entity, ref GetUtensilsEvent args)
-    {
-        if (entity.Comp.Utensil == UtensilType.None)
-            return;
-
-        if (entity.Comp.UtensilRequired)
-            args.AddRequiredTypes(entity.Comp.Utensil);
-        else
-            args.Types |= entity.Comp.Utensil;
-    }
-
-    // TODO: When DrinkComponent and FoodComponent are properly obseleted, make the IsDigestionBools in IngestionSystem private again.
-    private void OnIsFoodDigestible(Entity<FoodComponent> ent, ref IsDigestibleEvent args)
-    {
-        if (ent.Comp.RequireDead && _mobState.IsAlive(ent))
-            return;
-
-        args.AddDigestible(ent.Comp.RequiresSpecialDigestion);
-    }
-
-    private void OnGetEdibleType(Entity<FoodComponent> ent, ref GetEdibleTypeEvent args)
-    {
-        if (args.Type != null)
-            return;
-
-        args.SetPrototype(IngestionSystem.Food);
-    }
-
-    private void OnBeforeFullySliced(Entity<FoodComponent> food, ref BeforeFullySlicedEvent args)
-    {
-        if (food.Comp.Trash.Count == 0)
-            return;
-
-        var position = _transform.GetMapCoordinates(food);
-        var trashes = food.Comp.Trash;
-        var tryPickup = _hands.IsHolding(args.User, food, out _);
-
-        foreach (var trash in trashes)
-        {
-            var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
-
-            // If the user is holding the item
-            if (tryPickup)
-            {
-                // Put the trash in the user's hand
-                _hands.TryPickupAnyHand(args.User, spawnedTrash);
-            }
-        }
-    }
-}
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
index 990c8105c5..086349454c 100644
--- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
@@ -1,9 +1,8 @@
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.EntityEffects.Effects;
+using Content.Shared.EntityEffects.Effects.Body;
 using Content.Shared.FixedPoint;
 using Content.Shared.Inventory;
 using Content.Shared.Nutrition.Components;
@@ -228,7 +227,7 @@ public sealed partial class IngestionSystem
                     // ignores any effect conditions, just cares about how much it can hydrate
                     if (effect is SatiateHunger hunger)
                     {
-                        total += hunger.NutritionFactor * quantity.Quantity.Float();
+                        total += hunger.Factor * quantity.Quantity.Float();
                     }
                 }
             }
@@ -279,7 +278,7 @@ public sealed partial class IngestionSystem
                     // ignores any effect conditions, just cares about how much it can hydrate
                     if (effect is SatiateThirst thirst)
                     {
-                        total += thirst.HydrationFactor * quantity.Quantity.Float();
+                        total += thirst.Factor * quantity.Quantity.Float();
                     }
                 }
             }
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs
index a4ef8422bb..f9cb03cb35 100644
--- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition.Components;
@@ -66,7 +66,7 @@ public sealed partial class IngestionSystem
             return;
 
         // TODO: Once we have predicted randomness delete this for something sane...
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(entity).Id, GetNetEntity(userUid).Id });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(entity).Id, GetNetEntity(userUid).Id);
         var rand = new System.Random(seed);
 
         if (!rand.Prob(entity.Comp.BreakChance))
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
index d3271b7edb..2373b6d9ea 100644
--- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
@@ -118,8 +118,7 @@ public sealed partial class IngestionSystem : EntitySystem
     /// <param name="user">The entity who is trying to make this happen.</param>
     /// <param name="target">The entity who is being made to ingest something.</param>
     /// <param name="ingested">The entity that is trying to be ingested.</param>
-    /// <param name="ingest">Bool that determines whethere this is a Try or a Can effectively.
-    /// When set to true, it tries to ingest, when false it checks if we can.</param>
+    /// <param name="ingest"> When set to true, it tries to ingest. When false, it only checks if we can.</param>
     /// <returns>Returns true if we can ingest the item.</returns>
     private bool AttemptIngest(EntityUid user, EntityUid target, EntityUid ingested, bool ingest)
     {
@@ -365,6 +364,9 @@ public sealed partial class IngestionSystem : EntitySystem
 
         var split = _solutionContainer.SplitSolution(solution.Value, transfer);
 
+        if (beforeEv.Refresh)
+            _solutionContainer.TryAddSolution(solution.Value, split);
+
         var ingestEv = new IngestingEvent(food, split, forceFed);
         RaiseLocalEvent(entity, ref ingestEv);
 
@@ -374,9 +376,6 @@ public sealed partial class IngestionSystem : EntitySystem
         var afterEv = new IngestedEvent(args.User, entity, split, forceFed);
         RaiseLocalEvent(food, ref afterEv);
 
-        if (afterEv.Refresh)
-            _solutionContainer.TryAddSolution(solution.Value, split);
-
         _stomach.TryTransferSolution(stomachToUse.Value.Owner, split, stomachToUse);
 
         if (!afterEv.Destroy)
diff --git a/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs b/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs
index 7bfb7a5633..f672edaab4 100644
--- a/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs
@@ -38,7 +38,7 @@ public sealed class MessyDrinkerSystem : EntitySystem
             return;
 
         // TODO: Replace with RandomPredicted once the engine PR is merged
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(ent).Id);
         var rand = new System.Random(seed);
         if (!rand.Prob(ent.Comp.SpillChance))
             return;
diff --git a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
index 04d3c20a3f..1a87dd25e9 100644
--- a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
@@ -147,18 +147,6 @@ public sealed partial class OpenableSystem : EntitySystem
             args.Cancelled = true;
     }
 
-    /// <summary>
-    /// Returns true if the entity either does not have OpenableComponent or it is opened.
-    /// Drinks that don't have OpenableComponent are automatically open, so it returns true.
-    /// </summary>
-    public bool IsOpen(EntityUid uid, OpenableComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false))
-            return true;
-
-        return comp.Opened;
-    }
-
     /// <summary>
     /// Returns true if the entity both has OpenableComponent and is not opened.
     /// Drinks that don't have OpenableComponent are automatically open, so it returns false.
diff --git a/Content.Shared/Nutrition/IngestionEvents.cs b/Content.Shared/Nutrition/IngestionEvents.cs
index 27988c898d..afa50fc931 100644
--- a/Content.Shared/Nutrition/IngestionEvents.cs
+++ b/Content.Shared/Nutrition/IngestionEvents.cs
@@ -111,6 +111,10 @@ public record struct BeforeIngestedEvent(FixedPoint2 Min, FixedPoint2 Max, Solut
     // Whether this event, and therefore eat attempt, should be cancelled.
     public bool Cancelled;
 
+    // When and if we eat this solution, should we actually remove solution or should it get replaced?
+    // This bool basically only exists because of stackable system.
+    public bool Refresh;
+
     public bool TryNewMinimum(FixedPoint2 newMin)
     {
         if (newMin > Max)
@@ -130,6 +134,12 @@ public record struct BeforeIngestedEvent(FixedPoint2 Min, FixedPoint2 Max, Solut
     }
 }
 
+/// <summary>
+/// Raised on an entity while it is eating
+/// </summary>
+/// <param name="Food">The item being ingested</param>
+/// <param name="Split">The solution being ingested</param>
+/// <param name="ForceFed">Whether or not we're being forced</param>
 [ByRefEvent]
 public record struct IngestingEvent(EntityUid Food, Solution Split, bool ForceFed);
 
@@ -143,10 +153,6 @@ public record struct IngestingEvent(EntityUid Food, Solution Split, bool ForceFe
 [ByRefEvent]
 public record struct IngestedEvent(EntityUid User, EntityUid Target, Solution Split, bool ForceFed)
 {
-    // Should we refill the solution now that we've eaten it?
-    // This bool basically only exists because of stackable system.
-    public bool Refresh;
-
     // Should we destroy the ingested entity?
     public bool Destroy;
 
diff --git a/Content.Shared/PAI/PAIComponent.cs b/Content.Shared/PAI/PAIComponent.cs
index fb9d7150e3..541172ffe0 100644
--- a/Content.Shared/PAI/PAIComponent.cs
+++ b/Content.Shared/PAI/PAIComponent.cs
@@ -1,8 +1,4 @@
-using Content.Shared.FixedPoint;
-using Content.Shared.Store;
 using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.PAI;
 
@@ -16,7 +12,7 @@ namespace Content.Shared.PAI;
 ///  and there's not always enough players and ghost roles to justify it.
 /// All logic in PAISystem.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class PAIComponent : Component
 {
     /// <summary>
@@ -26,12 +22,6 @@ public sealed partial class PAIComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? LastUser;
 
-    [DataField]
-    public EntProtoId ShopActionId = "ActionPAIOpenShop";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? ShopAction;
-
     /// <summary>
     /// When microwaved there is this chance to brick the pai, kicking out its player and preventing it from being used again.
     /// </summary>
diff --git a/Content.Shared/PAI/SharedPAISystem.cs b/Content.Shared/PAI/SharedPAISystem.cs
deleted file mode 100644
index 00d3e23cef..0000000000
--- a/Content.Shared/PAI/SharedPAISystem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Actions;
-
-namespace Content.Shared.PAI;
-
-/// <summary>
-/// pAIs, or Personal AIs, are essentially portable ghost role generators.
-/// In their current implementation, they create a ghost role anyone can access,
-/// and that a player can also "wipe" (reset/kick out player).
-/// Theoretically speaking pAIs are supposed to use a dedicated "offer and select" system,
-///  with the player holding the pAI being able to choose one of the ghosts in the round.
-/// This seems too complicated for an initial implementation, though,
-///  and there's not always enough players and ghost roles to justify it.
-/// </summary>
-public abstract class SharedPAISystem : EntitySystem
-{
-    [Dependency] private readonly SharedActionsSystem _actions = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PAIComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<PAIComponent, ComponentShutdown>(OnShutdown);
-    }
-
-    private void OnMapInit(Entity<PAIComponent> ent, ref MapInitEvent args)
-    {
-        _actions.AddAction(ent, ent.Comp.ShopActionId);
-    }
-
-    private void OnShutdown(Entity<PAIComponent> ent, ref ComponentShutdown args)
-    {
-        _actions.RemoveAction(ent.Owner, ent.Comp.ShopAction);
-    }
-}
-public sealed partial class PAIShopActionEvent : InstantActionEvent
-{
-}
diff --git a/Content.Shared/ParcelWrap/Components/ParcelWrapComponent.cs b/Content.Shared/ParcelWrap/Components/ParcelWrapComponent.cs
index b5afb49dca..41375e5c2a 100644
--- a/Content.Shared/ParcelWrap/Components/ParcelWrapComponent.cs
+++ b/Content.Shared/ParcelWrap/Components/ParcelWrapComponent.cs
@@ -10,58 +10,64 @@ namespace Content.Shared.ParcelWrap.Components;
 /// This component gives its owning entity the ability to wrap items into parcels.
 /// </summary>
 /// <seealso cref="Components.WrappedParcelComponent"/>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access] // Readonly, except for VV editing
 public sealed partial class ParcelWrapComponent : Component
 {
     /// <summary>
     /// The <see cref="EntityPrototype"/> of the parcel created by using this component.
     /// </summary>
-    [DataField(required: true)]
+    [DataField(required: true), AutoNetworkedField]
     public EntProtoId ParcelPrototype;
 
     /// <summary>
     /// If true, parcels created by this will have the same <see cref="ItemSizePrototype">size</see> as the item they
     /// contain. If false, parcels created by this will always have the size specified by <see cref="FallbackItemSize"/>.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool WrappedItemsMaintainSize = true;
 
     /// <summary>
     /// The <see cref="ItemSizePrototype">size</see> of parcels created by this component's entity. This is used if
     /// <see cref="WrappedItemsMaintainSize"/> is false, or if the item being wrapped somehow doesn't have a size.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public ProtoId<ItemSizePrototype> FallbackItemSize = "Ginormous";
 
     /// <summary>
     /// If true, parcels created by this will have the same shape as the item they contain. If false, parcels created by
     /// this will have the default shape for their size.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool WrappedItemsMaintainShape;
 
     /// <summary>
     /// How long it takes to use this to wrap something.
     /// </summary>
-    [DataField(required: true)]
+    [DataField(required: true), AutoNetworkedField]
     public TimeSpan WrapDelay = TimeSpan.FromSeconds(1);
 
     /// <summary>
     /// Sound played when this is used to wrap something.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? WrapSound;
 
     /// <summary>
     /// Defines the set of things which can be wrapped (unless it fails the <see cref="Blacklist"/>).
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? Whitelist;
 
     /// <summary>
     /// Defines the set of things which cannot be wrapped (even if it passes the <see cref="Whitelist"/>).
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// If a player trapped inside this parcel can escape from it by unwrapping it.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanSelfUnwrap = true;
 }
diff --git a/Content.Shared/ParcelWrap/Components/ParcelWrapOverrideComponent.cs b/Content.Shared/ParcelWrap/Components/ParcelWrapOverrideComponent.cs
new file mode 100644
index 0000000000..e401d30a7f
--- /dev/null
+++ b/Content.Shared/ParcelWrap/Components/ParcelWrapOverrideComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.ParcelWrap.Components;
+
+/// <summary>
+/// Added to an entity to override the datafields in <see cref="ParcelWrapComponent"/> when it is being wrapped.
+/// Use this for special, non-item parcel types, for example Urist-shaped parcels.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ParcelWrapOverrideComponent : Component
+{
+    /// <summary>
+    /// The <see cref="EntityPrototype"/> of the parcel created by wrapping this entity.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public EntProtoId? ParcelPrototype;
+
+    /// <summary>
+    /// How long it takes to use this to wrap something.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public TimeSpan? WrapDelay;
+}
diff --git a/Content.Shared/ParcelWrap/Components/WrappedParcelComponent.cs b/Content.Shared/ParcelWrap/Components/WrappedParcelComponent.cs
index e0ceaeae49..2ed018e344 100644
--- a/Content.Shared/ParcelWrap/Components/WrappedParcelComponent.cs
+++ b/Content.Shared/ParcelWrap/Components/WrappedParcelComponent.cs
@@ -11,7 +11,8 @@ namespace Content.Shared.ParcelWrap.Components;
 /// destroying this entity and releasing <see cref="Contents"/>.
 /// </summary>
 /// <seealso cref="ParcelWrapComponent"/>
-[RegisterComponent, NetworkedComponent, Access(typeof(ParcelWrappingSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(ParcelWrappingSystem))]
 public sealed partial class WrappedParcelComponent : Component
 {
     /// <summary>
@@ -23,19 +24,19 @@ public sealed partial class WrappedParcelComponent : Component
     /// <summary>
     /// Specifies the entity to spawn when this parcel is unwrapped.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntProtoId? UnwrapTrash;
 
     /// <summary>
     /// How long it takes to unwrap this parcel.
     /// </summary>
-    [DataField(required: true)]
+    [DataField(required: true), AutoNetworkedField]
     public TimeSpan UnwrapDelay = TimeSpan.FromSeconds(1);
 
     /// <summary>
     /// Sound played when unwrapping this parcel.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? UnwrapSound;
 
     /// <summary>
@@ -43,4 +44,11 @@ public sealed partial class WrappedParcelComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadOnly)]
     public string ContainerId = "contents";
+
+    /// <summary>
+    /// If a player trapped inside this parcel can escape from it by unwrapping it.
+    /// This is set by the <see cref="ParcelWrapComponent" /> used to create the parcel.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanSelfUnwrap = true;
 }
diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs
index f924a7c6c9..bd2e1eb47f 100644
--- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs
+++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs
@@ -1,7 +1,9 @@
 using Content.Shared.DoAfter;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.ParcelWrap.Components;
+using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
 
@@ -59,9 +61,26 @@ public sealed partial class ParcelWrappingSystem
 
     private bool TryStartWrapDoAfter(EntityUid user, Entity<ParcelWrapComponent> wrapper, EntityUid target)
     {
+        var duration = wrapper.Comp.WrapDelay;
+
+        if (TryComp<ParcelWrapOverrideComponent>(target, out var overrideComp) && overrideComp.WrapDelay != null)
+            duration = overrideComp.WrapDelay.Value;
+
+        // In case the target is a player inform them with a popup.
+        if (target == user)
+        {
+            var selfMsg = Loc.GetString("parcel-wrap-popup-being-wrapped-self");
+            _popup.PopupClient(selfMsg, user, user);
+        }
+        else
+        {
+            var othersMsg = Loc.GetString("parcel-wrap-popup-being-wrapped", ("user", Identity.Entity(user, EntityManager)));
+            _popup.PopupEntity(othersMsg, target, target, PopupType.MediumCaution);
+        }
+
         return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager,
             user,
-            wrapper.Comp.WrapDelay,
+            duration,
             new ParcelWrapItemDoAfterEvent(),
             wrapper, // Raise the event on the wrapper because that's what the event handler expects.
             target,
@@ -81,18 +100,34 @@ public sealed partial class ParcelWrappingSystem
     /// <param name="target">The entity being wrapped.</param>
     private void WrapInternal(EntityUid user, Entity<ParcelWrapComponent> wrapper, EntityUid target)
     {
-        if (_net.IsServer)
+        // Consume a `use` on the wrapper, and delete the wrapper if it's empty.
+        _charges.TryUseCharges(wrapper.Owner, 1);
+        if (_charges.IsEmpty(wrapper.Owner))
+            PredictedQueueDel(wrapper);
+
+        // Play a wrapping sound.
+        _audio.PlayPredicted(wrapper.Comp.WrapSound, target, user);
+
+        if (_net.IsClient)
+            return; // Predicted spawns can't be interacted with yet.
+
+        EntityUid spawned;
+        var targetTransform = Transform(target);
+        // Check if the target has a pre-defined parcel type to be used.
+        if (TryComp<ParcelWrapOverrideComponent>(target, out var overrideComp))
         {
-            var spawned = Spawn(wrapper.Comp.ParcelPrototype, Transform(target).Coordinates);
+            spawned = Spawn(overrideComp.ParcelPrototype, targetTransform.Coordinates);
+        }
+        else // Create a parcel with the same size and generic sprites instead.
+        {
+            spawned = Spawn(wrapper.Comp.ParcelPrototype, targetTransform.Coordinates);
 
             // If this wrap maintains the size when wrapping, set the parcel's size to the target's size. Otherwise use the
             // wrap's fallback size.
             TryComp(target, out ItemComponent? targetItemComp);
             var size = wrapper.Comp.FallbackItemSize;
             if (wrapper.Comp.WrappedItemsMaintainSize && targetItemComp is not null)
-            {
                 size = targetItemComp.Size;
-            }
 
             // ParcelWrap's spawned entity should always have an `ItemComp`. As of writing, the only use has it hardcoded on
             // its prototype.
@@ -103,33 +138,28 @@ public sealed partial class ParcelWrappingSystem
             // If this wrap maintains the shape when wrapping and the item has a shape override, copy the shape override to
             // the parcel.
             if (wrapper.Comp.WrappedItemsMaintainShape && targetItemComp is { Shape: { } shape })
-            {
                 _item.SetShape(spawned, shape, item);
-            }
-
-            // If the target's in a container, try to put the parcel in its place in the container.
-            if (_container.TryGetContainingContainer((target, null, null), out var containerOfTarget))
-            {
-                _container.Remove(target, containerOfTarget);
-                _container.InsertOrDrop((spawned, null, null), containerOfTarget);
-            }
-
-            // Insert the target into the parcel.
-            var parcel = EnsureComp<WrappedParcelComponent>(spawned);
-            if (!_container.Insert(target, parcel.Contents))
-            {
-                DebugTools.Assert(
-                    $"Failed to insert target entity into newly spawned parcel. target={PrettyPrint.PrintUserFacing(target)}");
-                QueueDel(spawned);
-            }
         }
 
-        // Consume a `use` on the wrapper, and delete the wrapper if it's empty.
-        _charges.TryUseCharges(wrapper.Owner, 1);
-        if (_net.IsServer && _charges.IsEmpty(wrapper.Owner))
-            QueueDel(wrapper);
+        _transform.SetLocalRotation(spawned, targetTransform.LocalRotation);
 
-        // Play a wrapping sound.
-        _audio.PlayPredicted(wrapper.Comp.WrapSound, target, user);
+        // If the target is in a container, try to put the parcel in its place in the container.
+        if (_container.TryGetContainingContainer((target, null, null), out var containerOfTarget))
+        {
+            _container.Remove(target, containerOfTarget);
+            _container.InsertOrDrop((spawned, null, null), containerOfTarget);
+        }
+
+        // Insert the target into the parcel.
+        var parcel = EnsureComp<WrappedParcelComponent>(spawned);
+        parcel.CanSelfUnwrap = wrapper.Comp.CanSelfUnwrap;
+        Dirty(spawned, parcel);
+
+        if (!_container.Insert(target, parcel.Contents))
+        {
+            DebugTools.Assert(
+                $"Failed to insert target entity into newly spawned parcel. target={PrettyPrint.PrintUserFacing(target)}");
+            PredictedDel(spawned);
+        }
     }
 }
diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
index bb0c9437ff..460ba7caf5 100644
--- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
+++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
@@ -38,7 +38,10 @@ public sealed partial class ParcelWrappingSystem
     private void OnGetVerbsForWrappedParcel(Entity<WrappedParcelComponent> entity,
         ref GetVerbsEvent<InteractionVerb> args)
     {
-        if (!args.CanAccess)
+        if (!args.CanAccess || !args.CanComplexInteract)
+            return;
+
+        if (!entity.Comp.CanSelfUnwrap && entity.Comp.Contents.Contains(args.User))
             return;
 
         // "Capture" the values from `args` because C# doesn't like doing the capturing for `ref` values.
diff --git a/Content.Shared/Physics/JointVisualsComponent.cs b/Content.Shared/Physics/JointVisualsComponent.cs
index 37a9cdc3b1..5179c31a86 100644
--- a/Content.Shared/Physics/JointVisualsComponent.cs
+++ b/Content.Shared/Physics/JointVisualsComponent.cs
@@ -10,21 +10,30 @@ namespace Content.Shared.Physics;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class JointVisualsComponent : Component
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("sprite", required: true), AutoNetworkedField]
+    /// <summary>
+    /// The sprite to use for the line.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
     public SpriteSpecifier Sprite = default!;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("target"), AutoNetworkedField]
-    public NetEntity? Target;
+    /// <summary>
+    /// The line is drawn between this target and the entity owning the component.
+    /// </summary>
+    /// <summary>
+    /// TODO: WeakEntityReference.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Target;
 
     /// <summary>
     /// Offset from Body A.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("offsetA"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public Vector2 OffsetA;
 
     /// <summary>
     /// Offset from Body B.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("offsetB"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public Vector2 OffsetB;
 }
diff --git a/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs b/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs
index 90931ef9f1..a9d5db3f33 100644
--- a/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs
+++ b/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs
@@ -12,12 +12,12 @@ public abstract class SharedBatterySystem : EntitySystem
         SubscribeLocalEvent<BatteryComponent, EmpPulseEvent>(OnEmpPulse);
     }
 
-    private void OnEmpPulse(EntityUid uid, BatteryComponent component, ref EmpPulseEvent args)
+    private void OnEmpPulse(Entity<BatteryComponent> entity, ref EmpPulseEvent args)
     {
         args.Affected = true;
-        UseCharge(uid, args.EnergyConsumption, component);
+        UseCharge(entity, args.EnergyConsumption, entity.Comp);
         // Apply a cooldown to the entity's self recharge if needed to avoid it immediately self recharging after an EMP.
-        TrySetChargeCooldown(uid);
+        TrySetChargeCooldown(entity);
     }
 
     public virtual float UseCharge(EntityUid uid, float value, BatteryComponent? battery = null)
diff --git a/Content.Shared/PowerCell/SharedPowerCellSystem.cs b/Content.Shared/PowerCell/SharedPowerCellSystem.cs
index 0b71a3c24d..a32687c15c 100644
--- a/Content.Shared/PowerCell/SharedPowerCellSystem.cs
+++ b/Content.Shared/PowerCell/SharedPowerCellSystem.cs
@@ -74,9 +74,9 @@ public abstract class SharedPowerCellSystem : EntitySystem
         RaiseLocalEvent(uid, new PowerCellChangedEvent(true), false);
     }
 
-    private void OnCellEmpAttempt(EntityUid uid, PowerCellComponent component, EmpAttemptEvent args)
+    private void OnCellEmpAttempt(Entity<PowerCellComponent> entity, ref EmpAttemptEvent args)
     {
-        var parent = Transform(uid).ParentUid;
+        var parent = Transform(entity).ParentUid;
         // relay the attempt event to the slot so it can cancel it
         if (HasComp<PowerCellSlotComponent>(parent))
             RaiseLocalEvent(parent, ref args);
diff --git a/Content.Shared/Radiation/Events/OnIrradiatedEvent.cs b/Content.Shared/Radiation/Events/OnIrradiatedEvent.cs
index ec9988fffb..fdf7b21cd0 100644
--- a/Content.Shared/Radiation/Events/OnIrradiatedEvent.cs
+++ b/Content.Shared/Radiation/Events/OnIrradiatedEvent.cs
@@ -4,13 +4,13 @@ namespace Content.Shared.Radiation.Events;
 ///     Raised on entity when it was irradiated
 ///     by some radiation source.
 /// </summary>
-public readonly record struct OnIrradiatedEvent(float FrameTime, float RadsPerSecond, EntityUid Origin)
+public readonly record struct OnIrradiatedEvent(float FrameTime, float RadsPerSecond, EntityUid? Origin)
 {
     public readonly float FrameTime = FrameTime;
 
     public readonly float RadsPerSecond = RadsPerSecond;
 
-    public readonly EntityUid Origin = Origin;
+    public readonly EntityUid? Origin = Origin;
 
     public float TotalRads => RadsPerSecond * FrameTime;
 }
diff --git a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
index 87e839b56f..ceb4786ebe 100644
--- a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
@@ -185,6 +185,12 @@ namespace Content.Shared.Random.Helpers
             throw new InvalidOperationException($"Invalid weighted pick for {prototype.ID}!");
         }
 
+        /// <inheritdoc cref="HashCodeCombine(IReadOnlyCollection{int})"/>
+        public static int HashCodeCombine(params int[] values)
+        {
+            return HashCodeCombine((IReadOnlyCollection<int>)values);
+        }
+
         /// <summary>
         /// A very simple, deterministic djb2 hash function for generating a combined seed for the random number generator.
         /// We can't use HashCode.Combine because that is initialized with a random value, creating different results on the server and client.
@@ -192,10 +198,10 @@ namespace Content.Shared.Random.Helpers
         /// <example>
         /// Combine the current game tick with a NetEntity Id in order to not get the same random result if this is called multiple times in the same tick.
         /// <code>
-        /// var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        /// var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(ent).Id);
         /// </code>
         /// </example>
-        public static int HashCodeCombine(List<int> values)
+        public static int HashCodeCombine(IReadOnlyCollection<int> values)
         {
             int hash = 5381;
             foreach (var value in values)
diff --git a/Content.Shared/Rejuvenate/RejuvenateEvent.cs b/Content.Shared/Rejuvenate/RejuvenateEvent.cs
index a6649c6cda..cead1f6507 100644
--- a/Content.Shared/Rejuvenate/RejuvenateEvent.cs
+++ b/Content.Shared/Rejuvenate/RejuvenateEvent.cs
@@ -1,5 +1,9 @@
 namespace Content.Shared.Rejuvenate;
 
-public sealed class RejuvenateEvent : EntityEventArgs
-{
-}
+/// <summary>
+/// Raised when an entity is supposed to be rejuvenated,
+/// meaning it should heal all damage, debuffs or other negative status effects.
+/// Systems should handle healing the entity in a subscription to this event.
+/// Used for the Rejuvenate admin verb.
+/// </summary>
+public sealed class RejuvenateEvent : EntityEventArgs;
diff --git a/Content.Shared/Remotes/Components/DoorRemoteComponent.cs b/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
index 64977596c2..7bce64262d 100644
--- a/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
+++ b/Content.Shared/Remotes/Components/DoorRemoteComponent.cs
@@ -1,26 +1,74 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Remotes.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+/// <summary>
+/// Component for door remote devices, that allow you to control doors from a distance.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class DoorRemoteComponent : Component
 {
-    [AutoNetworkedField]
-    [DataField]
+    /// <summary>
+    /// Currently selected mode. The mode dictates what device would do upon
+    /// interaction with door.
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public OperatingMode Mode = OperatingMode.OpenClose;
 
     /// <summary>
-    /// Does the remote allow the user to manipulate doors that they have access to, even if the remote itself does not?
+    /// Modes with metadata that could be displayed in the device mode change menu.
     /// </summary>
-    [AutoNetworkedField]
     [DataField]
-    public bool IncludeUserAccess = false;
+    public List<DoorRemoteModeInfo> Options;
+
+    /// <summary>
+    /// Does the remote allow the user to control doors that they have access to, even if the remote itself does not?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IncludeUserAccess;
+
+    /// <summary>
+    /// Client-side only field for checking if StatusControl requires update.
+    /// </summary>
+    /// <remarks>
+    /// StatusControl is updated inside loop and cannot understand
+    /// when state is of component it looks for is restored, thus mispredicting. To avoid that,
+    /// client-side system basically controls behaviour of StatusControl updates using this field.
+    /// </remarks>
+    public bool IsStatusControlUpdateRequired;
 }
 
+/// <summary>
+/// Remote door device mode with data that is required for menu display.
+/// </summary>
+[DataDefinition]
+public sealed partial class DoorRemoteModeInfo
+{
+    /// <summary>
+    /// Icon that should represent the option in the radial menu.
+    /// </summary>
+    [DataField(required: true)]
+    public SpriteSpecifier Icon = default!;
+
+    /// <summary>
+    /// Tooltip describing the option in the radial menu.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Tooltip;
+
+    /// <summary>
+    /// Mode option.
+    /// </summary>
+    [DataField(required: true)]
+    public OperatingMode Mode;
+}
+
+[Serializable, NetSerializable]
 public enum OperatingMode : byte
 {
     OpenClose,
     ToggleBolts,
-    ToggleEmergencyAccess,
-    placeholderForUiUpdates
+    ToggleEmergencyAccess
 }
diff --git a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
index e9bbd27ada..67c2214ca2 100644
--- a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
+++ b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
@@ -1,44 +1,134 @@
+using Content.Shared.Access.Components;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Shared.Doors.Components;
+using Content.Shared.Doors.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Interaction.Events;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.Remotes.Components;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Remotes.EntitySystems;
 
 public abstract class SharedDoorRemoteSystem : EntitySystem
 {
-    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly SharedAirlockSystem _airlock = default!;
+    [Dependency] private readonly SharedDoorSystem _doorSystem = default!;
+    [Dependency] private readonly ExamineSystemShared _examine = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
+
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<DoorRemoteComponent, UseInHandEvent>(OnInHandActivation);
+        SubscribeLocalEvent<DoorRemoteComponent, DoorRemoteModeChangeMessage>(OnDoorRemoteModeChange);
+        SubscribeLocalEvent<DoorRemoteComponent, BeforeRangedInteractEvent>(OnBeforeInteract);
     }
 
-    private void OnInHandActivation(Entity<DoorRemoteComponent> entity, ref UseInHandEvent args)
+    private void OnDoorRemoteModeChange(Entity<DoorRemoteComponent> ent, ref DoorRemoteModeChangeMessage args)
     {
-        string switchMessageId;
+        ent.Comp.Mode = args.Mode;
+        Dirty(ent);
+    }
+
+    private void OnBeforeInteract(Entity<DoorRemoteComponent> entity, ref BeforeRangedInteractEvent args)
+    {
+        if (!Timing.IsFirstTimePredicted)
+            return;
+
+        var isAirlock = TryComp<AirlockComponent>(args.Target, out var airlockComp);
+
+        if (args.Handled
+            || args.Target == null
+            || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
+                                                                      // Only able to control doors if they are within your vision and within your max range.
+                                                                      // Not affected by mobs or machines anymore.
+            || !_examine.InRangeUnOccluded(args.User,
+                args.Target.Value,
+                SharedInteractionSystem.MaxRaycastRange,
+                null))
+
+        {
+            return;
+        }
+
+        args.Handled = true;
+
+        if (!_powerReceiver.IsPowered(args.Target.Value))
+        {
+            _popup.PopupClient(Loc.GetString("door-remote-no-power"), args.User, args.User);
+            return;
+        }
+
+        var accessTarget = args.Used;
+        // This covers the accesses the REMOTE has, and is not effected by the user's ID card.
+        if (entity.Comp.IncludeUserAccess) // Allows some door remotes to inherit the user's access.
+        {
+            accessTarget = args.User;
+            // This covers the accesses the USER has, which always includes the remote's access since holding a remote acts like holding an ID card.
+        }
+
+        if (TryComp<AccessReaderComponent>(args.Target, out var accessComponent)
+            && !_doorSystem.HasAccess(args.Target.Value, accessTarget, doorComp, accessComponent))
+        {
+            if (isAirlock)
+                _doorSystem.Deny(args.Target.Value, doorComp, user: args.User, predicted: true);
+
+            _popup.PopupClient(Loc.GetString("door-remote-denied"), args.User, args.User);
+            return;
+        }
+
         switch (entity.Comp.Mode)
         {
             case OperatingMode.OpenClose:
-                entity.Comp.Mode = OperatingMode.ToggleBolts;
-                switchMessageId = "door-remote-switch-state-toggle-bolts";
+                if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, user: args.User, predicted: true))
+                    _adminLogger.Add(LogType.Action,
+                        LogImpact.Medium,
+                        $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
                 break;
-
-            // Skip toggle bolts mode and move on from there (to emergency access)
             case OperatingMode.ToggleBolts:
-                entity.Comp.Mode = OperatingMode.ToggleEmergencyAccess;
-                switchMessageId = "door-remote-switch-state-toggle-emergency-access";
-                break;
+                if (TryComp<DoorBoltComponent>(args.Target, out var boltsComp))
+                {
+                    if (!boltsComp.BoltWireCut)
+                    {
+                        _doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, user: args.User, predicted: true);
+                        _adminLogger.Add(LogType.Action,
+                            LogImpact.Medium,
+                            $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
+                    }
+                }
 
-            // Skip ToggleEmergencyAccess mode and move on from there (to door toggle)
+                break;
             case OperatingMode.ToggleEmergencyAccess:
-                entity.Comp.Mode = OperatingMode.OpenClose;
-                switchMessageId = "door-remote-switch-state-open-close";
+                if (airlockComp != null)
+                {
+                    _airlock.SetEmergencyAccess((args.Target.Value, airlockComp), !airlockComp.EmergencyAccess, user: args.User, predicted: true);
+                    _adminLogger.Add(LogType.Action,
+                        LogImpact.Medium,
+                        $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to set emergency access {(airlockComp.EmergencyAccess ? "on" : "off")}");
+                }
+
                 break;
             default:
                 throw new InvalidOperationException(
                     $"{nameof(DoorRemoteComponent)} had invalid mode {entity.Comp.Mode}");
         }
-        Dirty(entity);
-        Popup.PopupClient(Loc.GetString(switchMessageId), entity, args.User);
     }
 }
+
+[Serializable, NetSerializable]
+public sealed class DoorRemoteModeChangeMessage : BoundUserInterfaceMessage
+{
+    public OperatingMode Mode;
+}
+
+[Serializable, NetSerializable]
+public enum DoorRemoteUiKey : byte
+{
+    Key
+}
diff --git a/Content.Shared/Revenant/Components/RevenantComponent.cs b/Content.Shared/Revenant/Components/RevenantComponent.cs
index e6543f1906..e434bba1d9 100644
--- a/Content.Shared/Revenant/Components/RevenantComponent.cs
+++ b/Content.Shared/Revenant/Components/RevenantComponent.cs
@@ -214,6 +214,4 @@ public sealed partial class RevenantComponent : Component
     [DataField("harvestingState")]
     public string HarvestingState = "harvesting";
     #endregion
-
-    [DataField] public EntityUid? Action;
 }
diff --git a/Content.Shared/Revenant/SharedRevenant.cs b/Content.Shared/Revenant/SharedRevenant.cs
index c44e4408aa..b1023f43e2 100644
--- a/Content.Shared/Revenant/SharedRevenant.cs
+++ b/Content.Shared/Revenant/SharedRevenant.cs
@@ -42,10 +42,6 @@ public sealed class HarvestDoAfterCancelled : EntityEventArgs
 {
 }
 
-public sealed partial class RevenantShopActionEvent : InstantActionEvent
-{
-}
-
 public sealed partial class RevenantDefileActionEvent : InstantActionEvent
 {
 }
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 54e5c1d525..6b58c42428 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -17,19 +17,19 @@ namespace Content.Shared.Roles
         [IdDataField]
         public string ID { get; private set; } = default!;
 
-        [DataField("playTimeTracker", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<PlayTimeTrackerPrototype>))]
+        [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<PlayTimeTrackerPrototype>))]
         public string PlayTimeTracker { get; private set; } = string.Empty;
 
         /// <summary>
         ///     Who is the supervisor for this job.
         /// </summary>
-        [DataField("supervisors")]
-        public string Supervisors { get; private set; } = "nobody";
+        [DataField]
+        public LocId Supervisors = "job-supervisors-nobody";
 
         /// <summary>
         ///     The name of this job as displayed to players.
         /// </summary>
-        [DataField("name")]
+        [DataField]
         public string Name { get; private set; } = string.Empty;
 
         [ViewVariables(VVAccess.ReadOnly)]
@@ -38,7 +38,7 @@ namespace Content.Shared.Roles
         /// <summary>
         ///     The name of this job as displayed to players.
         /// </summary>
-        [DataField("description")]
+        [DataField]
         public string? Description { get; private set; }
 
         [ViewVariables(VVAccess.ReadOnly)]
@@ -53,19 +53,19 @@ namespace Content.Shared.Roles
         /// <summary>
         ///     When true - the station will have anouncement about arrival of this player.
         /// </summary>
-        [DataField("joinNotifyCrew")]
+        [DataField]
         public bool JoinNotifyCrew { get; private set; } = false;
 
         /// <summary>
         ///     When true - the player will recieve a message about importancy of their job.
         /// </summary>
-        [DataField("requireAdminNotify")]
+        [DataField]
         public bool RequireAdminNotify { get; private set; } = false;
 
         /// <summary>
         ///     Should this job appear in preferences menu?
         /// </summary>
-        [DataField("setPreference")]
+        [DataField]
         public bool SetPreference { get; private set; } = true;
 
         /// <summary>
@@ -81,14 +81,14 @@ namespace Content.Shared.Roles
         [DataField]
         public bool? OverrideConsoleVisibility { get; private set; } = null;
 
-        [DataField("canBeAntag")]
+        [DataField]
         public bool CanBeAntag { get; private set; } = true;
 
         /// <summary>
         ///     The "weight" or importance of this job. If this number is large, the job system will assign this job
         ///     before assigning other jobs.
         /// </summary>
-        [DataField("weight")]
+        [DataField]
         public int Weight { get; private set; }
 
         /// <summary>
@@ -105,7 +105,7 @@ namespace Content.Shared.Roles
         ///     A numerical score for how much easier this job is for antagonists.
         ///     For traitors, reduces starting TC by this amount. Other gamemodes can use it for whatever they find fitting.
         /// </summary>
-        [DataField("antagAdvantage")]
+        [DataField]
         public int AntagAdvantage = 0;
 
         [DataField]
@@ -116,7 +116,7 @@ namespace Content.Shared.Roles
         /// Starting gear will be ignored.
         /// If you want to just add special attributes to a humanoid, use AddComponentSpecial instead.
         /// </summary>
-        [DataField("jobEntity", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? JobEntity = null;
 
         /// <summary>
@@ -129,19 +129,19 @@ namespace Content.Shared.Roles
         [DataField]
         public ProtoId<JobIconPrototype> Icon { get; private set; } = "JobIconUnknown";
 
-        [DataField("special", serverOnly: true)]
+        [DataField(serverOnly: true)]
         public JobSpecial[] Special { get; private set; } = Array.Empty<JobSpecial>();
 
-        [DataField("access")]
+        [DataField]
         public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> Access { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField("accessGroups")]
+        [DataField]
         public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> AccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
 
-        [DataField("extendedAccess")]
+        [DataField]
         public IReadOnlyCollection<ProtoId<AccessLevelPrototype>> ExtendedAccess { get; private set; } = Array.Empty<ProtoId<AccessLevelPrototype>>();
 
-        [DataField("extendedAccessGroups")]
+        [DataField]
         public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> ExtendedAccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
 
         [DataField]
diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index eeab329661..e85d4d86d8 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -23,7 +23,6 @@ public abstract class SharedRoleSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] protected readonly ISharedPlayerManager Player = default!;
-    [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly SharedMindSystem _minds = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
@@ -400,7 +399,7 @@ public abstract class SharedRoleSystem : EntitySystem
 
         foreach (var role in delete)
         {
-            _entityManager.DeleteEntity(role);
+            PredictedDel(role);
         }
 
         var update = MindRolesUpdate(mind);
diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
index 0b091d3a61..fec1890928 100644
--- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
+++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
@@ -92,7 +92,7 @@ public abstract partial class SharedFultonSystem : EntitySystem
         if (args.Cancelled || args.Target == null || !TryComp<FultonComponent>(args.Used, out var fulton))
             return;
 
-        if (!_stack.Use(args.Used.Value, 1))
+        if (!_stack.TryUse(args.Used.Value, 1))
         {
             return;
         }
diff --git a/Content.Shared/Security/SecurityStatus.cs b/Content.Shared/Security/SecurityStatus.cs
index c7fe3766f1..49fb059546 100644
--- a/Content.Shared/Security/SecurityStatus.cs
+++ b/Content.Shared/Security/SecurityStatus.cs
@@ -6,16 +6,20 @@
 /// None - the default value
 /// Suspected - the person is suspected of doing something illegal
 /// Wanted - the person is being wanted by security
+/// Hostile - the person has been admitted as hostile
 /// Detained - the person is detained by security
 /// Paroled - the person is on parole
 /// Discharged - the person has been released from prison
+/// Eliminated - the person has been eliminated and should not be healed
 /// </summary>
 public enum SecurityStatus : byte
 {
     None,
     Suspected,
     Wanted,
+    Hostile,
     Detained,
     Paroled,
-    Discharged
+    Discharged,
+    Eliminated
 }
diff --git a/Content.Shared/Sericulture/SericultureSystem.cs b/Content.Shared/Sericulture/SericultureSystem.cs
index e6086e67c2..fb87c907f4 100644
--- a/Content.Shared/Sericulture/SericultureSystem.cs
+++ b/Content.Shared/Sericulture/SericultureSystem.cs
@@ -68,8 +68,8 @@ public abstract partial class SharedSericultureSystem : EntitySystem
 
     private void OnSericultureStart(EntityUid uid, SericultureComponent comp, SericultureActionEvent args)
     {
-        if (TryComp<HungerComponent>(uid, out var hungerComp)
-            && _hungerSystem.IsHungerBelowState(uid,
+        if (!TryComp<HungerComponent>(uid, out var hungerComp)
+            || _hungerSystem.IsHungerBelowState(uid,
                 comp.MinHungerThreshold,
                 _hungerSystem.GetHunger(hungerComp) - comp.HungerCost,
                 hungerComp))
@@ -95,9 +95,9 @@ public abstract partial class SharedSericultureSystem : EntitySystem
         if (args.Cancelled || args.Handled || comp.Deleted)
             return;
 
-        if (TryComp<HungerComponent>(uid,
+        if (!TryComp<HungerComponent>(uid,
                 out var hungerComp) // A check, just incase the doafter is somehow performed when the entity is not in the right hunger state.
-            && _hungerSystem.IsHungerBelowState(uid,
+            || _hungerSystem.IsHungerBelowState(uid,
                 comp.MinHungerThreshold,
                 _hungerSystem.GetHunger(hungerComp) - comp.HungerCost,
                 hungerComp))
@@ -106,7 +106,7 @@ public abstract partial class SharedSericultureSystem : EntitySystem
             return;
         }
 
-        _hungerSystem.ModifyHunger(uid, -comp.HungerCost);
+        _hungerSystem.ModifyHunger(uid, -comp.HungerCost, hungerComp);
 
         if (!_netManager.IsClient) // Have to do this because spawning stuff in shared is CBT.
         {
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
index 816b7e5d68..2de588c7b7 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
@@ -128,5 +128,24 @@ public abstract class SharedBorgSwitchableTypeSystem : EntitySystem
             tts.VoicePrototypeId = prototype.VoicePrototypeId;
         }
         // Corvax-TTS-end
+
+        if (prototype.SpriteBodyMovementState is { } movementState)
+        {
+            var spriteMovement = EnsureComp<SpriteMovementComponent>(entity);
+            spriteMovement.NoMovementLayers.Clear();
+            spriteMovement.NoMovementLayers["movement"] = new PrototypeLayerData
+            {
+                State = prototype.SpriteBodyState,
+            };
+            spriteMovement.MovementLayers.Clear();
+            spriteMovement.MovementLayers["movement"] = new PrototypeLayerData
+            {
+                State = movementState,
+            };
+        }
+        else
+        {
+            RemComp<SpriteMovementComponent>(entity);
+        }
     }
 }
diff --git a/Content.Shared/Silicons/Bots/HugBotComponent.cs b/Content.Shared/Silicons/Bots/HugBotComponent.cs
new file mode 100644
index 0000000000..64281b6316
--- /dev/null
+++ b/Content.Shared/Silicons/Bots/HugBotComponent.cs
@@ -0,0 +1,12 @@
+namespace Content.Shared.Silicons.Bots;
+
+/// <summary>
+/// This component describes how a HugBot hugs.
+/// </summary>
+/// <see cref="SharedHugBotSystem"/>
+[RegisterComponent, AutoGenerateComponentState]
+public sealed partial class HugBotComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public TimeSpan HugCooldown = TimeSpan.FromMinutes(2);
+}
diff --git a/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs b/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
new file mode 100644
index 0000000000..b5dec71f20
--- /dev/null
+++ b/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Emag.Systems;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Silicons.Bots;
+
+/// <summary>
+/// This system handles HugBots.
+/// </summary>
+public abstract class SharedHugBotSystem : EntitySystem
+{
+    [Dependency] private readonly EmagSystem _emag = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<HugBotComponent, GotEmaggedEvent>(OnEmagged);
+    }
+
+    private void OnEmagged(Entity<HugBotComponent> entity, ref GotEmaggedEvent args)
+    {
+        if (!_emag.CompareFlag(args.Type, EmagType.Interaction) ||
+            _emag.CheckFlag(entity, EmagType.Interaction) ||
+            !TryComp<HugBotComponent>(entity, out var hugBot))
+            return;
+
+        // HugBot HTN checks for emag state within its own logic, so we don't need to change anything here.
+
+        args.Handled = true;
+    }
+}
+
+/// <summary>
+/// This event is raised on an entity when it is hugged by a HugBot.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class HugBotHugEvent(NetEntity hugBot) : EntityEventArgs
+{
+    public readonly NetEntity HugBot = hugBot;
+}
diff --git a/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs b/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
index 9f33521d8f..2bf5ecba1a 100644
--- a/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
+++ b/Content.Shared/Silicons/Laws/SiliconLawsetPrototype.cs
@@ -66,6 +66,12 @@ public sealed partial class SiliconLawsetPrototype : IPrototype
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    /// <summary>
+    /// The locstring of the lawset for the guidebook entry, if no name is provided, defaults to the ID
+    /// </summary>    
+    [DataField]
+    public LocId? Name = null;
+
     /// <summary>
     /// List of law prototype ids in this lawset.
     /// </summary>
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
index ca2d593dbe..2bf1ddc3bf 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
@@ -4,10 +4,9 @@ using Content.Shared.Electrocution;
 
 namespace Content.Shared.Silicons.StationAi;
 
+// Handles airlock radial
 public abstract partial class SharedStationAiSystem
 {
-    // Handles airlock radial
-
     private void InitializeAirlock()
     {
         SubscribeLocalEvent<DoorBoltComponent, StationAiBoltEvent>(OnAirlockBolt);
@@ -20,12 +19,18 @@ public abstract partial class SharedStationAiSystem
     /// </summary>
     private void OnAirlockBolt(EntityUid ent, DoorBoltComponent component, StationAiBoltEvent args)
     {
-        if (component.BoltWireCut)
+        if (component.BoltWireCut || !PowerReceiver.IsPowered(ent))
         {
             ShowDeviceNotRespondingPopup(args.User);
             return;
         }
 
+        if (!_access.IsAllowed(args.User, ent))
+        {
+            ShowDeviceNoAccessPopup(args.User);
+            return;
+        }
+
         var setResult = _doors.TrySetBoltDown((ent, component), args.Bolted, args.User, predicted: true);
         if (!setResult)
         {
@@ -44,6 +49,12 @@ public abstract partial class SharedStationAiSystem
             return;
         }
 
+        if (!_access.IsAllowed(args.User, ent))
+        {
+            ShowDeviceNoAccessPopup(args.User);
+            return;
+        }
+
         _airlocks.SetEmergencyAccess((ent, component), args.EmergencyAccess, args.User, predicted: true);
     }
 
@@ -52,15 +63,18 @@ public abstract partial class SharedStationAiSystem
     /// </summary>
     private void OnElectrified(EntityUid ent, ElectrifiedComponent component, StationAiElectrifiedEvent args)
     {
-        if (
-            component.IsWireCut
-            || !PowerReceiver.IsPowered(ent)
-        )
+        if (component.IsWireCut || !PowerReceiver.IsPowered(ent))
         {
             ShowDeviceNotRespondingPopup(args.User);
             return;
         }
 
+        if (!_access.IsAllowed(args.User, ent))
+        {
+            ShowDeviceNoAccessPopup(args.User);
+            return;
+        }
+
         _electrify.SetElectrified((ent, component), args.Electrified);
         var soundToPlay = component.Enabled
             ? component.AirlockElectrifyDisabled
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
index c82e92b451..91dd61d334 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
@@ -206,6 +206,11 @@ public abstract partial class SharedStationAiSystem
     {
         _popup.PopupClient(Loc.GetString("ai-device-not-responding"), toEntity, PopupType.MediumCaution);
     }
+
+    private void ShowDeviceNoAccessPopup(EntityUid toEntity)
+    {
+        _popup.PopupClient(Loc.GetString("ai-device-no-access"), toEntity, PopupType.MediumCaution);
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
index e9b2575e40..fde4952f86 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Access.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
 using Content.Shared.Administration.Managers;
@@ -42,6 +43,7 @@ public abstract partial class SharedStationAiSystem : EntitySystem
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly ItemSlotsSystem _slots = default!;
     [Dependency] private readonly ItemToggleSystem _toggles = default!;
+    [Dependency] private readonly AccessReaderSystem _access = default!;
     [Dependency] private readonly ActionBlockerSystem _blocker = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly SharedAirlockSystem _airlocks = default!;
diff --git a/Content.Server/Speech/Components/EmoteBlockerComponent.cs b/Content.Shared/Speech/Components/EmoteBlockerComponent.cs
similarity index 74%
rename from Content.Server/Speech/Components/EmoteBlockerComponent.cs
rename to Content.Shared/Speech/Components/EmoteBlockerComponent.cs
index 603fd1b258..95263a2595 100644
--- a/Content.Server/Speech/Components/EmoteBlockerComponent.cs
+++ b/Content.Shared/Speech/Components/EmoteBlockerComponent.cs
@@ -1,24 +1,25 @@
 using Content.Shared.Chat.Prototypes;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Speech.Components;
+namespace Content.Shared.Speech.Components;
 
 /// <summary>
 /// Suppresses emotes with the given categories or ID.
 /// Additionally, if the Scream Emote would be blocked, also blocks the Scream Action.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmoteBlockerComponent : Component
 {
     /// <summary>
     /// Which categories of emotes are blocked by this component.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public HashSet<EmoteCategory> BlocksCategories = [];
 
     /// <summary>
     /// IDs of which specific emotes are blocked by this component.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public HashSet<ProtoId<EmotePrototype>> BlocksEmotes = [];
 }
diff --git a/Content.Server/Speech/EntitySystems/EmoteBlockerSystem.cs b/Content.Shared/Speech/EntitySystems/EmoteBlockerSystem.cs
similarity index 90%
rename from Content.Server/Speech/EntitySystems/EmoteBlockerSystem.cs
rename to Content.Shared/Speech/EntitySystems/EmoteBlockerSystem.cs
index 3599268359..e2c9728fbc 100644
--- a/Content.Server/Speech/EntitySystems/EmoteBlockerSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/EmoteBlockerSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.Speech.Components;
-using Content.Shared.Emoting;
+using Content.Shared.Chat;
 using Content.Shared.Inventory;
+using Content.Shared.Speech.Components;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Shared.Speech.EntitySystems;
 
 public sealed class EmoteBlockerSystem : EntitySystem
 {
diff --git a/Content.Shared/Stacks/SharedStackSystem.API.cs b/Content.Shared/Stacks/SharedStackSystem.API.cs
new file mode 100644
index 0000000000..1356c8ecda
--- /dev/null
+++ b/Content.Shared/Stacks/SharedStackSystem.API.cs
@@ -0,0 +1,293 @@
+using Content.Shared.Hands.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Stacks;
+
+// Partial for public API functions.
+public abstract partial class SharedStackSystem
+{
+    #region Merge Stacks
+
+    /// <summary>
+    /// Moves as much stack count as we can from the donor to the recipient.
+    /// Deletes the donor if count goes to 0.
+    /// </summary>
+    /// <param name="transferred">How much stack count was moved.</param>
+    /// <param name="amount">Optional. Limits amount of stack count to move from the donor.</param>
+    /// <returns> True if transferred is greater than 0. </returns>
+    [PublicAPI]
+    public bool TryMergeStacks(Entity<StackComponent?> donor,
+                                Entity<StackComponent?> recipient,
+                                out int transferred,
+                                int? amount = null)
+    {
+        transferred = 0;
+
+        if (donor == recipient)
+            return false;
+
+        if (!Resolve(recipient, ref recipient.Comp, false) || !Resolve(donor, ref donor.Comp, false))
+            return false;
+
+        if (recipient.Comp.StackTypeId != donor.Comp.StackTypeId)
+            return false;
+
+        // The most we can transfer
+        transferred = Math.Min(donor.Comp.Count, GetAvailableSpace(recipient.Comp));
+        if (transferred <= 0)
+            return false;
+
+        // transfer only as much as we want
+        if (amount > 0)
+            transferred = Math.Min(transferred, amount.Value);
+
+        SetCount(donor, donor.Comp.Count - transferred);
+        SetCount(recipient, recipient.Comp.Count + transferred);
+        return true;
+    }
+
+    /// <summary>
+    /// If the given item is a stack, this attempts to find a matching stack in the users hand and merge with that.
+    /// </summary>
+    /// <remarks>
+    /// If the interaction fails to fully merge the stack, or if this is just not a stack, it will instead try
+    /// to place it in the user's hand normally.
+    /// </remarks>
+    [PublicAPI]
+    public void TryMergeToHands(Entity<StackComponent?> item, Entity<HandsComponent?> user)
+    {
+        if (!Resolve(user.Owner, ref user.Comp, false))
+            return;
+
+        if (!Resolve(item.Owner, ref item.Comp, false))
+        {
+            // This isn't even a stack. Just try to pickup as normal.
+            Hands.PickupOrDrop(user.Owner, item.Owner, handsComp: user.Comp);
+            return;
+        }
+
+        foreach (var held in Hands.EnumerateHeld(user))
+        {
+            TryMergeStacks(item, held, out _);
+
+            if (item.Comp.Count == 0)
+                return;
+        }
+
+        Hands.PickupOrDrop(user.Owner, item.Owner, handsComp: user.Comp);
+    }
+
+    /// <summary>
+    /// Donor entity merges stack count into contacting entities.
+    /// Deletes the donor if count goes to 0.
+    /// </summary>
+    /// <returns> True if donor moved any count to contacts. </returns>
+    [PublicAPI]
+    public bool TryMergeToContacts(Entity<StackComponent?, TransformComponent?> donor)
+    {
+        var (uid, stack, xform) = donor; // sue me
+        if (!Resolve(uid, ref stack, ref xform, false))
+            return false;
+
+        var map = xform.MapID;
+        var bounds = _physics.GetWorldAABB(uid);
+        var intersecting = new HashSet<Entity<StackComponent>>(); // Should we reuse a HashSet instead of making a new one?
+        _entityLookup.GetEntitiesIntersecting(map, bounds, intersecting, LookupFlags.Dynamic | LookupFlags.Sundries);
+
+        var merged = false;
+        foreach (var recipientStack in intersecting)
+        {
+            var otherEnt = recipientStack.Owner;
+            // if you merge a ton of stacks together, you will end up deleting a few by accident.
+            if (TerminatingOrDeleted(otherEnt) || EntityManager.IsQueuedForDeletion(otherEnt))
+                continue;
+
+            if (!TryMergeStacks((uid, stack), recipientStack.AsNullable(), out _))
+                continue;
+            merged = true;
+
+            if (stack.Count <= 0)
+                break;
+        }
+        return merged;
+    }
+
+    #endregion
+    #region Setters
+
+    /// <summary>
+    /// Sets a stack count to an amount. Server will delete ent if count is 0.
+    /// Clamps between zero and the stack's max size.
+    /// </summary>
+    /// <remarks> All setter functions should end up here. </remarks>
+    public void SetCount(Entity<StackComponent?> ent, int amount)
+    {
+        if (!Resolve(ent.Owner, ref ent.Comp))
+            return;
+
+        // Do nothing if amount is already the same.
+        if (amount == ent.Comp.Count)
+            return;
+
+        // Store old value for event-raising purposes...
+        var old = ent.Comp.Count;
+
+        // Clamp the value.
+        amount = Math.Min(amount, GetMaxCount(ent.Comp));
+        amount = Math.Max(amount, 0);
+
+        ent.Comp.Count = amount;
+        ent.Comp.UiUpdateNeeded = true;
+        Dirty(ent);
+
+        Appearance.SetData(ent.Owner, StackVisuals.Actual, ent.Comp.Count);
+        RaiseLocalEvent(ent.Owner, new StackCountChangedEvent(old, ent.Comp.Count));
+
+        // Queue delete stack if count reaches zero.
+        if (ent.Comp.Count <= 0)
+            PredictedQueueDel(ent.Owner);
+    }
+
+    /// <inheritdoc cref="SetCount(Entity{StackComponent?}, int)"/>
+    [Obsolete("Use Entity<T> method instead")]
+    public void SetCount(EntityUid uid, int amount, StackComponent? component = null)
+    {
+        SetCount((uid, component), amount);
+    }
+
+    // TODO
+    /// <summary>
+    /// Increase a stack count by an amount, and spawn new entities if above the max.
+    /// </summary>
+    // public List<EntityUid> RaiseCountAndSpawn(Entity<StackComponent?> ent, int amount);
+
+    /// <summary>
+    /// Reduce a stack count by an amount, even if it would go below 0.
+    /// If it reaches 0 the stack will despawn.
+    /// </summary>
+    /// <seealso cref="TryUse"/>
+    [PublicAPI]
+    public void ReduceCount(Entity<StackComponent?> ent, int amount)
+    {
+        if (!Resolve(ent.Owner, ref ent.Comp))
+            return;
+
+        // Don't reduce unlimited stacks
+        if (ent.Comp.Unlimited)
+            return;
+
+        SetCount(ent, ent.Comp.Count - amount);
+    }
+
+    /// <summary>
+    /// Try to reduce a stack count by a whole amount.
+    /// Won't reduce the stack count if the amount is larger than the stack.
+    /// </summary>
+    /// <returns> True if the count was lowered. Always true if the stack is unlimited. </returns>
+    [PublicAPI]
+    public bool TryUse(Entity<StackComponent?> ent, int amount)
+    {
+        if (!Resolve(ent.Owner, ref ent.Comp))
+            return false;
+
+        // We're unlimited and always greater than amount
+        if (ent.Comp.Unlimited)
+            return true;
+
+        // Check if we have enough things in the stack for this...
+        if (amount > ent.Comp.Count)
+            return false;
+
+        // We do have enough things in the stack, so remove them and change.
+        SetCount(ent, ent.Comp.Count - amount);
+        return true;
+    }
+
+    #endregion
+    #region Getters
+
+    /// <summary>
+    /// Gets the count in a stack. If it cannot be stacked, returns 1.
+    /// </summary>
+    [PublicAPI]
+    public int GetCount(Entity<StackComponent?> ent)
+    {
+        return Resolve(ent.Owner, ref ent.Comp, false) ? ent.Comp.Count : 1;
+    }
+
+    /// <summary>
+    /// Gets the maximum amount that can be fit on a stack.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// if there's no StackComponent, this equals 1. Otherwise, if there's a max
+    /// count override, it equals that. It then checks for a max count value
+    /// on the stack prototype. If there isn't one, it defaults to the max integer
+    /// value (unlimited).
+    /// </p>
+    /// </remarks>
+    [PublicAPI]
+    public int GetMaxCount(StackComponent? component)
+    {
+        if (component == null)
+            return 1;
+
+        if (component.MaxCountOverride != null)
+            return component.MaxCountOverride.Value;
+
+        var stackProto = _prototype.Index(component.StackTypeId);
+        return stackProto.MaxCount ?? int.MaxValue;
+    }
+
+    /// <inheritdoc cref="GetMaxCount(StackComponent?)"/>
+    [PublicAPI]
+    public int GetMaxCount(EntProtoId entityId)
+    {
+        var entProto = _prototype.Index<EntityPrototype>(entityId);
+        entProto.TryGetComponent<StackComponent>(out var stackComp, EntityManager.ComponentFactory);
+        return GetMaxCount(stackComp);
+    }
+
+    /// <inheritdoc cref="GetMaxCount(StackComponent?)"/>
+    [PublicAPI]
+    public int GetMaxCount(EntityPrototype entityId)
+    {
+        entityId.TryGetComponent<StackComponent>(out var stackComp, EntityManager.ComponentFactory);
+        return GetMaxCount(stackComp);
+    }
+
+    /// <inheritdoc cref="GetMaxCount(StackComponent?)"/>
+    [PublicAPI]
+    public int GetMaxCount(EntityUid uid)
+    {
+        return GetMaxCount(CompOrNull<StackComponent>(uid));
+    }
+
+    /// <summary>
+    /// Gets the maximum amount that can be fit on a stack, or int.MaxValue if no max value exists.
+    /// </summary>
+    [PublicAPI]
+    public static int GetMaxCount(StackPrototype stack)
+    {
+        return stack.MaxCount ?? int.MaxValue;
+    }
+
+    /// <inheritdoc cref="GetMaxCount(StackPrototype)"/>
+    [PublicAPI]
+    public int GetMaxCount(ProtoId<StackPrototype> stackId)
+    {
+        return GetMaxCount(_prototype.Index(stackId));
+    }
+
+    /// <summary>
+    /// Gets the remaining space in a stack.
+    /// </summary>
+    [PublicAPI]
+    public int GetAvailableSpace(StackComponent component)
+    {
+        return GetMaxCount(component) - component.Count;
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index b3de1870fe..a04fe579b0 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Content.Shared.Examine;
-using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition;
@@ -10,502 +9,248 @@ using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Shared.GameStates;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Shared.Stacks
+namespace Content.Shared.Stacks;
+
+// Partial for general system code and event handlers.
+/// <summary>
+/// System for handling entities which represent a stack of identical items, usually materials.
+/// </summary>
+[UsedImplicitly]
+public abstract partial class SharedStackSystem : EntitySystem
 {
-    [UsedImplicitly]
-    public abstract class SharedStackSystem : EntitySystem
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IViewVariablesManager _vvm = default!;
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
+    [Dependency] protected readonly SharedHandsSystem Hands = default!;
+    [Dependency] protected readonly SharedTransformSystem Xform = default!;
+    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly SharedStorageSystem _storage = default!;
+
+    // TODO: These should be in the prototype.
+    public static readonly int[] DefaultSplitAmounts = { 1, 5, 10, 20, 30, 50 };
+
+    public override void Initialize()
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IPrototypeManager _prototype = default!;
-        [Dependency] private readonly IViewVariablesManager _vvm = default!;
-        [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
-        [Dependency] protected readonly SharedHandsSystem Hands = default!;
-        [Dependency] protected readonly SharedTransformSystem Xform = default!;
-        [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-        [Dependency] protected readonly SharedPopupSystem Popup = default!;
-        [Dependency] private readonly SharedStorageSystem _storage = default!;
+        base.Initialize();
 
-        public static readonly int[] DefaultSplitAmounts = { 1, 5, 10, 20, 30, 50 };
+        SubscribeLocalEvent<StackComponent, InteractUsingEvent>(OnStackInteractUsing);
+        SubscribeLocalEvent<StackComponent, ComponentGetState>(OnStackGetState);
+        SubscribeLocalEvent<StackComponent, ComponentHandleState>(OnStackHandleState);
+        SubscribeLocalEvent<StackComponent, ComponentStartup>(OnStackStarted);
+        SubscribeLocalEvent<StackComponent, ExaminedEvent>(OnStackExamined);
 
-        public override void Initialize()
+        SubscribeLocalEvent<StackComponent, BeforeIngestedEvent>(OnBeforeEaten);
+        SubscribeLocalEvent<StackComponent, IngestedEvent>(OnEaten);
+        SubscribeLocalEvent<StackComponent, GetVerbsEvent<AlternativeVerb>>(OnStackAlternativeInteract);
+
+        _vvm.GetTypeHandler<StackComponent>()
+            .AddPath(nameof(StackComponent.Count), (_, comp) => comp.Count, SetCount);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        _vvm.GetTypeHandler<StackComponent>()
+            .RemovePath(nameof(StackComponent.Count));
+    }
+
+    private void OnStackInteractUsing(Entity<StackComponent> ent, ref InteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!TryComp<StackComponent>(args.Used, out var recipientStack))
+            return;
+
+        // Transfer stacks from ground to hand
+        if (!TryMergeStacks((ent.Owner, ent.Comp), (args.Used, recipientStack), out var transferred))
+            return; // if nothing transferred, leave without a pop-up
+
+        args.Handled = true;
+
+        // interaction is done, the rest is just generating a pop-up
+
+        var popupPos = args.ClickLocation;
+        var userCoords = Transform(args.User).Coordinates;
+
+        if (!popupPos.IsValid(EntityManager))
         {
-            base.Initialize();
-
-            SubscribeLocalEvent<StackComponent, ComponentGetState>(OnStackGetState);
-            SubscribeLocalEvent<StackComponent, ComponentHandleState>(OnStackHandleState);
-            SubscribeLocalEvent<StackComponent, ComponentStartup>(OnStackStarted);
-            SubscribeLocalEvent<StackComponent, ExaminedEvent>(OnStackExamined);
-            SubscribeLocalEvent<StackComponent, InteractUsingEvent>(OnStackInteractUsing);
-            SubscribeLocalEvent<StackComponent, BeforeIngestedEvent>(OnBeforeEaten);
-            SubscribeLocalEvent<StackComponent, IngestedEvent>(OnEaten);
-            SubscribeLocalEvent<StackComponent, GetVerbsEvent<AlternativeVerb>>(OnStackAlternativeInteract);
-
-            _vvm.GetTypeHandler<StackComponent>()
-                .AddPath(nameof(StackComponent.Count), (_, comp) => comp.Count, SetCount);
+            popupPos = userCoords;
         }
 
-        public override void Shutdown()
+        switch (transferred)
         {
-            base.Shutdown();
+            case > 0:
+                Popup.PopupClient($"+{transferred}", popupPos, args.User);
 
-            _vvm.GetTypeHandler<StackComponent>()
-                .RemovePath(nameof(StackComponent.Count));
-        }
-
-        private void OnStackInteractUsing(EntityUid uid, StackComponent stack, InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            if (!TryComp(args.Used, out StackComponent? recipientStack))
-                return;
-
-            var localRotation = Transform(args.Used).LocalRotation;
-
-            if (!TryMergeStacks(uid, args.Used, out var transfered, stack, recipientStack))
-                return;
-
-            args.Handled = true;
-
-            // interaction is done, the rest is just generating a pop-up
-
-            if (!_gameTiming.IsFirstTimePredicted)
-                return;
-
-            var popupPos = args.ClickLocation;
-            var userCoords = Transform(args.User).Coordinates;
-
-            if (!popupPos.IsValid(EntityManager))
-            {
-                popupPos = userCoords;
-            }
-
-            switch (transfered)
-            {
-                case > 0:
-                    Popup.PopupCoordinates($"+{transfered}", popupPos, Filter.Local(), false);
-
-                    if (GetAvailableSpace(recipientStack) == 0)
-                    {
-                        Popup.PopupCoordinates(Loc.GetString("comp-stack-becomes-full"),
-                            popupPos.Offset(new Vector2(0, -0.5f)), Filter.Local(), false);
-                    }
-
-                    break;
-
-                case 0 when GetAvailableSpace(recipientStack) == 0:
-                    Popup.PopupCoordinates(Loc.GetString("comp-stack-already-full"), popupPos, Filter.Local(), false);
-                    break;
-            }
-
-            _storage.PlayPickupAnimation(args.Used, popupPos, userCoords, localRotation, args.User);
-        }
-
-        private bool TryMergeStacks(
-            EntityUid donor,
-            EntityUid recipient,
-            out int transferred,
-            StackComponent? donorStack = null,
-            StackComponent? recipientStack = null)
-        {
-            transferred = 0;
-            if (donor == recipient)
-                return false;
-
-            if (!Resolve(recipient, ref recipientStack, false) || !Resolve(donor, ref donorStack, false))
-                return false;
-
-            if (string.IsNullOrEmpty(recipientStack.StackTypeId) || !recipientStack.StackTypeId.Equals(donorStack.StackTypeId))
-                return false;
-
-            transferred = Math.Min(donorStack.Count, GetAvailableSpace(recipientStack));
-            SetCount(donor, donorStack.Count - transferred, donorStack);
-            SetCount(recipient, recipientStack.Count + transferred, recipientStack);
-            return transferred > 0;
-        }
-
-        /// <summary>
-        ///     If the given item is a stack, this attempts to find a matching stack in the users hand, and merge with that.
-        /// </summary>
-        /// <remarks>
-        ///     If the interaction fails to fully merge the stack, or if this is just not a stack, it will instead try
-        ///     to place it in the user's hand normally.
-        /// </remarks>
-        public void TryMergeToHands(
-            EntityUid item,
-            EntityUid user,
-            StackComponent? itemStack = null,
-            HandsComponent? hands = null)
-        {
-            if (!Resolve(user, ref hands, false))
-                return;
-
-            if (!Resolve(item, ref itemStack, false))
-            {
-                // This isn't even a stack. Just try to pickup as normal.
-                Hands.PickupOrDrop(user, item, handsComp: hands);
-                return;
-            }
-
-            // This is shit code until hands get fixed and give an easy way to enumerate over items, starting with the currently active item.
-            foreach (var held in Hands.EnumerateHeld((user, hands)))
-            {
-                TryMergeStacks(item, held, out _, donorStack: itemStack);
-
-                if (itemStack.Count == 0)
-                    return;
-            }
-
-            Hands.PickupOrDrop(user, item, handsComp: hands);
-        }
-
-        public virtual void SetCount(EntityUid uid, int amount, StackComponent? component = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-
-            // Do nothing if amount is already the same.
-            if (amount == component.Count)
-                return;
-
-            // Store old value for event-raising purposes...
-            var old = component.Count;
-
-            // Clamp the value.
-            amount = Math.Min(amount, GetMaxCount(component));
-            amount = Math.Max(amount, 0);
-
-            // Server-side override deletes the entity if count == 0
-            component.Count = amount;
-            Dirty(uid, component);
-
-            Appearance.SetData(uid, StackVisuals.Actual, component.Count);
-            RaiseLocalEvent(uid, new StackCountChangedEvent(old, component.Count));
-        }
-
-        /// <summary>
-        ///     Try to use an amount of items on this stack. Returns whether this succeeded.
-        /// </summary>
-        public bool Use(EntityUid uid, int amount, StackComponent? stack = null)
-        {
-            if (!Resolve(uid, ref stack))
-                return false;
-
-            // Check if we have enough things in the stack for this...
-            if (stack.Count < amount)
-            {
-                // Not enough things in the stack, return false.
-                return false;
-            }
-
-            // We do have enough things in the stack, so remove them and change.
-            if (!stack.Unlimited)
-            {
-                SetCount(uid, stack.Count - amount, stack);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Tries to merge a stack into any of the stacks it is touching.
-        /// </summary>
-        /// <returns>Whether or not it was successfully merged into another stack</returns>
-        public bool TryMergeToContacts(EntityUid uid, StackComponent? stack = null, TransformComponent? xform = null)
-        {
-            if (!Resolve(uid, ref stack, ref xform, false))
-                return false;
-
-            var map = xform.MapID;
-            var bounds = _physics.GetWorldAABB(uid);
-            var intersecting = new HashSet<Entity<StackComponent>>();
-            _entityLookup.GetEntitiesIntersecting(map, bounds, intersecting, LookupFlags.Dynamic | LookupFlags.Sundries);
-
-            var merged = false;
-            foreach (var otherStack in intersecting)
-            {
-                var otherEnt = otherStack.Owner;
-                // if you merge a ton of stacks together, you will end up deleting a few by accident.
-                if (TerminatingOrDeleted(otherEnt) || EntityManager.IsQueuedForDeletion(otherEnt))
-                    continue;
-
-                if (!TryMergeStacks(uid, otherEnt, out _, stack, otherStack))
-                    continue;
-                merged = true;
-
-                if (stack.Count <= 0)
-                    break;
-            }
-            return merged;
-        }
-
-        /// <summary>
-        /// Gets the amount of items in a stack. If it cannot be stacked, returns 1.
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="component"></param>
-        /// <returns></returns>
-        public int GetCount(EntityUid uid, StackComponent? component = null)
-        {
-            return Resolve(uid, ref component, false) ? component.Count : 1;
-        }
-
-        /// <summary>
-        /// Gets the max count for a given entity prototype
-        /// </summary>
-        /// <param name="entityId"></param>
-        /// <returns></returns>
-        [PublicAPI]
-        public int GetMaxCount(string entityId)
-        {
-            var entProto = _prototype.Index<EntityPrototype>(entityId);
-            entProto.TryGetComponent<StackComponent>(out var stackComp, EntityManager.ComponentFactory);
-            return GetMaxCount(stackComp);
-        }
-
-        /// <summary>
-        /// Gets the max count for a given entity
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <returns></returns>
-        [PublicAPI]
-        public int GetMaxCount(EntityUid uid)
-        {
-            return GetMaxCount(CompOrNull<StackComponent>(uid));
-        }
-
-        /// <summary>
-        /// Gets the maximum amount that can be fit on a stack.
-        /// </summary>
-        /// <remarks>
-        /// <p>
-        /// if there's no stackcomp, this equals 1. Otherwise, if there's a max
-        /// count override, it equals that. It then checks for a max count value
-        /// on the prototype. If there isn't one, it defaults to the max integer
-        /// value (unlimimted).
-        /// </p>
-        /// </remarks>
-        /// <param name="component"></param>
-        /// <returns></returns>
-        public int GetMaxCount(StackComponent? component)
-        {
-            if (component == null)
-                return 1;
-
-            if (component.MaxCountOverride != null)
-                return component.MaxCountOverride.Value;
-
-            if (string.IsNullOrEmpty(component.StackTypeId))
-                return 1;
-
-            var stackProto = _prototype.Index<StackPrototype>(component.StackTypeId);
-
-            return stackProto.MaxCount ?? int.MaxValue;
-        }
-
-        /// <summary>
-        /// Gets the remaining space in a stack.
-        /// </summary>
-        /// <param name="component"></param>
-        /// <returns></returns>
-        [PublicAPI]
-        public int GetAvailableSpace(StackComponent component)
-        {
-            return GetMaxCount(component) - component.Count;
-        }
-
-        /// <summary>
-        /// Tries to add one stack to another. May have some leftover count in the inserted entity.
-        /// </summary>
-        public bool TryAdd(EntityUid insertEnt, EntityUid targetEnt, StackComponent? insertStack = null, StackComponent? targetStack = null)
-        {
-            if (!Resolve(insertEnt, ref insertStack) || !Resolve(targetEnt, ref targetStack))
-                return false;
-
-            var count = insertStack.Count;
-            return TryAdd(insertEnt, targetEnt, count, insertStack, targetStack);
-        }
-
-        /// <summary>
-        /// Tries to add one stack to another. May have some leftover count in the inserted entity.
-        /// </summary>
-        public bool TryAdd(EntityUid insertEnt, EntityUid targetEnt, int count, StackComponent? insertStack = null, StackComponent? targetStack = null)
-        {
-            if (!Resolve(insertEnt, ref insertStack) || !Resolve(targetEnt, ref targetStack))
-                return false;
-
-            if (insertStack.StackTypeId != targetStack.StackTypeId)
-                return false;
-
-            var available = GetAvailableSpace(targetStack);
-
-            if (available <= 0)
-                return false;
-
-            var change = Math.Min(available, count);
-
-            SetCount(targetEnt, targetStack.Count + change, targetStack);
-            SetCount(insertEnt, insertStack.Count - change, insertStack);
-            return true;
-        }
-
-        private void OnStackStarted(EntityUid uid, StackComponent component, ComponentStartup args)
-        {
-            if (!TryComp(uid, out AppearanceComponent? appearance))
-                return;
-
-            Appearance.SetData(uid, StackVisuals.Actual, component.Count, appearance);
-            Appearance.SetData(uid, StackVisuals.MaxCount, GetMaxCount(component), appearance);
-            Appearance.SetData(uid, StackVisuals.Hide, false, appearance);
-        }
-
-        private void OnStackGetState(EntityUid uid, StackComponent component, ref ComponentGetState args)
-        {
-            args.State = new StackComponentState(component.Count, component.MaxCountOverride);
-        }
-
-        private void OnStackHandleState(EntityUid uid, StackComponent component, ref ComponentHandleState args)
-        {
-            if (args.Current is not StackComponentState cast)
-                return;
-
-            component.MaxCountOverride = cast.MaxCount;
-            // This will change the count and call events.
-            SetCount(uid, cast.Count, component);
-        }
-
-        private void OnStackExamined(EntityUid uid, StackComponent component, ExaminedEvent args)
-        {
-            if (!args.IsInDetailsRange)
-                return;
-
-            args.PushMarkup(
-                Loc.GetString("comp-stack-examine-detail-count",
-                    ("count", component.Count),
-                    ("markupCountColor", "lightgray")
-                )
-            );
-        }
-
-        private void OnBeforeEaten(Entity<StackComponent> eaten, ref BeforeIngestedEvent args)
-        {
-            if (args.Cancelled)
-                return;
-
-            if (args.Solution is not { } sol)
-                return;
-
-            // If the entity is empty and is a lingering entity we can't eat from it.
-            if (eaten.Comp.Count <= 0)
-            {
-                args.Cancelled = true;
-                return;
-            }
-
-            /*
-            Edible stacked items is near completely evil so we must choose one of the following:
-            - Option 1: Eat the entire solution each bite and reduce the stack by 1.
-            - Option 2: Multiply the solution eaten by the stack size.
-            - Option 3: Divide the solution consumed by stack size.
-            The easiest and safest option is and always will be Option 1 otherwise we risk reagent deletion or duplication.
-            That is why we cancel if we cannot set the minimum to the entire volume of the solution.
-            */
-            if(args.TryNewMinimum(sol.Volume))
-                return;
-
-            args.Cancelled = true;
-        }
-
-        private void OnEaten(Entity<StackComponent> eaten, ref IngestedEvent args)
-        {
-            if (!Use(eaten, 1))
-                return;
-
-            // We haven't eaten the whole stack yet or are unable to eat it completely.
-            if (eaten.Comp.Count > 0)
-            {
-                args.Refresh = true;
-                return;
-            }
-
-            // Here to tell the food system to do destroy stuff.
-            args.Destroy = true;
-        }
-
-        private void OnStackAlternativeInteract(EntityUid uid, StackComponent stack, GetVerbsEvent<AlternativeVerb> args)
-        {
-            if (!args.CanAccess || !args.CanInteract || args.Hands == null || stack.Count == 1)
-                return;
-
-            AlternativeVerb halve = new()
-            {
-                Text = Loc.GetString("comp-stack-split-halve"),
-                Category = VerbCategory.Split,
-                Act = () => UserSplit(uid, args.User, stack.Count / 2, stack),
-                Priority = 1
-            };
-            args.Verbs.Add(halve);
-
-            var priority = 0;
-            foreach (var amount in DefaultSplitAmounts)
-            {
-                if (amount >= stack.Count)
-                    continue;
-
-                AlternativeVerb verb = new()
+                if (GetAvailableSpace(recipientStack) == 0)
                 {
-                    Text = amount.ToString(),
-                    Category = VerbCategory.Split,
-                    Act = () => UserSplit(uid, args.User, amount, stack),
-                    // we want to sort by size, not alphabetically by the verb text.
-                    Priority = priority
-                };
+                    Popup.PopupClient(Loc.GetString("comp-stack-becomes-full"),
+                        popupPos.Offset(new Vector2(0, -0.5f)),
+                        args.User);
+                }
 
-                priority--;
+                break;
 
-                args.Verbs.Add(verb);
-            }
+            case 0 when GetAvailableSpace(recipientStack) == 0:
+                Popup.PopupClient(Loc.GetString("comp-stack-already-full"), popupPos, args.User);
+                break;
         }
 
-        /// <remarks>
-        ///     OnStackAlternativeInteract() was moved to shared in order to faciliate prediction of stack splitting verbs.
-        ///     However, prediction of interacitons with spawned entities is non-functional (or so i'm told)
-        ///     So, UserSplit() and Split() should remain on the server for the time being.
-        ///     This empty virtual method allows for UserSplit() to be called on the server from the client.
-        ///     When prediction is improved, those two methods should be moved to shared, in order to predict the splitting itself (not just the verbs)
-        /// </remarks>
-        protected virtual void UserSplit(EntityUid uid, EntityUid userUid, int amount,
-            StackComponent? stack = null,
-            TransformComponent? userTransform = null)
-        {
+        var localRotation = Transform(args.Used).LocalRotation;
+        _storage.PlayPickupAnimation(args.Used, popupPos, userCoords, localRotation, args.User);
+    }
 
+    private void OnStackStarted(Entity<StackComponent> ent, ref ComponentStartup args)
+    {
+        if (!TryComp(ent.Owner, out AppearanceComponent? appearance))
+            return;
+
+        Appearance.SetData(ent.Owner, StackVisuals.Actual, ent.Comp.Count, appearance);
+        Appearance.SetData(ent.Owner, StackVisuals.MaxCount, GetMaxCount(ent.Comp), appearance);
+        Appearance.SetData(ent.Owner, StackVisuals.Hide, false, appearance);
+    }
+
+    private void OnStackGetState(Entity<StackComponent> ent, ref ComponentGetState args)
+    {
+        args.State = new StackComponentState(ent.Comp.Count, ent.Comp.MaxCountOverride, ent.Comp.Unlimited);
+    }
+
+    private void OnStackHandleState(Entity<StackComponent> ent, ref ComponentHandleState args)
+    {
+        if (args.Current is not StackComponentState cast)
+            return;
+
+        ent.Comp.MaxCountOverride = cast.MaxCountOverride;
+        ent.Comp.Unlimited = cast.Unlimited;
+        // This will change the count and call events.
+        SetCount(ent.AsNullable(), cast.Count);
+    }
+
+    private void OnStackExamined(Entity<StackComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        args.PushMarkup(
+            Loc.GetString("comp-stack-examine-detail-count",
+                ("count", ent.Comp.Count),
+                ("markupCountColor", "lightgray")
+            )
+        );
+    }
+
+    private void OnBeforeEaten(Entity<StackComponent> eaten, ref BeforeIngestedEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (args.Solution is not { } sol)
+            return;
+
+        // If the entity is empty and is a lingering entity we can't eat from it.
+        if (eaten.Comp.Count <= 0)
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        // If we've made it this far, we should refresh the solution when this item is eaten provided it's not the last one in the stack!
+        args.Refresh = eaten.Comp.Count > 1;
+
+        /*
+        Edible stacked items is near completely evil so we must choose one of the following:
+        - Option 1: Eat the entire solution each bite and reduce the stack by 1.
+        - Option 2: Multiply the solution eaten by the stack size.
+        - Option 3: Divide the solution consumed by stack size.
+        The easiest and safest option is and always will be Option 1 otherwise we risk reagent deletion or duplication.
+        That is why we cancel if we cannot set the minimum to the entire volume of the solution.
+        */
+        if (args.TryNewMinimum(sol.Volume))
+            return;
+
+        args.Cancelled = true;
+    }
+
+    private void OnEaten(Entity<StackComponent> eaten, ref IngestedEvent args)
+    {
+        ReduceCount(eaten.AsNullable(), 1);
+    }
+
+    private void OnStackAlternativeInteract(Entity<StackComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || ent.Comp.Count == 1)
+            return;
+
+        var user = args.User; // Can't pass ref events into verbs
+
+        AlternativeVerb halve = new()
+        {
+            Text = Loc.GetString("comp-stack-split-halve"),
+            Category = VerbCategory.Split,
+            Act = () => UserSplit(ent, user, ent.Comp.Count / 2),
+            Priority = 1
+        };
+        args.Verbs.Add(halve);
+
+        var priority = 0;
+        foreach (var amount in DefaultSplitAmounts)
+        {
+            if (amount >= ent.Comp.Count)
+                continue;
+
+            AlternativeVerb verb = new()
+            {
+                Text = amount.ToString(),
+                Category = VerbCategory.Split,
+                Act = () => UserSplit(ent, user, amount),
+                // we want to sort by size, not alphabetically by the verb text.
+                Priority = priority
+            };
+
+            priority--;
+
+            args.Verbs.Add(verb);
         }
     }
 
-    /// <summary>
-    ///     Event raised when a stack's count has changed.
-    /// </summary>
-    public sealed class StackCountChangedEvent : EntityEventArgs
+    /// <remarks>
+    ///     OnStackAlternativeInteract() was moved to shared in order to faciliate prediction of stack splitting verbs.
+    ///     However, prediction of interacitons with spawned entities is non-functional (or so i'm told)
+    ///     So, UserSplit() and Split() should remain on the server for the time being.
+    ///     This empty virtual method allows for UserSplit() to be called on the server from the client.
+    ///     When prediction is improved, those two methods should be moved to shared, in order to predict the splitting itself (not just the verbs)
+    /// </remarks>
+    protected virtual void UserSplit(Entity<StackComponent> stack, Entity<TransformComponent?> user, int amount)
     {
-        /// <summary>
-        ///     The old stack count.
-        /// </summary>
-        public int OldCount;
 
-        /// <summary>
-        ///     The new stack count.
-        /// </summary>
-        public int NewCount;
-
-        public StackCountChangedEvent(int oldCount, int newCount)
-        {
-            OldCount = oldCount;
-            NewCount = newCount;
-        }
+    }
+}
+
+/// <summary>
+/// Event raised when a stack's count has changed.
+/// </summary>
+public sealed class StackCountChangedEvent : EntityEventArgs
+{
+    /// <summary>
+    /// The old stack count.
+    /// </summary>
+    public int OldCount;
+
+    /// <summary>
+    /// The new stack count.
+    /// </summary>
+    public int NewCount;
+
+    public StackCountChangedEvent(int oldCount, int newCount)
+    {
+        OldCount = oldCount;
+        NewCount = newCount;
     }
 }
diff --git a/Content.Shared/Stacks/StackComponent.cs b/Content.Shared/Stacks/StackComponent.cs
index 453c8a737d..f604f99654 100644
--- a/Content.Shared/Stacks/StackComponent.cs
+++ b/Content.Shared/Stacks/StackComponent.cs
@@ -1,110 +1,118 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Stacks
+namespace Content.Shared.Stacks;
+
+/// <summary>
+/// Component on an entity that represents a stack of identical things, usually materials.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedStackSystem))]
+public sealed partial class StackComponent : Component
 {
-    [RegisterComponent, NetworkedComponent]
-    public sealed partial class StackComponent : Component
+    /// <summary>
+    /// What stack type we are.
+    /// </summary>
+    [DataField("stackType", required: true)]
+    public ProtoId<StackPrototype> StackTypeId = default!;
+
+    /// <summary>
+    /// Current stack count.
+    /// Do NOT set this directly, use the <see cref="SharedStackSystem.SetCount"/> method instead.
+    /// </summary>
+    [DataField]
+    public int Count = 30;
+
+    /// <summary>
+    /// Max amount of things that can be in the stack.
+    /// Overrides the max defined on the stack prototype.
+    /// </summary>
+    [DataField]
+    public int? MaxCountOverride;
+
+    /// <summary>
+    /// Set to true to not reduce the count when used.
+    /// </summary>
+    [DataField]
+    public bool Unlimited;
+
+    /// <summary>
+    /// When throwing this item, do we want to only throw one part of the stack or the whole stack at once?
+    /// </summary>
+    [DataField]
+    public bool ThrowIndividually;
+
+    /// <summary>
+    /// Used by StackStatusControl in client to update UI.
+    /// </summary>
+    [ViewVariables]
+    [Access(typeof(SharedStackSystem), Other = AccessPermissions.ReadWrite)] // Set by StackStatusControl
+    public bool UiUpdateNeeded { get; set; }
+
+    /// <summary>
+    ///     Default IconLayer stack.
+    /// </summary>
+    [DataField]
+    public string BaseLayer = "";
+
+    /// <summary>
+    /// Determines if the visualizer uses composite or non-composite layers for icons. Defaults to false.
+    ///
+    /// <list type="bullet">
+    /// <item>
+    /// <description>false: they are opaque and mutually exclusive (e.g. sprites in a cable coil). <b>Default value</b></description>
+    /// </item>
+    /// <item>
+    /// <description>true: they are transparent and thus layered one over another in ascending order first</description>
+    /// </item>
+    /// </list>
+    ///
+    /// </summary>
+    [DataField("composite")]
+    public bool IsComposite;
+
+    /// <summary>
+    /// Sprite layers used in stack visualizer. Sprites first in layer correspond to lower stack states
+    /// e.g. <code>_spriteLayers[0]</code> is lower stack level than <code>_spriteLayers[1]</code>.
+    /// </summary>
+    [DataField]
+    public List<string> LayerStates = new();
+
+    /// <summary>
+    /// An optional function to convert the amounts used to adjust a stack's appearance.
+    /// Useful for different denominations of cash, for example.
+    /// </summary>
+    [DataField]
+    public StackLayerFunction LayerFunction = StackLayerFunction.None;
+}
+
+[Serializable, NetSerializable]
+public sealed class StackComponentState : ComponentState
+{
+    public int Count { get; }
+    public int? MaxCountOverride { get; }
+    public bool Unlimited { get; }
+
+    public StackComponentState(int count, int? maxCountOverride, bool unlimited)
     {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("stackType", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<StackPrototype>))]
-        public string StackTypeId { get; private set; } = default!;
-
-        /// <summary>
-        ///     Current stack count.
-        ///     Do NOT set this directly, use the <see cref="SharedStackSystem.SetCount"/> method instead.
-        /// </summary>
-        [DataField("count")]
-        public int Count { get; set; } = 30;
-
-        /// <summary>
-        ///     Max amount of things that can be in the stack.
-        ///     Overrides the max defined on the stack prototype.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadOnly)]
-        [DataField("maxCountOverride")]
-        public int? MaxCountOverride  { get; set; }
-
-        /// <summary>
-        ///     Set to true to not reduce the count when used.
-        ///     Note that <see cref="Count"/> still limits the amount that can be used at any one time.
-        /// </summary>
-        [DataField("unlimited")]
-        [ViewVariables(VVAccess.ReadOnly)]
-        public bool Unlimited { get; set; }
-
-        [DataField("throwIndividually"), ViewVariables(VVAccess.ReadWrite)]
-        public bool ThrowIndividually { get; set; } = false;
-
-        [ViewVariables]
-        public bool UiUpdateNeeded { get; set; }
-
-        /// <summary>
-        /// Default IconLayer stack.
-        /// </summary>
-        [DataField("baseLayer")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public string BaseLayer = "";
-
-        /// <summary>
-        /// Determines if the visualizer uses composite or non-composite layers for icons. Defaults to false.
-        ///
-        /// <list type="bullet">
-        /// <item>
-        /// <description>false: they are opaque and mutually exclusive (e.g. sprites in a cable coil). <b>Default value</b></description>
-        /// </item>
-        /// <item>
-        /// <description>true: they are transparent and thus layered one over another in ascending order first</description>
-        /// </item>
-        /// </list>
-        ///
-        /// </summary>
-        [DataField("composite")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool IsComposite;
-
-        /// <summary>
-        /// Sprite layers used in stack visualizer. Sprites first in layer correspond to lower stack states
-        /// e.g. <code>_spriteLayers[0]</code> is lower stack level than <code>_spriteLayers[1]</code>.
-        /// </summary>
-        [DataField("layerStates")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public List<string> LayerStates = new();
-
-        /// <summary>
-        /// An optional function to convert the amounts used to adjust a stack's appearance.
-        /// Useful for different denominations of cash, for example.
-        /// </summary>
-        [DataField]
-        public StackLayerFunction LayerFunction = StackLayerFunction.None;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class StackComponentState : ComponentState
-    {
-        public int Count { get; }
-        public int? MaxCount { get; }
-
-        public StackComponentState(int count, int? maxCount)
-        {
-            Count = count;
-            MaxCount = maxCount;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public enum StackLayerFunction : byte
-    {
-        // <summary>
-        // No operation performed.
-        // </summary>
-        None,
-
-        // <summary>
-        // Arbitrarily thresholds the stack amount for each layer.
-        // Expects entity to have StackLayerThresholdComponent.
-        // </summary>
-        Threshold
+        Count = count;
+        MaxCountOverride = maxCountOverride;
+        Unlimited = unlimited;
     }
 }
+
+[Serializable, NetSerializable]
+public enum StackLayerFunction : byte
+{
+    // <summary>
+    // No operation performed.
+    // </summary>
+    None,
+
+    // <summary>
+    // Arbitrarily thresholds the stack amount for each layer.
+    // Expects entity to have StackLayerThresholdComponent.
+    // </summary>
+    Threshold
+}
diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index d72380da62..dfc9d4a997 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -1,38 +1,50 @@
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Stacks;
 
+/// <summary>
+/// Prototype used to combine and spawn like-entities for <see cref="SharedStackSystem"/>.
+/// </summary>
 [Prototype]
-public sealed partial class StackPrototype : IPrototype
+public sealed partial class StackPrototype : IPrototype, IInheritingPrototype
 {
-    [ViewVariables]
+    ///  <inheritdoc />
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    ///  <inheritdoc />
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<StackPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    ///  <inheritdoc />
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; private set; }
+
     /// <summary>
-    ///     Human-readable name for this stack type e.g. "Steel"
+    /// Human-readable name for this stack type e.g. "Steel"
     /// </summary>
     /// <remarks>This is a localization string ID.</remarks>
     [DataField]
     public LocId Name { get; private set; } = string.Empty;
 
     /// <summary>
-    ///     An icon that will be used to represent this stack type.
+    /// An icon that will be used to represent this stack type.
     /// </summary>
     [DataField]
     public SpriteSpecifier? Icon { get; private set; }
 
     /// <summary>
-    ///     The entity id that will be spawned by default from this stack.
+    /// The entity id that will be spawned by default from this stack.
     /// </summary>
     [DataField(required: true)]
-    public EntProtoId Spawn { get; private set; } = string.Empty;
+    public EntProtoId<StackComponent> 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.
+    /// 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]
     public int? MaxCount { get; private set; }
diff --git a/Content.Shared/Stacks/StackVisuals.cs b/Content.Shared/Stacks/StackVisuals.cs
index 2f29b303fb..49f3e830d8 100644
--- a/Content.Shared/Stacks/StackVisuals.cs
+++ b/Content.Shared/Stacks/StackVisuals.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Stacks
         Actual,
         /// <summary>
         /// The total amount of elements in the stack. If unspecified, the visualizer assumes
-        /// its
+        /// it's StackComponent.LayerStates.Count
         /// </summary>
         MaxCount,
         Hide
diff --git a/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs b/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs
index 27764b3aee..a7c772434c 100644
--- a/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs
+++ b/Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs
@@ -35,7 +35,8 @@ public sealed partial class StatusEffectComponent : Component
     /// <summary>
     /// If true, this status effect has been applied. Used to ensure that <see cref="StatusEffectAppliedEvent"/> only fires once.
     /// </summary>
-    [DataField, AutoNetworkedField]
+    /// We actually don't want to network this, that way client can apply an effect it's receiving properly!
+    [DataField]
     public bool Applied;
 
     /// <summary>
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
index 905ad98c6c..0d153ecfaa 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
@@ -1,6 +1,9 @@
+using System.ComponentModel.Design;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.StatusEffectNew.Components;
 using Robust.Shared.Prototypes;
+using YamlDotNet.Core.Tokens;
 
 namespace Content.Shared.StatusEffectNew;
 
@@ -291,6 +294,21 @@ public sealed partial class StatusEffectsSystem
         return false;
     }
 
+    /// <summary>
+    /// A method which specifically removes time from a status effect, or removes the status effect if time is null.
+    /// </summary>
+    /// <param name="uid">The target entity on which the effect is applied.</param>
+    /// <param name="effectProto">The prototype ID of the status effect to modify.</param>
+    /// <param name="time">
+    /// The time adjustment to apply to the status effect. Positive values extend the duration,
+    /// while negative values reduce it.
+    /// </param>
+    /// <returns> True if duration was edited successfully, false otherwise.</returns>
+    public bool TryRemoveTime(EntityUid uid, EntProtoId effectProto, TimeSpan? time)
+    {
+        return time == null ? TryRemoveStatusEffect(uid, effectProto) : TryAddTime(uid, effectProto, time.Value);
+    }
+
     /// <summary>
     /// Attempts to set the remaining time for a status effect on an entity.
     /// </summary>
diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
index 966878b4e3..82915b002a 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
@@ -51,7 +51,7 @@ public sealed partial class StatusEffectsSystem : EntitySystem
             if (effect.EndEffectTime is null)
                 continue;
 
-            if (!(_timing.CurTime >= effect.EndEffectTime))
+            if (_timing.CurTime < effect.EndEffectTime)
                 continue;
 
             if (effect.AppliedTo is null)
@@ -81,14 +81,14 @@ public sealed partial class StatusEffectsSystem : EntitySystem
         if (args.Container.ID != StatusEffectContainerComponent.ContainerId)
             return;
 
-        if (!TryComp<StatusEffectComponent>(args.Entity, out var statusComp))
+        if (!_effectQuery.TryComp(args.Entity, out var statusComp))
             return;
 
         // Make sure AppliedTo is set correctly so events can rely on it
         if (statusComp.AppliedTo != ent)
         {
             statusComp.AppliedTo = ent;
-            Dirty(args.Entity, statusComp);
+            DirtyField(args.Entity, statusComp, nameof(StatusEffectComponent.AppliedTo));
         }
     }
 
@@ -97,7 +97,7 @@ public sealed partial class StatusEffectsSystem : EntitySystem
         if (args.Container.ID != StatusEffectContainerComponent.ContainerId)
             return;
 
-        if (!TryComp<StatusEffectComponent>(args.Entity, out var statusComp))
+        if (!_effectQuery.TryComp(args.Entity, out var statusComp))
             return;
 
         var ev = new StatusEffectRemovedEvent(ent);
@@ -127,20 +127,17 @@ public sealed partial class StatusEffectsSystem : EntitySystem
     /// <returns>Returns true if the effect is applied.</returns>
     private bool TryApplyStatusEffect(Entity<StatusEffectComponent> statusEffectEnt)
     {
-        if (!statusEffectEnt.Comp.Applied &&
-            statusEffectEnt.Comp.AppliedTo != null &&
-            _timing.CurTime >= statusEffectEnt.Comp.StartEffectTime)
-        {
-            var ev = new StatusEffectAppliedEvent(statusEffectEnt.Comp.AppliedTo.Value);
-            RaiseLocalEvent(statusEffectEnt, ref ev);
+        if (statusEffectEnt.Comp.Applied ||
+            statusEffectEnt.Comp.AppliedTo == null ||
+            _timing.CurTime < statusEffectEnt.Comp.StartEffectTime)
+            return false;
 
-            statusEffectEnt.Comp.Applied = true;
+        var ev = new StatusEffectAppliedEvent(statusEffectEnt.Comp.AppliedTo.Value);
+        RaiseLocalEvent(statusEffectEnt, ref ev);
 
-            DirtyField(statusEffectEnt, statusEffectEnt.Comp, nameof(StatusEffectComponent.StartEffectTime));
-            return true;
-        }
+        statusEffectEnt.Comp.Applied = true;
 
-        return false;
+        return true;
     }
 
     public bool CanAddStatusEffect(EntityUid uid, EntProtoId effectProto)
@@ -207,7 +204,7 @@ public sealed partial class StatusEffectsSystem : EntitySystem
         var startTime = delay == null ? TimeSpan.Zero : _timing.CurTime + delay.Value;
         SetStatusEffectStartTime(effect.Value, startTime);
 
-        TryApplyStatusEffect((effect.Value, effectComp));
+        TryApplyStatusEffect((statusEffect.Value, effectComp));
 
         return true;
     }
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index e4f0aa8b23..cda5eb5263 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -587,7 +587,7 @@ public abstract class SharedStorageSystem : EntitySystem
                 }
 
                 _entList.Add(entity);
-                delay += itemSize.Weight * AreaInsertDelayPerItem;
+                delay += itemSize.Weight;
 
                 if (_entList.Count >= StorageComponent.AreaPickupLimit)
                     break;
@@ -596,7 +596,7 @@ public abstract class SharedStorageSystem : EntitySystem
             //If there's only one then let's be generous
             if (_entList.Count >= 1)
             {
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
+                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay * AreaInsertDelayPerItem, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
                 {
                     BreakOnDamage = true,
                     BreakOnMove = true,
@@ -1219,7 +1219,7 @@ public abstract class SharedStorageSystem : EntitySystem
             if (!_stackQuery.TryGetComponent(ent, out var containedStack))
                 continue;
 
-            if (!_stack.TryAdd(insertEnt, ent, insertStack, containedStack))
+            if (!_stack.TryMergeStacks((insertEnt, insertStack), (ent, containedStack), out var _))
                 continue;
 
             stackedEntity = ent;
@@ -1773,7 +1773,7 @@ public abstract class SharedStorageSystem : EntitySystem
         return GetCumulativeItemAreas(uid) < uid.Comp.Grid.GetArea() || HasSpaceInStacks(uid);
     }
 
-    private bool HasSpaceInStacks(Entity<StorageComponent?> uid, string? stackType = null)
+    private bool HasSpaceInStacks(Entity<StorageComponent?> uid, ProtoId<StackPrototype>? stackType = null)
     {
         if (!Resolve(uid, ref uid.Comp))
             return false;
@@ -1783,7 +1783,7 @@ public abstract class SharedStorageSystem : EntitySystem
             if (!_stackQuery.TryGetComponent(contained, out var stack))
                 continue;
 
-            if (stackType != null && !stack.StackTypeId.Equals(stackType))
+            if (stackType != null && stack.StackTypeId != stackType)
                 continue;
 
             if (_stack.GetAvailableSpace(stack) == 0)
diff --git a/Content.Shared/Store/CurrencyPrototype.cs b/Content.Shared/Store/CurrencyPrototype.cs
index fdd113d3a2..2b7e3d807b 100644
--- a/Content.Shared/Store/CurrencyPrototype.cs
+++ b/Content.Shared/Store/CurrencyPrototype.cs
@@ -23,18 +23,18 @@ public sealed partial class CurrencyPrototype : IPrototype
     /// doesn't necessarily refer to the full name of the currency, only
     /// that which is displayed to the user.
     /// </summary>
-    [DataField("displayName")]
+    [DataField]
     public string DisplayName { get; private set; } = string.Empty;
 
     /// <summary>
     /// The physical entity of the currency
     /// </summary>
-    [DataField("cash", customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer<FixedPoint2, EntityPrototype>))]
-    public Dictionary<FixedPoint2, string>? Cash { get; private set; }
+    [DataField]
+    public Dictionary<FixedPoint2, EntProtoId>? Cash { get; private set; }
 
     /// <summary>
     /// Whether or not this currency can be withdrawn from a shop by a player. Requires a valid entityId.
     /// </summary>
-    [DataField("canWithdraw")]
+    [DataField]
     public bool CanWithdraw { get; private set; } = true;
 }
diff --git a/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs b/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs
new file mode 100644
index 0000000000..dea2c25e6e
--- /dev/null
+++ b/Content.Shared/Store/Events/IntrinsicStoreActionEvent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared.Store.Events;
+
+/// <summary>
+/// Opens a store specified by <see cref="StoreComponent"/>
+/// Used for entities with a store built into themselves like Revenant or PAI
+/// </summary>
+public sealed partial class IntrinsicStoreActionEvent : InstantActionEvent
+{
+}
diff --git a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
index f484bd012e..ae8f970623 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
@@ -95,7 +95,7 @@ public abstract partial class SharedStunSystem
 
     private void OnRejuvenate(Entity<KnockedDownComponent> entity, ref RejuvenateEvent args)
     {
-        SetKnockdownNextUpdate((entity, entity), GameTiming.CurTime);
+        SetKnockdownNextUpdate(entity, GameTiming.CurTime);
 
         if (entity.Comp.AutoStand)
             RemComp<KnockedDownComponent>(entity);
@@ -166,7 +166,7 @@ public abstract partial class SharedStunSystem
         if (!Resolve(entity, ref entity.Comp, false))
             return;
 
-        SetKnockdownNextUpdate(entity, GameTiming.CurTime + time);
+        SetKnockdownNextUpdate((entity, entity.Comp), GameTiming.CurTime + time);
     }
 
     /// <summary>
@@ -227,11 +227,8 @@ public abstract partial class SharedStunSystem
     /// </summary>
     /// <param name="entity">Entity whose timer we're updating</param>
     /// <param name="time">The exact time we're setting the next update to.</param>
-    private void SetKnockdownNextUpdate(Entity<KnockedDownComponent?> entity, TimeSpan time)
+    private void SetKnockdownNextUpdate(Entity<KnockedDownComponent> entity, TimeSpan time)
     {
-        if (!Resolve(entity, ref entity.Comp, false))
-            return;
-
         if (GameTiming.CurTime > time)
             time = GameTiming.CurTime;
 
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index dcf9ee4f60..8bb5949c23 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -288,9 +288,12 @@ public abstract partial class SharedStunSystem : EntitySystem
         }
     }
 
-    public bool TryAddParalyzeDuration(EntityUid uid, TimeSpan duration)
+    public bool TryAddParalyzeDuration(EntityUid uid, TimeSpan? duration)
     {
-        if (!_status.TryAddStatusEffectDuration(uid, StunId, duration))
+        if (duration == null)
+            return TryUpdateParalyzeDuration(uid, duration);
+
+        if (!_status.TryAddStatusEffectDuration(uid, StunId, duration.Value))
             return false;
 
         // We can't exit knockdown when we're stunned, so this prevents knockdown lasting longer than the stun.
diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Shared/Temperature/Components/TemperatureComponent.cs
similarity index 98%
rename from Content.Server/Temperature/Components/TemperatureComponent.cs
rename to Content.Shared/Temperature/Components/TemperatureComponent.cs
index ae2c373b14..b73d1f77d1 100644
--- a/Content.Server/Temperature/Components/TemperatureComponent.cs
+++ b/Content.Shared/Temperature/Components/TemperatureComponent.cs
@@ -4,7 +4,7 @@ using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Temperature.Components;
+namespace Content.Shared.Temperature.Components;
 
 /// <summary>
 /// Handles changing temperature,
diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
index efea2df5af..9561c6dfe1 100644
--- a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
+++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
@@ -1,7 +1,9 @@
 using System.Linq;
+using Content.Shared.Atmos;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Temperature.Components;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Temperature.Systems;
@@ -9,7 +11,7 @@ namespace Content.Shared.Temperature.Systems;
 /// <summary>
 /// This handles predicting temperature based speedup.
 /// </summary>
-public sealed class SharedTemperatureSystem : EntitySystem
+public abstract class SharedTemperatureSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
@@ -77,4 +79,19 @@ public sealed class SharedTemperatureSystem : EntitySystem
             Dirty(uid, temp);
         }
     }
+
+    public virtual void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
+    {
+
+    }
+
+    public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
+    {
+        if (!Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
+        {
+            return Atmospherics.MinimumHeatCapacity;
+        }
+
+        return comp.SpecificHeat * physics.FixturesMass;
+    }
 }
diff --git a/Content.Shared/Throwing/CatchableSystem.cs b/Content.Shared/Throwing/CatchableSystem.cs
index 586397f58b..92ca7062b1 100644
--- a/Content.Shared/Throwing/CatchableSystem.cs
+++ b/Content.Shared/Throwing/CatchableSystem.cs
@@ -56,7 +56,7 @@ public sealed partial class CatchableSystem : EntitySystem
             return;
 
         // TODO: Replace with RandomPredicted once the engine PR is merged
-        var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(ent).Id });
+        var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(ent).Id);
         var rand = new System.Random(seed);
         if (!rand.Prob(ent.Comp.CatchChance))
             return;
diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs
index 298c0390ba..2c6df5ce89 100644
--- a/Content.Shared/Tiles/FloorTileSystem.cs
+++ b/Content.Shared/Tiles/FloorTileSystem.cs
@@ -144,7 +144,7 @@ public sealed class FloorTileSystem : EntitySystem
 
                 if (HasBaseTurf(currentTileDefinition, baseTurf.ID))
                 {
-                    if (!_stackSystem.Use(uid, 1, stack))
+                    if (!_stackSystem.TryUse((uid, stack), 1))
                         continue;
 
                     PlaceAt(args.User, gridUid, mapGrid, location, currentTileDefinition.TileId, component.PlaceTileSound);
@@ -154,7 +154,7 @@ public sealed class FloorTileSystem : EntitySystem
             }
             else if (HasBaseTurf(currentTileDefinition, ContentTileDefinition.SpaceID))
             {
-                if (!_stackSystem.Use(uid, 1, stack))
+                if (!_stackSystem.TryUse((uid, stack), 1))
                     continue;
 
                 args.Handled = true;
diff --git a/Content.Shared/Traits/Assorted/NarcolepsySystem.cs b/Content.Shared/Traits/Assorted/NarcolepsySystem.cs
index 7bce80c703..f59a1cf281 100644
--- a/Content.Shared/Traits/Assorted/NarcolepsySystem.cs
+++ b/Content.Shared/Traits/Assorted/NarcolepsySystem.cs
@@ -53,7 +53,7 @@ public sealed class NarcolepsySystem : EntitySystem
                 continue;
 
             // TODO: Replace with RandomPredicted once the engine PR is merged
-            var seed = SharedRandomExtensions.HashCodeCombine(new() { (int)_timing.CurTick.Value, GetNetEntity(uid).Id });
+            var seed = SharedRandomExtensions.HashCodeCombine((int)_timing.CurTick.Value, GetNetEntity(uid).Id);
             var rand = new System.Random(seed);
 
             var duration = narcolepsy.MinDurationOfIncident + (narcolepsy.MaxDurationOfIncident - narcolepsy.MinDurationOfIncident) * rand.NextDouble();
diff --git a/Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs
new file mode 100644
index 0000000000..32fb4d7d29
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/MindRoleTriggerConditionComponent.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Checks if a triggered entity or the user of a trigger has a certain mindrole.
+/// Cancels the trigger otherwise.
+/// </summary>
+/// <remarks>
+/// Mind roles are only networked to their owner! So if you use this on any other entity than yourself it won't be predicted.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class MindRoleTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Whitelist for what mind role components on the owning entity allow this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? EntityWhitelist;
+
+    /// <summary>
+    /// Whitelist for what mind role components on the User allow this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? UserWhitelist;
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
index a2779f79c6..7ec6188ee3 100644
--- a/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
+++ b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
@@ -4,20 +4,20 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Trigger.Components.Conditions;
 
 /// <summary>
-/// Checks if the user of a trigger satisfies a whitelist and blacklist condition for the triggered entity or the one triggering it.
+/// Checks if the user of a trigger satisfies a whitelist and blacklist condition.
 /// Cancels the trigger otherwise.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class WhitelistTriggerConditionComponent : BaseTriggerConditionComponent
 {
     /// <summary>
-    /// Whitelist for what entites can cause this trigger.
+    /// Whitelist for what entities can cause this trigger.
     /// </summary>
     [DataField, AutoNetworkedField]
     public EntityWhitelist? UserWhitelist;
 
     /// <summary>
-    /// Blacklist for what entites can cause this trigger.
+    /// Blacklist for what entities can cause this trigger.
     /// </summary>
     [DataField, AutoNetworkedField]
     public EntityWhitelist? UserBlacklist;
diff --git a/Content.Shared/Trigger/Components/Effects/AddSolutionOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AddSolutionOnTriggerComponent.cs
new file mode 100644
index 0000000000..76b45278a7
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AddSolutionOnTriggerComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.GameStates;
+using Content.Shared.Chemistry.Components;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Adds reagents to the specified solution when the trigger is activated.
+/// If TargetUser is true the user will have the solution added instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AddSolutionOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The name of the solution to add to.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public string Solution = string.Empty;
+
+    /// <summary>
+    /// The reagent(s) to be added in the solution.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public Solution AddedSolution = default!;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/EntityEffectOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/EntityEffectOnTriggerComponent.cs
new file mode 100644
index 0000000000..326312db65
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/EntityEffectOnTriggerComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.EntityEffects;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Applies a list of entity effects to the owning entity when triggered.
+/// If TargetUser is true then they will be applied to the user instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class EntityEffectOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The effects to apply.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityEffect[] Effects;
+
+    /// <summary>
+    /// Optional scale multiplier for the effects.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Scale = 1f;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/LaunchOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/LaunchOnTriggerComponent.cs
new file mode 100644
index 0000000000..e86fe9cef1
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/LaunchOnTriggerComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Launches the owner of this component when triggered.
+/// If TargetUser is true, this launches the entity that was collided with instead (because the "user" is the thing that's caused the collision, i.e. the other object).
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class LaunchOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// A linear impulse applied to the target, measured in kg * m / s
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Impulse = 10.0f;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/RejuventateOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/RejuventateOnTriggerComponent.cs
new file mode 100644
index 0000000000..5efc50c361
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/RejuventateOnTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Rejuvenates the entity when triggered, which fully heals them, removing all damage, debuffs or other negative status effects.
+/// If TargetUser is true then the user will be rejuvenated instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RejuvenateOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs
new file mode 100644
index 0000000000..f7a86c0ce3
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Component put on the hitscan entity.
+/// Triggers when a hitscan raycast is fired.
+/// The user is the player shooting it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnHitscanFiredComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs
new file mode 100644
index 0000000000..4520578a8f
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Component put on the hitscan entity.
+/// Triggers when a hitscan raycast is fired, but only if an entity got hit.
+/// The user is the entity that got hit.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnHitscanHitComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs
index 974d5322e0..1f6c62f6b6 100644
--- a/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs
@@ -21,6 +21,12 @@ public sealed partial class TriggerOnVoiceComponent : BaseTriggerOnXComponent
     [DataField, AutoNetworkedField]
     public string? KeyPhrase;
 
+    /// <summary>
+    /// The default keyphrase that is used when the trigger's keyphrase is reset.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? DefaultKeyPhrase;
+
     /// <summary>
     /// Range in which we listen for the keyphrase.
     /// </summary>
@@ -75,6 +81,12 @@ public sealed partial class TriggerOnVoiceComponent : BaseTriggerOnXComponent
     [DataField, AutoNetworkedField]
     public LocId? RecordingVerbMessage;
 
+    /// <summary>
+    /// The verb text that is shown when you can reset keyphrase to default.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ResetRecordingVerb = "trigger-on-voice-default";
+
     /// <summary>
     /// The verb text that is shown when you can clear a recording.
     /// </summary>
diff --git a/Content.Shared/Trigger/SharedTriggerSystems.cs b/Content.Shared/Trigger/SharedTriggerSystems.cs
new file mode 100644
index 0000000000..bb500398c3
--- /dev/null
+++ b/Content.Shared/Trigger/SharedTriggerSystems.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger;
+
+/// <summary>
+/// This is a base Trigger system which handles all the boilerplate for triggers automagically!
+/// </summary>
+public abstract class TriggerOnXSystem : EntitySystem
+{
+    [Dependency] protected readonly TriggerSystem Trigger = default!;
+}
+
+/// <summary>
+/// This is a base Trigger system which handles all the boilerplate for triggers automagically!
+/// </summary>
+public abstract class XOnTriggerSystem<T> : EntitySystem where T : BaseXOnTriggerComponent
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<T, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<T> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target is not { } uid)
+            return;
+
+        OnTrigger(ent, uid, ref args);
+    }
+
+    protected abstract void OnTrigger(Entity<T> ent, EntityUid target, ref TriggerEvent args);
+}
diff --git a/Content.Shared/Trigger/Systems/ComponentsOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ComponentsOnTriggerSystem.cs
index f4e144b7ce..ab654273f0 100644
--- a/Content.Shared/Trigger/Systems/ComponentsOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/ComponentsOnTriggerSystem.cs
@@ -2,71 +2,44 @@ using Content.Shared.Trigger.Components.Effects;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed partial class ComponentsOnTriggerSystem : EntitySystem
+public sealed partial class AddComponentsOnTriggerSystem : XOnTriggerSystem<AddComponentsOnTriggerComponent>
 {
-    public override void Initialize()
+    protected override void OnTrigger(Entity<AddComponentsOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<AddComponentsOnTriggerComponent, TriggerEvent>(HandleAddTrigger);
-        SubscribeLocalEvent<RemoveComponentsOnTriggerComponent, TriggerEvent>(HandleRemoveTrigger);
-        SubscribeLocalEvent<ToggleComponentsOnTriggerComponent, TriggerEvent>(HandleToggleTrigger);
-    }
-
-    private void HandleAddTrigger(Entity<AddComponentsOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
         if (ent.Comp.TriggerOnce && ent.Comp.Triggered)
             return;
 
-        EntityManager.AddComponents(target.Value, ent.Comp.Components, ent.Comp.RemoveExisting);
+        EntityManager.AddComponents(target, ent.Comp.Components, ent.Comp.RemoveExisting);
         ent.Comp.Triggered = true;
         Dirty(ent);
 
         args.Handled = true;
     }
+}
 
-    private void HandleRemoveTrigger(Entity<RemoveComponentsOnTriggerComponent> ent, ref TriggerEvent args)
+public sealed partial class RemoveComponentsOnTriggerSystem : XOnTriggerSystem<RemoveComponentsOnTriggerComponent>
+{
+    protected override void OnTrigger(Entity<RemoveComponentsOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
         if (ent.Comp.TriggerOnce && ent.Comp.Triggered)
             return;
 
-        EntityManager.RemoveComponents(target.Value, ent.Comp.Components);
+        EntityManager.RemoveComponents(target, ent.Comp.Components);
         ent.Comp.Triggered = true;
         Dirty(ent);
 
         args.Handled = true;
     }
+}
 
-    private void HandleToggleTrigger(Entity<ToggleComponentsOnTriggerComponent> ent, ref TriggerEvent args)
+public sealed partial class ToggleComponentsOnTriggerSystem : XOnTriggerSystem<ToggleComponentsOnTriggerComponent>
+{
+    protected override void OnTrigger(Entity<ToggleComponentsOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
         if (!ent.Comp.ComponentsAdded)
-            EntityManager.AddComponents(target.Value, ent.Comp.Components, ent.Comp.RemoveExisting);
+            EntityManager.AddComponents(target, ent.Comp.Components, ent.Comp.RemoveExisting);
         else
-            EntityManager.RemoveComponents(target.Value, ent.Comp.Components);
+            EntityManager.RemoveComponents(target, ent.Comp.Components);
 
         ent.Comp.ComponentsAdded = !ent.Comp.ComponentsAdded;
         Dirty(ent);
diff --git a/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs
index 8f30c852ea..cdcb1044f7 100644
--- a/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs
@@ -3,29 +3,14 @@ using Content.Shared.Trigger.Components.Effects;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class DamageOnTriggerSystem : EntitySystem
+public sealed class DamageOnTriggerSystem : XOnTriggerSystem<DamageOnTriggerComponent>
 {
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<DamageOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<DamageOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<DamageOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
         var damage = new DamageSpecifier(ent.Comp.Damage);
-        var ev = new BeforeDamageOnTriggerEvent(damage, target.Value);
+        var ev = new BeforeDamageOnTriggerEvent(damage, target);
         RaiseLocalEvent(ent.Owner, ref ev);
 
         args.Handled |= _damageableSystem.TryChangeDamage(target, ev.Damage, ent.Comp.IgnoreResistances, origin: ent.Owner) is not null;
diff --git a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
index db27bd7f74..51bf4e8659 100644
--- a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
@@ -9,7 +9,7 @@ using Robust.Shared.Network;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class DnaScrambleOnTriggerSystem : EntitySystem
+public sealed class DnaScrambleOnTriggerSystem : XOnTriggerSystem<DnaScrambleOnTriggerComponent>
 {
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidAppearance = default!;
@@ -18,23 +18,8 @@ public sealed class DnaScrambleOnTriggerSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly INetManager _net = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<DnaScrambleOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<DnaScrambleOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<DnaScrambleOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
         if (!TryComp<HumanoidAppearanceComponent>(target, out var humanoid))
             return;
 
@@ -46,17 +31,29 @@ public sealed class DnaScrambleOnTriggerSystem : EntitySystem
             return;
 
         var newProfile = HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species);
-        _humanoidAppearance.LoadProfile(target.Value, newProfile, humanoid);
-        _metaData.SetEntityName(target.Value, newProfile.Name, raiseEvents: false); // raising events would update ID card, station record, etc.
+        _humanoidAppearance.LoadProfile(target, newProfile, humanoid);
+        _metaData.SetEntityName(target, newProfile.Name, raiseEvents: false); // raising events would update ID card, station record, etc.
 
         // If the entity has the respective components, then scramble the dna and fingerprint strings.
-        _forensics.RandomizeDNA(target.Value);
-        _forensics.RandomizeFingerprint(target.Value);
+        _forensics.RandomizeDNA(target);
+        _forensics.RandomizeFingerprint(target);
 
-        RemComp<DetailExaminableComponent>(target.Value); // remove MRP+ custom description if one exists
-        _identity.QueueIdentityUpdate(target.Value); // manually queue identity update since we don't raise the event
+        RemComp<DetailExaminableComponent>(target); // remove MRP+ custom description if one exists
+        _identity.QueueIdentityUpdate(target); // manually queue identity update since we don't raise the event
 
         // Can't use PopupClient or PopupPredicted because the trigger might be unpredicted.
-        _popup.PopupEntity(Loc.GetString("scramble-on-trigger-popup"), target.Value, target.Value);
+        _popup.PopupEntity(Loc.GetString("scramble-on-trigger-popup"), target, target);
+
+        var ev = new DnaScrambledEvent(target);
+        RaiseLocalEvent(target, ref ev, true);
     }
 }
+
+/// <summary>
+/// Raised after an entity has been DNA Scrambled.
+/// Useful for forks that need to run their own updates here.
+/// </summary>
+/// <param name="flag">The entity that had its DNA scrambled.</param>
+
+[ByRefEvent]
+public record struct DnaScrambledEvent(EntityUid Target);
diff --git a/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs
index e296ccc177..b2ad01dd9a 100644
--- a/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs
@@ -4,29 +4,14 @@ using Robust.Shared.Network;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class EmitSoundOnTriggerSystem : EntitySystem
+public sealed class EmitSoundOnTriggerSystem : XOnTriggerSystem<EmitSoundOnTriggerComponent>
 {
     [Dependency] private readonly INetManager _netMan = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<EmitSoundOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<EmitSoundOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
-        args.Handled |= TryEmitSound(ent, target.Value, args.User);
+        args.Handled |= TryEmitSound(ent, target, args.User);
     }
 
     private bool TryEmitSound(Entity<EmitSoundOnTriggerComponent> ent, EntityUid target, EntityUid? user = null)
diff --git a/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs
index 50fb7a25e4..6cefafcadc 100644
--- a/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs
@@ -3,28 +3,13 @@ using Content.Shared.Trigger.Components.Effects;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class EmpOnTriggerSystem : EntitySystem
+public sealed class EmpOnTriggerSystem : XOnTriggerSystem<EmpOnTriggerComponent>
 {
     [Dependency] private readonly SharedEmpSystem _emp = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<EmpOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<EmpOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<EmpOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
-        _emp.EmpPulse(Transform(target.Value).Coordinates, ent.Comp.Range, ent.Comp.EnergyConsumption, ent.Comp.DisableDuration, args.User);
+        _emp.EmpPulse(Transform(target).Coordinates, ent.Comp.Range, ent.Comp.EnergyConsumption, ent.Comp.DisableDuration, args.User);
         args.Handled = true;
     }
 }
diff --git a/Content.Shared/Trigger/Systems/EntityEffectOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EntityEffectOnTriggerSystem.cs
new file mode 100644
index 0000000000..294bf9660f
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/EntityEffectOnTriggerSystem.cs
@@ -0,0 +1,15 @@
+using Content.Shared.EntityEffects;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class EntityEffectOnTriggerSystem : XOnTriggerSystem<EntityEffectOnTriggerComponent>
+{
+    [Dependency] private readonly SharedEntityEffectsSystem _effects = default!;
+
+    protected override void OnTrigger(Entity<EntityEffectOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
+    {
+        _effects.ApplyEffects(target, ent.Comp.Effects, ent.Comp.Scale);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
index 120aa23a9d..239d490820 100644
--- a/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
@@ -3,52 +3,32 @@ using Content.Shared.Trigger.Components.Effects;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class ExplodeOnTriggerSystem : EntitySystem
+public sealed class ExplodeOnTriggerSystem : XOnTriggerSystem<ExplodeOnTriggerComponent>
 {
     [Dependency] private readonly SharedExplosionSystem _explosion = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<ExplodeOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<ExplodeOnTriggerComponent, TriggerEvent>(OnExplodeTrigger);
-        SubscribeLocalEvent<ExplosionOnTriggerComponent, TriggerEvent>(OnQueueExplosionTrigger);
-    }
-
-    private void OnExplodeTrigger(Entity<ExplodeOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
-        _explosion.TriggerExplosive(target.Value, user: args.User);
-        args.Handled = true;
-    }
-
-    private void OnQueueExplosionTrigger(Entity<ExplosionOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        var (uid, comp) = ent;
-        if (args.Key != null && !comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = comp.TargetUser ? args.User : uid;
-
-        if (target == null)
-            return;
-
-        _explosion.QueueExplosion(target.Value,
-                                    comp.ExplosionType,
-                                    comp.TotalIntensity,
-                                    comp.IntensitySlope,
-                                    comp.MaxTileIntensity,
-                                    comp.TileBreakScale,
-                                    comp.MaxTileBreak,
-                                    comp.CanCreateVacuum,
-                                    args.User);
+        _explosion.TriggerExplosive(target, user: args.User);
+        args.Handled = true;
+    }
+}
+
+public sealed class ExplosionOnTriggerSystem : XOnTriggerSystem<ExplosionOnTriggerComponent>
+{
+    [Dependency] private readonly SharedExplosionSystem _explosion = default!;
+
+    protected override void OnTrigger(Entity<ExplosionOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
+    {
+        _explosion.QueueExplosion(target,
+            ent.Comp.ExplosionType,
+            ent.Comp.TotalIntensity,
+            ent.Comp.IntensitySlope,
+            ent.Comp.MaxTileIntensity,
+            ent.Comp.TileBreakScale,
+            ent.Comp.MaxTileBreak,
+            ent.Comp.CanCreateVacuum,
+            args.User);
         args.Handled = true;
     }
 }
diff --git a/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs
index 6153e228bf..ca2dee6274 100644
--- a/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs
@@ -3,28 +3,13 @@ using Content.Shared.Trigger.Components.Effects;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class FlashOnTriggerSystem : EntitySystem
+public sealed class FlashOnTriggerSystem : XOnTriggerSystem<FlashOnTriggerComponent>
 {
     [Dependency] private readonly SharedFlashSystem _flash = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<FlashOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<FlashOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<FlashOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
-        _flash.FlashArea(target.Value, args.User, ent.Comp.Range, ent.Comp.Duration, probability: ent.Comp.Probability);
+        _flash.FlashArea(target, args.User, ent.Comp.Range, ent.Comp.Duration, probability: ent.Comp.Probability);
         args.Handled = true;
     }
 }
diff --git a/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
index 95ef5ec1db..237c925716 100644
--- a/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
@@ -4,37 +4,23 @@ using Content.Shared.Trigger.Components.Effects;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class GibOnTriggerSystem : EntitySystem
+public sealed class GibOnTriggerSystem : XOnTriggerSystem<GibOnTriggerComponent>
 {
     [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<GibOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<GibOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<GibOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
         if (ent.Comp.DeleteItems)
         {
-            var items = _inventory.GetHandOrInventoryEntities(target.Value);
+            var items = _inventory.GetHandOrInventoryEntities(target);
             foreach (var item in items)
             {
                 PredictedQueueDel(item);
             }
         }
-        _body.GibBody(target.Value, true);
+
+        _body.GibBody(target, true);
         args.Handled = true;
     }
 }
diff --git a/Content.Shared/Trigger/Systems/LaunchOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/LaunchOnTriggerSystem.cs
new file mode 100644
index 0000000000..8bc7dd16c0
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/LaunchOnTriggerSystem.cs
@@ -0,0 +1,31 @@
+using System.Numerics;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class LaunchOnTriggerSystem : XOnTriggerSystem<LaunchOnTriggerComponent>
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+
+    protected override void OnTrigger(Entity<LaunchOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
+    {
+        if (!TryComp(target, out PhysicsComponent? phys))
+            return;
+
+        var linearVelocity = _physics.GetMapLinearVelocity(target);
+        // If the linear velocity is length 0, this means it's not moving. Given we want to move it in some direction...
+        if (linearVelocity.IsLengthZero())
+            // An object that isn't moving is launched in the direction its facing, not the direction it's rotated (objects face away from their rotation).
+            linearVelocity = _transform.GetWorldRotation(target).RotateVec(Vector2.UnitY) * -1;
+
+        // When triggered, take the direction the target is moving in (the normalized vector) and multiply it by the speed.
+        // Then apply an impulse to the target on the new vector.
+        // (If the target is moving NE at 10 m/s, this impulses it NE at speed m/s)
+        _physics.ApplyLinearImpulse(target, linearVelocity.Normalized() * ent.Comp.Impulse, body: phys);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/LockOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/LockOnTriggerSystem.cs
index 2056d5fe51..3bc8fecc1e 100644
--- a/Content.Shared/Trigger/Systems/LockOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/LockOnTriggerSystem.cs
@@ -3,37 +3,25 @@ using Content.Shared.Trigger.Components.Effects;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class LockOnTriggerSystem : EntitySystem
+public sealed class LockOnTriggerSystem : XOnTriggerSystem<LockOnTriggerComponent>
 {
     [Dependency] private readonly LockSystem _lock = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<LockOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<LockOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<LockOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
         if (!TryComp<LockComponent>(target, out var lockComp))
             return; // prevent the Resolve in Lock/Unlock/ToggleLock from logging errors in case the user does not have the component
 
         switch (ent.Comp.LockMode)
         {
             case LockAction.Lock:
-                _lock.Lock(target.Value, args.User, lockComp);
+                _lock.Lock(target, args.User, lockComp);
                 break;
             case LockAction.Unlock:
-                _lock.Unlock(target.Value, args.User, lockComp);
+                _lock.Unlock(target, args.User, lockComp);
                 break;
             case LockAction.Toggle:
-                _lock.ToggleLock(target.Value, args.User, lockComp);
+                _lock.ToggleLock(target, args.User, lockComp);
                 break;
         }
     }
diff --git a/Content.Shared/Trigger/Systems/PopupOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/PopupOnTriggerSystem.cs
index 65ed216af1..d123c213db 100644
--- a/Content.Shared/Trigger/Systems/PopupOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/PopupOnTriggerSystem.cs
@@ -6,57 +6,49 @@ namespace Content.Shared.Trigger.Systems;
 /// <summary>
 /// This handles <see cref="PopupOnTriggerComponent"/>
 /// </summary>
-public sealed class PopupOnTriggerSystem : EntitySystem
+public sealed class PopupOnTriggerSystem : XOnTriggerSystem<PopupOnTriggerComponent>
 {
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
-    /// <inheritdoc/>
-    public override void Initialize()
+    protected override void OnTrigger(Entity<PopupOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<PopupOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<PopupOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
         // Popups only play for one entity
         if (ent.Comp.Quiet)
         {
             if (ent.Comp.Predicted)
+            {
                 _popup.PopupClient(Loc.GetString(ent.Comp.Text),
-                                    target.Value,
-                                    ent.Comp.UserIsRecipient ? args.User : ent.Owner,
-                                    ent.Comp.PopupType);
+                    target,
+                    ent.Comp.UserIsRecipient ? args.User : ent.Owner,
+                    ent.Comp.PopupType);
+            }
 
             else if (args.User != null)
+            {
                 _popup.PopupEntity(Loc.GetString(ent.Comp.OtherText ?? ent.Comp.Text),
-                                    target.Value,
-                                    args.User.Value,
-                                    ent.Comp.PopupType);
+                    target,
+                    args.User.Value,
+                    ent.Comp.PopupType);
+            }
 
             return;
         }
 
         // Popups play for all entities
         if (ent.Comp.Predicted)
+        {
             _popup.PopupPredicted(Loc.GetString(ent.Comp.Text),
-                                Loc.GetString(ent.Comp.OtherText ?? ent.Comp.Text),
-                                target.Value,
-                                ent.Comp.UserIsRecipient ? args.User : ent.Owner,
-                                ent.Comp.PopupType);
+                Loc.GetString(ent.Comp.OtherText ?? ent.Comp.Text),
+                target,
+                ent.Comp.UserIsRecipient ? args.User : ent.Owner,
+                ent.Comp.PopupType);
+        }
 
         else
+        {
             _popup.PopupEntity(Loc.GetString(ent.Comp.OtherText ?? ent.Comp.Text),
-                                target.Value,
-                                ent.Comp.PopupType);
+                target,
+                ent.Comp.PopupType);
+        }
     }
 }
diff --git a/Content.Shared/Trigger/Systems/RejuvenateOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/RejuvenateOnTriggerSystem.cs
new file mode 100644
index 0000000000..9457c5e6ee
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/RejuvenateOnTriggerSystem.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Administration.Systems;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class RejuvenateOnTriggerSystem : XOnTriggerSystem<RejuvenateOnTriggerComponent>
+{
+    [Dependency] private readonly RejuvenateSystem _rejuvenate = default!;
+
+    protected override void OnTrigger(Entity<RejuvenateOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
+    {
+        _rejuvenate.PerformRejuvenate(target);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs
index 9bedc87b6b..3a9813f322 100644
--- a/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs
@@ -1,32 +1,16 @@
-using Content.Shared.Trigger;
 using Content.Shared.Trigger.Components.Effects;
 using Content.Shared.RepulseAttract;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class RepulseAttractOnTriggerSystem : EntitySystem
+public sealed class RepulseAttractOnTriggerSystem : XOnTriggerSystem<RepulseAttractOnTriggerComponent>
 {
     [Dependency] private readonly RepulseAttractSystem _repulse = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<RepulseAttractOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<RepulseAttractOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<RepulseAttractOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
-        var position = _transform.GetMapCoordinates(target.Value);
+        var position = _transform.GetMapCoordinates(target);
         _repulse.TryRepulseAttract(position, args.User, ent.Comp.Speed, ent.Comp.Range, ent.Comp.Whitelist, ent.Comp.CollisionMask);
 
         args.Handled = true;
diff --git a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
index 163012cec5..a2c280d0d5 100644
--- a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
@@ -14,7 +14,7 @@ using Robust.Shared.Random;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class ScramOnTriggerSystem : EntitySystem
+public sealed class ScramOnTriggerSystem : XOnTriggerSystem<ScramOnTriggerComponent>
 {
     [Dependency] private readonly PullingSystem _pulling = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
@@ -31,24 +31,14 @@ public sealed class ScramOnTriggerSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ScramOnTriggerComponent, TriggerEvent>(OnTrigger);
-
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
     }
 
-    private void OnTrigger(Entity<ScramOnTriggerComponent> ent, ref TriggerEvent args)
+    protected override void OnTrigger(Entity<ScramOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
         // We need stop the user from being pulled so they don't just get "attached" with whoever is pulling them.
         // This can for example happen when the user is cuffed and being pulled.
-        if (TryComp<PullableComponent>(target, out var pull) && _pulling.IsPulled(target.Value, pull))
+        if (TryComp<PullableComponent>(target, out var pull) && _pulling.IsPulled(target, pull))
             _pulling.TryStopPull(ent, pull);
 
         // Check if the user is pulling anything, and drop it if so.
@@ -61,12 +51,12 @@ public sealed class ScramOnTriggerSystem : EntitySystem
         if (_net.IsClient)
             return;
 
-        var xform = Transform(target.Value);
+        var xform = Transform(target);
         var targetCoords = SelectRandomTileInRange(xform, ent.Comp.TeleportRadius);
 
         if (targetCoords != null)
         {
-            _transform.SetCoordinates(target.Value, targetCoords.Value);
+            _transform.SetCoordinates(target, targetCoords.Value);
             args.Handled = true;
         }
     }
diff --git a/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs
index c4d34af7e1..08c5da6ed3 100644
--- a/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs
@@ -4,41 +4,24 @@ using Robust.Shared.Containers;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class ShockOnTriggerSystem : EntitySystem
+public sealed class ShockOnTriggerSystem : XOnTriggerSystem<ShockOnTriggerComponent>
 {
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<ShockOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<ShockOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<ShockOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        EntityUid? target;
+        // Override the normal target if we target the container
         if (ent.Comp.TargetContainer)
         {
             // shock whoever is wearing this clothing item
             if (!_container.TryGetContainingContainer(ent.Owner, out var container))
                 return;
+
             target = container.Owner;
         }
-        else
-        {
-            target = ent.Comp.TargetUser ? args.User : ent.Owner;
-        }
 
-        if (target == null)
-            return;
-
-        _electrocution.TryDoElectrocution(target.Value, null, ent.Comp.Damage, ent.Comp.Duration, true, ignoreInsulation: true);
+        _electrocution.TryDoElectrocution(target, null, ent.Comp.Damage, ent.Comp.Duration, true, ignoreInsulation: true);
         args.Handled = true;
     }
-
 }
diff --git a/Content.Shared/Trigger/Systems/SolutionTriggerSystem.cs b/Content.Shared/Trigger/Systems/SolutionTriggerSystem.cs
new file mode 100644
index 0000000000..a5e1f3d547
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/SolutionTriggerSystem.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Chemistry.EntitySystems;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class SolutionTriggerSystem : XOnTriggerSystem<AddSolutionOnTriggerComponent>
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    protected override void OnTrigger(Entity<AddSolutionOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
+    {
+        if (!_solutionContainer.TryGetSolution(target, ent.Comp.Solution, out var solutionRef, out _))
+            return;
+
+        _solutionContainer.AddSolution(solutionRef.Value, ent.Comp.AddedSolution);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/StaminaDamageOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/StaminaDamageOnTriggerSystem.cs
index 0efa437275..7d159925f9 100644
--- a/Content.Shared/Trigger/Systems/StaminaDamageOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/StaminaDamageOnTriggerSystem.cs
@@ -1,34 +1,18 @@
-using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Trigger.Components.Effects;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class StaminaDamageOnTriggerSystem : EntitySystem
+public sealed class StaminaDamageOnTriggerSystem : XOnTriggerSystem<StaminaDamageOnTriggerComponent>
 {
     [Dependency] private readonly SharedStaminaSystem _stamina = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<StaminaDamageOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<StaminaDamageOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<StaminaDamageOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
-        var ev = new BeforeStaminaDamageOnTriggerEvent(ent.Comp.Stamina, target.Value);
+        var ev = new BeforeStaminaDamageOnTriggerEvent(ent.Comp.Stamina, target);
         RaiseLocalEvent(ent.Owner, ref ev);
 
-        _stamina.TakeStaminaDamage(target.Value, ev.Stamina, source: args.User, with: ent.Owner, ignoreResist: ent.Comp.IgnoreResistances);
+        _stamina.TakeStaminaDamage(target, ev.Stamina, source: args.User, with: ent.Owner, ignoreResist: ent.Comp.IgnoreResistances);
 
         args.Handled = true;
     }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs
index 3825708550..ea5ebac6ea 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs
@@ -3,10 +3,8 @@ using Content.Shared.Trigger.Components.Triggers;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed partial class TriggerOnActivateImplantSystem : EntitySystem
+public sealed partial class TriggerOnActivateImplantSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -16,7 +14,7 @@ public sealed partial class TriggerOnActivateImplantSystem : EntitySystem
 
     private void OnActivateImplant(Entity<TriggerOnActivateImplantComponent> ent, ref ActivateImplantEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.Performer, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Performer, ent.Comp.KeyOut);
         args.Handled = true;
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnContainerInteractionSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnContainerInteractionSystem.cs
index 8fa9308f70..0d6ff4dbc6 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnContainerInteractionSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnContainerInteractionSystem.cs
@@ -7,9 +7,8 @@ namespace Content.Shared.Trigger.Systems;
 /// <summary>
 /// System for creating triggers when entities are inserted into or removed from containers.
 /// </summary>
-public sealed class TriggerOnContainerInteractionSystem : EntitySystem
+public sealed class TriggerOnContainerInteractionSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
     public override void Initialize()
@@ -31,7 +30,7 @@ public sealed class TriggerOnContainerInteractionSystem : EntitySystem
         if (ent.Comp.ContainerId != null && ent.Comp.ContainerId != args.Container.ID)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Entity, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Entity, ent.Comp.KeyOut);
     }
 
     private void OnRemovedFromContainer(Entity<TriggerOnRemovedFromContainerComponent> ent, ref EntRemovedFromContainerMessage args)
@@ -42,7 +41,7 @@ public sealed class TriggerOnContainerInteractionSystem : EntitySystem
         if (ent.Comp.ContainerId != null && ent.Comp.ContainerId != args.Container.ID)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Entity, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Entity, ent.Comp.KeyOut);
     }
 
     // Used by entities to trigger when they are inserted into or removed from a container
@@ -54,7 +53,7 @@ public sealed class TriggerOnContainerInteractionSystem : EntitySystem
         if (ent.Comp.ContainerId != null && ent.Comp.ContainerId != args.Container.ID)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Container.Owner, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Container.Owner, ent.Comp.KeyOut);
     }
 
     private void OnGotRemovedFromContainer(Entity<TriggerOnGotRemovedFromContainerComponent> ent, ref EntGotRemovedFromContainerMessage args)
@@ -65,6 +64,6 @@ public sealed class TriggerOnContainerInteractionSystem : EntitySystem
         if (ent.Comp.ContainerId != null && ent.Comp.ContainerId != args.Container.ID)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Container.Owner, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Container.Owner, ent.Comp.KeyOut);
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs
index cc23fa2b84..2de0f516da 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs
@@ -2,10 +2,8 @@ using Content.Shared.Trigger.Components.Triggers;
 using Content.Shared.Weapons.Ranged.Events;
 
 namespace Content.Shared.Trigger.Systems;
-public sealed partial class TriggerOnEmptyGunshotSystem : EntitySystem
+public sealed partial class TriggerOnEmptyGunshotSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -15,6 +13,6 @@ public sealed partial class TriggerOnEmptyGunshotSystem : EntitySystem
 
     private void OnEmptyGunShot(Entity<TriggerOnEmptyGunshotComponent> ent, ref OnEmptyGunShotEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnEquipmentSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnEquipmentSystem.cs
index bc097ae831..8a122a1f65 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnEquipmentSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnEquipmentSystem.cs
@@ -7,9 +7,8 @@ namespace Content.Shared.Trigger.Systems;
 /// <summary>
 /// System for creating triggers when entities are equipped or unequipped from inventory slots.
 /// </summary>
-public sealed class TriggerOnEquipmentSystem : EntitySystem
+public sealed class TriggerOnEquipmentSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
     public override void Initialize()
@@ -31,7 +30,7 @@ public sealed class TriggerOnEquipmentSystem : EntitySystem
         if ((ent.Comp.SlotFlags & args.SlotFlags) == 0)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Equipment, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Equipment, ent.Comp.KeyOut);
     }
 
     private void OnDidUnequip(Entity<TriggerOnDidUnequipComponent> ent, ref DidUnequipEvent args)
@@ -42,7 +41,7 @@ public sealed class TriggerOnEquipmentSystem : EntitySystem
         if ((ent.Comp.SlotFlags & args.SlotFlags) == 0)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Equipment, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Equipment, ent.Comp.KeyOut);
     }
 
     // Used by entities when they get equipped or unequipped
@@ -54,7 +53,7 @@ public sealed class TriggerOnEquipmentSystem : EntitySystem
         if ((ent.Comp.SlotFlags & args.SlotFlags) == 0)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Equipee, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Equipee, ent.Comp.KeyOut);
     }
 
     private void OnGotUnequipped(Entity<TriggerOnGotUnequippedComponent> ent, ref GotUnequippedEvent args)
@@ -65,6 +64,6 @@ public sealed class TriggerOnEquipmentSystem : EntitySystem
         if ((ent.Comp.SlotFlags & args.SlotFlags) == 0)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Equipee, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Equipee, ent.Comp.KeyOut);
     }
 }
diff --git a/Content.Shared/Trigger/Systems/HandTriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnHandSystem.cs
similarity index 81%
rename from Content.Shared/Trigger/Systems/HandTriggerSystem.cs
rename to Content.Shared/Trigger/Systems/TriggerOnHandSystem.cs
index 8001d5d92f..580d4990a8 100644
--- a/Content.Shared/Trigger/Systems/HandTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnHandSystem.cs
@@ -5,10 +5,9 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed partial class HandTriggerSystem : EntitySystem
+public sealed partial class HandTriggerSystem : TriggerOnXSystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly TriggerSystem _trigger = default!;
 
     public override void Initialize()
     {
@@ -29,7 +28,7 @@ public sealed partial class HandTriggerSystem : EntitySystem
         if (_timing.ApplyingState)
             return;
 
-        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
     }
 
     private void OnGotUnequipped(Entity<TriggerOnGotUnequippedHandComponent> ent, ref GotUnequippedHandEvent args)
@@ -37,7 +36,7 @@ public sealed partial class HandTriggerSystem : EntitySystem
         if (_timing.ApplyingState)
             return;
 
-        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
     }
 
     private void OnDidEquip(Entity<TriggerOnDidEquipHandComponent> ent, ref DidEquipHandEvent args)
@@ -45,7 +44,7 @@ public sealed partial class HandTriggerSystem : EntitySystem
         if (_timing.ApplyingState)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Equipped, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Equipped, ent.Comp.KeyOut);
     }
 
     private void OnDidUnequip(Entity<TriggerOnDidUnequipHandComponent> ent, ref DidUnequipHandEvent args)
@@ -53,12 +52,12 @@ public sealed partial class HandTriggerSystem : EntitySystem
         if (_timing.ApplyingState)
             return;
 
-        _trigger.Trigger(ent.Owner, args.Unequipped, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Unequipped, ent.Comp.KeyOut);
     }
 
     private void OnDropped(Entity<TriggerOnDroppedComponent> ent, ref DroppedEvent args)
     {
         // We don't need the guard statement here because this one is not a container event, but raised directly when interacting.
-        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs
new file mode 100644
index 0000000000..711e76d55e
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Weapons.Hitscan.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class TriggerOnHitscanSystem : TriggerOnXSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnHitscanHitComponent, HitscanRaycastFiredEvent>(OnHit);
+        SubscribeLocalEvent<TriggerOnHitscanFiredComponent, HitscanRaycastFiredEvent>(OnFired);
+    }
+
+    private void OnHit(Entity<TriggerOnHitscanHitComponent> ent, ref HitscanRaycastFiredEvent args)
+    {
+        if (args.Data.HitEntity == null)
+            return;
+
+        Trigger.Trigger(ent.Owner, args.Data.HitEntity, ent.Comp.KeyOut);
+    }
+
+    private void OnFired(Entity<TriggerOnHitscanFiredComponent> ent, ref HitscanRaycastFiredEvent args)
+    {
+        Trigger.Trigger(ent.Owner, args.Data.Shooter, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnLandSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnLandSystem.cs
index 754f285753..64e2e5a5c1 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnLandSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnLandSystem.cs
@@ -3,10 +3,8 @@ using Content.Shared.Trigger.Components.Triggers;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed partial class TriggerOnLandSystem : EntitySystem
+public sealed partial class TriggerOnLandSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -16,6 +14,6 @@ public sealed partial class TriggerOnLandSystem : EntitySystem
 
     private void OnLand(Entity<TriggerOnLandComponent> ent, ref LandEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
     }
 }
diff --git a/Content.Shared/Trigger/Systems/MeleeTriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnMeleeSystem.cs
similarity index 78%
rename from Content.Shared/Trigger/Systems/MeleeTriggerSystem.cs
rename to Content.Shared/Trigger/Systems/TriggerOnMeleeSystem.cs
index b7433a2987..e38afb973a 100644
--- a/Content.Shared/Trigger/Systems/MeleeTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnMeleeSystem.cs
@@ -6,10 +6,8 @@ namespace Content.Shared.Trigger.Systems;
 /// <summary>
 /// Trigger system for melee related triggers.
 /// </summary>
-public sealed class MeleeTriggerSystem : EntitySystem
+public sealed class TriggerOnMeleeTriggerSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -23,7 +21,7 @@ public sealed class MeleeTriggerSystem : EntitySystem
     private void OnMissTrigger(Entity<TriggerOnMeleeMissComponent> ent, ref MeleeHitEvent args)
     {
         if (args.HitEntities.Count == 0)
-            _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+            Trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
     }
 
     private void OnSwingTrigger(Entity<TriggerOnMeleeSwingComponent> ent, ref MeleeHitEvent args)
@@ -34,7 +32,7 @@ public sealed class MeleeTriggerSystem : EntitySystem
         else
             target = ent.Comp.TargetIsUser ? args.HitEntities[0] : args.User;
 
-        _trigger.Trigger(ent.Owner, target, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, target, ent.Comp.KeyOut);
     }
 
     private void OnHitTrigger(Entity<TriggerOnMeleeHitComponent> ent, ref MeleeHitEvent args)
@@ -45,14 +43,14 @@ public sealed class MeleeTriggerSystem : EntitySystem
         if (!ent.Comp.TriggerEveryHit)
         {
             var target = ent.Comp.TargetIsUser ? args.HitEntities[0] : args.User;
-            _trigger.Trigger(ent.Owner, target, ent.Comp.KeyOut);
+            Trigger.Trigger(ent.Owner, target, ent.Comp.KeyOut);
             return;
         }
 
         // if TriggerEveryHit
         foreach (var target in args.HitEntities)
         {
-            _trigger.Trigger(ent.Owner, ent.Comp.TargetIsUser ? target : args.User, ent.Comp.KeyOut);
+            Trigger.Trigger(ent.Owner, ent.Comp.TargetIsUser ? target : args.User, ent.Comp.KeyOut);
         }
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
index 68c109aef9..3afd03f41a 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
@@ -6,9 +6,8 @@ using Content.Shared.Trigger.Components.Triggers;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed partial class TriggerOnMobstateChangeSystem : EntitySystem
+public sealed partial class TriggerOnMobstateChangeSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
@@ -27,7 +26,7 @@ public sealed partial class TriggerOnMobstateChangeSystem : EntitySystem
         if (!component.MobState.Contains(args.NewMobState))
             return;
 
-        _trigger.Trigger(uid, component.TargetMobstateEntity ? uid : args.Origin, component.KeyOut);
+        Trigger.Trigger(uid, component.TargetMobstateEntity ? uid : args.Origin, component.KeyOut);
     }
 
     private void OnMobStateRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<MobStateChangedEvent> args)
@@ -35,7 +34,7 @@ public sealed partial class TriggerOnMobstateChangeSystem : EntitySystem
         if (!component.MobState.Contains(args.Event.NewMobState))
             return;
 
-        _trigger.Trigger(uid, component.TargetMobstateEntity ? args.ImplantedEntity : args.Event.Origin, component.KeyOut);
+        Trigger.Trigger(uid, component.TargetMobstateEntity ? args.ImplantedEntity : args.Event.Origin, component.KeyOut);
     }
 
     /// <summary>
diff --git a/Content.Shared/Trigger/Systems/TriggerOnRoundEndSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnRoundEndSystem.cs
index c18fb08f3f..b5b910d08d 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnRoundEndSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnRoundEndSystem.cs
@@ -6,10 +6,8 @@ namespace Content.Shared.Trigger.Systems;
 /// <summary>
 /// System for creating a trigger when the round ends.
 /// </summary>
-public sealed class TriggerOnRoundEndSystem : EntitySystem
+public sealed class TriggerOnRoundEndSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -25,7 +23,7 @@ public sealed class TriggerOnRoundEndSystem : EntitySystem
         // trigger everything with the component
         while (triggerQuery.MoveNext(out var uid, out var comp))
         {
-            _trigger.Trigger(uid, null, comp.KeyOut);
+            Trigger.Trigger(uid, null, comp.KeyOut);
         }
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs
index 6940ea52e2..746694b891 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs
@@ -3,10 +3,8 @@ using Content.Shared.Trigger.Components.Triggers;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed partial class TriggerOnSlipSystem : EntitySystem
+public sealed partial class TriggerOnSlipSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -16,6 +14,6 @@ public sealed partial class TriggerOnSlipSystem : EntitySystem
 
     private void OnSlip(Entity<TriggerOnSlipComponent> ent, ref SlipEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.Slipped, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Slipped, ent.Comp.KeyOut);
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnStrappedOrBuckledSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnStrappedOrBuckledSystem.cs
index d4960ff70c..20cf2393b9 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnStrappedOrBuckledSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnStrappedOrBuckledSystem.cs
@@ -8,10 +8,8 @@ namespace Content.Shared.Trigger.Systems;
 /// The users of strap components are the objects having an entity strapped to them (IE: Chairs)
 /// The users of buckle components are entities being buckled to an object. (IE: Mobs and players)
 /// </summary>
-public sealed partial class TriggerOnStrappedOrBuckledSystem : EntitySystem
+public sealed partial class TriggerOnStrappedOrBuckledSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -27,23 +25,23 @@ public sealed partial class TriggerOnStrappedOrBuckledSystem : EntitySystem
     // Called by objects entities can be buckled to. (Chairs, surgical tables/)
     private void OnStrapped(Entity<TriggerOnStrappedComponent> ent, ref StrappedEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.Strap, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Strap, ent.Comp.KeyOut);
     }
 
     private void OnUnstrapped(Entity<TriggerOnUnstrappedComponent> ent, ref UnstrappedEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.Strap, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Strap, ent.Comp.KeyOut);
     }
 
     // Called by entities that are buckled to an object. (Mobs, players.)
     private void OnBuckled(Entity<TriggerOnBuckledComponent> ent, ref BuckledEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.Buckle, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Buckle, ent.Comp.KeyOut);
     }
 
     private void OnUnbuckled(Entity<TriggerOnUnbuckledComponent> ent, ref UnbuckledEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.Buckle, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.Buckle, ent.Comp.KeyOut);
     }
     #endregion
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs
index d364adccff..dc6441d9df 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs
@@ -3,10 +3,8 @@ using Content.Shared.Trigger.Components.Triggers;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class TriggerOnStuckSystem : EntitySystem
+public sealed class TriggerOnStuckSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -16,6 +14,6 @@ public sealed class TriggerOnStuckSystem : EntitySystem
 
     private void OnStuck(Entity<TriggerOnStuckComponent> ent, ref EntityStuckEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnToolUseSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnToolUseSystem.cs
index 01f612aadf..b0265e571e 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnToolUseSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnToolUseSystem.cs
@@ -3,10 +3,8 @@ using Content.Shared.Trigger.Components.Triggers;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class TriggerOnToolUseSystem : EntitySystem
+public sealed class TriggerOnToolUseSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -16,6 +14,6 @@ public sealed class TriggerOnToolUseSystem : EntitySystem
 
     private void OnToolUse(Entity<TriggerOnSimpleToolUsageComponent> ent, ref SimpleToolDoAfterEvent args)
     {
-        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        Trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs
index d5830dd75d..31c0e9c377 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs
@@ -3,10 +3,8 @@ using Content.Shared.Trigger.Components.Triggers;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed partial class TriggerOnVerbSystem : EntitySystem
+public sealed partial class TriggerOnVerbSystem : TriggerOnXSystem
 {
-    [Dependency] private readonly TriggerSystem _trigger = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -24,7 +22,7 @@ public sealed partial class TriggerOnVerbSystem : EntitySystem
         args.Verbs.Add(new AlternativeVerb
         {
             Text = Loc.GetString(ent.Comp.Text),
-            Act = () => _trigger.Trigger(ent.Owner, user, ent.Comp.KeyOut),
+            Act = () => Trigger.Trigger(ent.Owner, user, ent.Comp.KeyOut),
             Priority = 2 // should be above any timer settings
         });
     }
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
index 2d0756556a..b039c8e9de 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
@@ -10,31 +10,36 @@ public sealed partial class TriggerSystem
     private void InitializeCondition()
     {
         SubscribeLocalEvent<WhitelistTriggerConditionComponent, AttemptTriggerEvent>(OnWhitelistTriggerAttempt);
-
         SubscribeLocalEvent<UseDelayTriggerConditionComponent, AttemptTriggerEvent>(OnUseDelayTriggerAttempt);
-
         SubscribeLocalEvent<ToggleTriggerConditionComponent, AttemptTriggerEvent>(OnToggleTriggerAttempt);
-        SubscribeLocalEvent<ToggleTriggerConditionComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleGetAltVerbs);
-
         SubscribeLocalEvent<RandomChanceTriggerConditionComponent, AttemptTriggerEvent>(OnRandomChanceTriggerAttempt);
+        SubscribeLocalEvent<MindRoleTriggerConditionComponent, AttemptTriggerEvent>(OnMindRoleTriggerAttempt);
+
+        SubscribeLocalEvent<ToggleTriggerConditionComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleGetAltVerbs);
     }
 
     private void OnWhitelistTriggerAttempt(Entity<WhitelistTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
-        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
-            args.Cancelled |= !_whitelist.CheckBoth(args.User, ent.Comp.UserBlacklist, ent.Comp.UserWhitelist);
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
+
+        args.Cancelled |= !_whitelist.CheckBoth(args.User, ent.Comp.UserBlacklist, ent.Comp.UserWhitelist);
     }
 
     private void OnUseDelayTriggerAttempt(Entity<UseDelayTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
-        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
-            args.Cancelled |= _useDelay.IsDelayed(ent.Owner, ent.Comp.UseDelayId);
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
+
+        args.Cancelled |= _useDelay.IsDelayed(ent.Owner, ent.Comp.UseDelayId);
     }
 
     private void OnToggleTriggerAttempt(Entity<ToggleTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
-        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
-            args.Cancelled |= !ent.Comp.Enabled;
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
+
+        args.Cancelled |= !ent.Comp.Enabled;
     }
 
     private void OnToggleGetAltVerbs(Entity<ToggleTriggerConditionComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
@@ -62,19 +67,51 @@ public sealed partial class TriggerSystem
     private void OnRandomChanceTriggerAttempt(Entity<RandomChanceTriggerConditionComponent> ent,
         ref AttemptTriggerEvent args)
     {
-        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
-        {
-            // TODO: Replace with RandomPredicted once the engine PR is merged
-            var hash = new List<int>
-            {
-                (int)_timing.CurTick.Value,
-                GetNetEntity(ent).Id,
-                args.User == null ? 0 : GetNetEntity(args.User.Value).Id,
-            };
-            var seed = SharedRandomExtensions.HashCodeCombine(hash);
-            var rand = new System.Random(seed);
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
 
-            args.Cancelled |= !rand.Prob(ent.Comp.SuccessChance); // When not successful, Cancelled = true
+        // TODO: Replace with RandomPredicted once the engine PR is merged
+        var hash = new List<int>
+        {
+            (int)_timing.CurTick.Value,
+            GetNetEntity(ent).Id,
+            args.User == null ? 0 : GetNetEntity(args.User.Value).Id,
+        };
+        var seed = SharedRandomExtensions.HashCodeCombine(hash);
+        var rand = new System.Random(seed);
+
+        args.Cancelled |= !rand.Prob(ent.Comp.SuccessChance); // When not successful, Cancelled = true
+    }
+    private void OnMindRoleTriggerAttempt(Entity<MindRoleTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.Keys.Contains(args.Key))
+            return;
+
+        if (ent.Comp.EntityWhitelist != null)
+        {
+            if (!_mind.TryGetMind(ent.Owner, out var entMindId, out var entMindComp))
+            {
+                args.Cancelled = true; // the entity has no mind
+                return;
+            }
+            if (!_role.MindHasRole((entMindId, entMindComp), ent.Comp.EntityWhitelist))
+            {
+                args.Cancelled = true; // the entity does not have the required role
+                return;
+            }
+        }
+
+        if (ent.Comp.UserWhitelist != null)
+        {
+            if (args.User == null || !_mind.TryGetMind(args.User.Value, out var userMindId, out var userMindComp))
+            {
+                args.Cancelled = true; // no user or the user has no mind
+                return;
+            }
+            if (!_role.MindHasRole((userMindId, userMindComp), ent.Comp.UserWhitelist))
+            {
+                args.Cancelled = true; // the user does not have the required role
+            }
         }
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs
index c374369a7f..a312b6aa28 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs
@@ -11,18 +11,21 @@ public sealed partial class TriggerSystem
 {
     private void InitializeVoice()
     {
-        SubscribeLocalEvent<TriggerOnVoiceComponent, ComponentInit>(OnVoiceInit);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<TriggerOnVoiceComponent, ExaminedEvent>(OnVoiceExamine);
         SubscribeLocalEvent<TriggerOnVoiceComponent, ListenEvent>(OnListen);
         SubscribeLocalEvent<TriggerOnVoiceComponent, GetVerbsEvent<AlternativeVerb>>(OnVoiceGetAltVerbs);
     }
 
-    private void OnVoiceInit(Entity<TriggerOnVoiceComponent> ent, ref ComponentInit args)
+    private void OnMapInit(Entity<TriggerOnVoiceComponent> ent, ref MapInitEvent args)
     {
-        if (ent.Comp.IsListening)
-            EnsureComp<ActiveListenerComponent>(ent).Range = ent.Comp.ListenRange;
-        else
-            RemCompDeferred<ActiveListenerComponent>(ent);
+        if (ent.Comp.DefaultKeyPhrase != null)
+        {
+            ent.Comp.KeyPhrase = Loc.GetString(ent.Comp.DefaultKeyPhrase);
+            Dirty(ent);
+        }
+
+        UpdateListening(ent);
     }
 
     private void OnVoiceExamine(EntityUid uid, TriggerOnVoiceComponent component, ExaminedEvent args)
@@ -94,6 +97,19 @@ public sealed partial class TriggerSystem
             Priority = 1
         });
 
+        if (ent.Comp.DefaultKeyPhrase != null
+            && ent.Comp.KeyPhrase != Loc.GetString(ent.Comp.DefaultKeyPhrase))
+        {
+            args.Verbs.Add(new AlternativeVerb
+            {
+                Text = Loc.GetString(ent.Comp.ResetRecordingVerb),
+                Act = () =>
+                {
+                    SetToDefault(ent, user);
+                },
+            });
+        }
+
         if (string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase))
             return;
 
@@ -107,6 +123,17 @@ public sealed partial class TriggerSystem
         });
     }
 
+    /// <summary>
+    /// Updates the presence/absence of the ActiveListenerComponent based on IsListening.
+    /// </summary>
+    private void UpdateListening(Entity<TriggerOnVoiceComponent> ent)
+    {
+        if (ent.Comp.IsListening)
+            EnsureComp<ActiveListenerComponent>(ent).Range = ent.Comp.ListenRange;
+        else
+            RemCompDeferred<ActiveListenerComponent>(ent);
+    }
+
     /// <summary>
     /// Start recording a new keyphrase.
     /// </summary>
@@ -163,4 +190,23 @@ public sealed partial class TriggerSystem
         Dirty(ent);
         RemComp<ActiveListenerComponent>(ent);
     }
+
+    /// <summary>
+    /// Resets the current key phrase to default.
+    /// </summary>
+    public void SetToDefault(Entity<TriggerOnVoiceComponent> ent, EntityUid? user = null)
+    {
+        if (ent.Comp.DefaultKeyPhrase == null)
+            return;
+
+        ent.Comp.KeyPhrase = Loc.GetString(ent.Comp.DefaultKeyPhrase);
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+        UpdateListening(ent);
+
+        _adminLogger.Add(LogType.Trigger, LogImpact.Low,
+            $"A voice-trigger on {ToPrettyString(ent):entity} has been reset to default keyphrase: '{ent.Comp.KeyPhrase}'. User: {ToPrettyString(user):speaker}");
+
+        _popup.PopupPredicted(Loc.GetString("trigger-on-voice-set-default", ("keyphrase", ent.Comp.KeyPhrase)), ent, user);
+    }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs
index 25f8d51e11..a5fb509eed 100644
--- a/Content.Shared/Trigger/Systems/TriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs
@@ -3,7 +3,9 @@ using Content.Shared.Database;
 using Content.Shared.DeviceLinking;
 using Content.Shared.EntityTable;
 using Content.Shared.Item.ItemToggle;
+using Content.Shared.Mind;
 using Content.Shared.Popups;
+using Content.Shared.Roles;
 using Content.Shared.Timing;
 using Content.Shared.Trigger.Components;
 using Content.Shared.Whitelist;
@@ -39,6 +41,8 @@ public sealed partial class TriggerSystem : EntitySystem
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly ItemToggleSystem _itemToggle = default!;
     [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
+    [Dependency] private readonly SharedRoleSystem _role = default!;
+    [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly EntityTableSystem _entityTable = default!;
 
     public const string DefaultTriggerKey = "trigger";
diff --git a/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs
index 9b83c4cf8e..ebcfc05de4 100644
--- a/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs
@@ -4,31 +4,16 @@ using Content.Shared.Trigger.Components.Effects;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class UncuffOnTriggerSystem : EntitySystem
+public sealed class UncuffOnTriggerSystem : XOnTriggerSystem<UncuffOnTriggerComponent>
 {
     [Dependency] private readonly SharedCuffableSystem _cuffable = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<UncuffOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<UncuffOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<UncuffOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+        if (!TryComp<CuffableComponent>(target, out var cuffs) || cuffs.Container.ContainedEntities.Count < 1)
             return;
 
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
-        if (!TryComp<CuffableComponent>(target.Value, out var cuffs) || cuffs.Container.ContainedEntities.Count < 1)
-            return;
-
-        _cuffable.Uncuff(target.Value, args.User, cuffs.LastAddedCuffs);
+        _cuffable.Uncuff(target, args.User, cuffs.LastAddedCuffs);
         args.Handled = true;
     }
 }
diff --git a/Content.Shared/Trigger/Systems/WeatherTriggerSystem.cs b/Content.Shared/Trigger/Systems/WeatherTriggerSystem.cs
index 6343e08f0b..3a64f94f67 100644
--- a/Content.Shared/Trigger/Systems/WeatherTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/WeatherTriggerSystem.cs
@@ -5,30 +5,15 @@ using Robust.Shared.Timing;
 
 namespace Content.Shared.Trigger.Systems;
 
-public sealed class WeatherTriggerSystem : EntitySystem
+public sealed class WeatherTriggerSystem : XOnTriggerSystem<WeatherOnTriggerComponent>
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedWeatherSystem _weather = default!;
 
-    public override void Initialize()
+    protected override void OnTrigger(Entity<WeatherOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<WeatherOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<WeatherOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
-            return;
-
-        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
-
-        if (target == null)
-            return;
-
-        var xform = Transform(target.Value);
+        var xform = Transform(target);
 
         if (ent.Comp.Weather == null) //Clear weather if nothing is set
         {
diff --git a/Content.Shared/Weapons/Hitscan/Components/HitscanAmmoComponent.cs b/Content.Shared/Weapons/Hitscan/Components/HitscanAmmoComponent.cs
new file mode 100644
index 0000000000..3993d5ad20
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Components/HitscanAmmoComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Weapons.Ranged;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Weapons.Hitscan.Components;
+
+/// <summary>
+/// This component is used to indicate an entity is shootable from a hitscan weapon.
+/// This is placed on the laser entity being shot, not the gun itself.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HitscanAmmoComponent : Component, IShootable;
diff --git a/Content.Shared/Weapons/Hitscan/Components/HitscanBasicDamageComponent.cs b/Content.Shared/Weapons/Hitscan/Components/HitscanBasicDamageComponent.cs
new file mode 100644
index 0000000000..dcbb19265e
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Components/HitscanBasicDamageComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Damage;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Weapons.Hitscan.Components;
+
+/// <summary>
+/// Hitscan entities that have this component will do the damage specified to hit targets (Who didn't reflect it).
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HitscanBasicDamageComponent : Component
+{
+    /// <summary>
+    /// How much damage the hitscan weapon will do when hitting a target.
+    /// </summary>
+    [DataField(required: true)]
+    public DamageSpecifier Damage;
+}
diff --git a/Content.Shared/Weapons/Hitscan/Components/HitscanBasicEffectsComponent.cs b/Content.Shared/Weapons/Hitscan/Components/HitscanBasicEffectsComponent.cs
new file mode 100644
index 0000000000..05209f3b9e
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Components/HitscanBasicEffectsComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Weapons.Hitscan.Components;
+
+/// <summary>
+/// System or basic "effects" like sounds and hit markers for hitscans.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HitscanBasicEffectsComponent : Component
+{
+    /// <summary>
+    /// This will turn hit entities this color briefly.
+    /// </summary>
+    [DataField]
+    public Color? HitColor = Color.Red;
+
+    /// <summary>
+    /// Sound that plays upon the thing being hit.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? Sound;
+
+    /// <summary>
+    /// Force the hitscan sound to play rather than playing the entity's override sound (if it exists).
+    /// </summary>
+    [DataField]
+    public bool ForceSound;
+}
diff --git a/Content.Shared/Weapons/Hitscan/Components/HitscanBasicRaycastComponent.cs b/Content.Shared/Weapons/Hitscan/Components/HitscanBasicRaycastComponent.cs
new file mode 100644
index 0000000000..e04ab0da4f
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Components/HitscanBasicRaycastComponent.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Physics;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Weapons.Hitscan.Components;
+
+/// <summary>
+/// A basic raycast system that will shoot in a straight line when triggered.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HitscanBasicRaycastComponent : Component
+{
+    /// <summary>
+    /// Maximum distance the raycast will travel before giving up. Reflections will reset the distance traveled
+    /// </summary>
+    [DataField]
+    public float MaxDistance = 20.0f;
+
+    /// <summary>
+    /// The collision mask the hitscan ray uses to collide with other objects. See the enum for more information
+    /// </summary>
+    [DataField]
+    public CollisionGroup CollisionMask = CollisionGroup.Opaque;
+}
diff --git a/Content.Shared/Weapons/Hitscan/Components/HitscanBasicVisualsComponent.cs b/Content.Shared/Weapons/Hitscan/Components/HitscanBasicVisualsComponent.cs
new file mode 100644
index 0000000000..519425ece3
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Components/HitscanBasicVisualsComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Weapons.Hitscan.Components;
+
+/// <summary>
+/// Provides basic visuals for hitscan weapons - works with <see cref="HitscanBasicRaycastComponent"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HitscanBasicVisualsComponent : Component
+{
+    /// <summary>
+    /// The muzzle flash from the hitscan weapon.
+    /// </summary>
+    [DataField]
+    public SpriteSpecifier? MuzzleFlash;
+
+    /// <summary>
+    /// The "travel" sprite, this gets repeated until it hits the target.
+    /// </summary>
+    [DataField]
+    public SpriteSpecifier? TravelFlash;
+
+    /// <summary>
+    /// The sprite that gets shown on the impact of the laser.
+    /// </summary>
+    [DataField]
+    public SpriteSpecifier? ImpactFlash;
+}
diff --git a/Content.Shared/Weapons/Hitscan/Components/HitscanReflectComponent.cs b/Content.Shared/Weapons/Hitscan/Components/HitscanReflectComponent.cs
new file mode 100644
index 0000000000..a63f3ab670
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Components/HitscanReflectComponent.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Weapons.Reflect;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Weapons.Hitscan.Components;
+
+/// <summary>
+/// Hitscan entities with this component will get reflected by certain things (E.G energy swords).
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HitscanReflectComponent : Component
+{
+    /// <summary>
+    /// The reflective type, will only reflect from entities that have a matching reflection type.
+    /// </summary>
+    [DataField]
+    public ReflectType ReflectiveType = ReflectType.Energy;
+
+    /// <summary>
+    /// The maximum number of reflections the laser will make. <see cref="CurrentReflections"/>
+    /// </summary>
+    [DataField]
+    public int MaxReflections = 3;
+
+    /// <summary>
+    /// Current number of times this hitscan entity was reflected. Will not be more than <see cref="MaxReflections"/>
+    /// </summary>
+    [DataField]
+    public int CurrentReflections;
+}
diff --git a/Content.Shared/Weapons/Hitscan/Components/HitscanStaminaDamageComponent.cs b/Content.Shared/Weapons/Hitscan/Components/HitscanStaminaDamageComponent.cs
new file mode 100644
index 0000000000..35eb398682
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Components/HitscanStaminaDamageComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Weapons.Hitscan.Components;
+
+/// <summary>
+/// Hitscan entities that have this component will deal stamina damage to the target.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HitscanStaminaDamageComponent : Component
+{
+    /// <summary>
+    /// How much stamania damage the hitscan weapon will do when hitting a target.
+    /// </summary>
+    [DataField]
+    public float StaminaDamage = 10.0f;
+}
diff --git a/Content.Shared/Weapons/Hitscan/Events/HitscanEvents.cs b/Content.Shared/Weapons/Hitscan/Events/HitscanEvents.cs
new file mode 100644
index 0000000000..0ebc18079a
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Events/HitscanEvents.cs
@@ -0,0 +1,110 @@
+using System.Numerics;
+using Content.Shared.Damage;
+using Robust.Shared.Map;
+
+namespace Content.Shared.Weapons.Hitscan.Events;
+
+/// <summary>
+/// Raised on the hitscan entity when "fired". This could be from reflections or from the gun. This is the catalyst that
+/// other systems will listen for to actually shoot the gun.
+/// </summary>
+[ByRefEvent]
+public record struct HitscanTraceEvent
+{
+    /// <summary>
+    /// Location the hitscan was fired from.
+    /// </summary>
+    public EntityCoordinates FromCoordinates;
+
+    /// <summary>
+    /// Direction that the ray was fired towards.
+    /// </summary>
+    public Vector2 ShotDirection;
+
+    /// <summary>
+    /// Gun that was fired - this will always be the original weapon even if reflected.
+    /// </summary>
+    public EntityUid Gun;
+
+    /// <summary>
+    /// Player who shot the gun, if null the gun was fired by itself.
+    /// </summary>
+    public EntityUid? Shooter;
+
+    /// <summary>
+    /// Target that was being aimed at (Not necessarily hit).
+    /// </summary>
+    public EntityUid? Target;
+}
+
+/// <summary>
+/// All data known data for when a hitscan is actually fired.
+/// </summary>
+public record struct HitscanRaycastFiredData
+{
+    /// <summary>
+    /// Direction that the ray was fired towards.
+    /// </summary>
+    public Vector2 ShotDirection;
+
+    /// <summary>
+    /// The entity that got hit, if null the raycast didn't hit anyone.
+    /// </summary>
+    public EntityUid? HitEntity;
+
+    /// <summary>
+    /// Gun that fired the raycast.
+    /// </summary>
+    public EntityUid Gun;
+
+    /// <summary>
+    /// Player who shot the gun, if null the gun was fired by itself.
+    /// </summary>
+    public EntityUid? Shooter;
+}
+
+/// <summary>
+/// Try to hit the targeted entity with a hitscan laser. Stuff like the reflection system should listen for this and
+/// cancel the event if the laser was reflected.
+/// </summary>
+[ByRefEvent]
+public struct AttemptHitscanRaycastFiredEvent
+{
+    /// <summary>
+    /// Data for the hitscan that was fired.
+    /// </summary>
+    public HitscanRaycastFiredData Data;
+
+    /// <summary>
+    /// Set to true the hitscan is cancelled (e.g. due to reflection).
+    /// Cancelled hitscans should not apply damage or trigger follow-up effects.
+    /// </summary>
+    public bool Cancelled;
+}
+
+/// <summary>
+/// Results of a hitscan raycast and will be raised on the raycast entity on itself. Stuff like the damage system should
+/// listen for this. At this point we KNOW the laser hit the entity.
+/// </summary>
+[ByRefEvent]
+public struct HitscanRaycastFiredEvent
+{
+    /// <summary>
+    /// Data for the hitscan that was fired.
+    /// </summary>
+    public HitscanRaycastFiredData Data;
+}
+
+[ByRefEvent]
+public record struct HitscanDamageDealtEvent
+{
+    /// <summary>
+    /// Target that was dealt damage.
+    /// </summary>
+    public EntityUid Target;
+
+    /// <summary>
+    /// The amount of damage that the target was dealt.
+    /// </summary>
+    public DamageSpecifier DamageDealt;
+}
diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs
new file mode 100644
index 0000000000..130687469a
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Damage;
+using Content.Shared.Weapons.Hitscan.Components;
+using Content.Shared.Weapons.Hitscan.Events;
+
+namespace Content.Shared.Weapons.Hitscan.Systems;
+
+public sealed class HitscanBasicDamageSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damage = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HitscanBasicDamageComponent, HitscanRaycastFiredEvent>(OnHitscanHit);
+    }
+
+    private void OnHitscanHit(Entity<HitscanBasicDamageComponent> ent, ref HitscanRaycastFiredEvent args)
+    {
+        if (args.Data.HitEntity == null)
+            return;
+
+        var dmg = ent.Comp.Damage * _damage.UniversalHitscanDamageModifier;
+
+        var damageDealt = _damage.TryChangeDamage(args.Data.HitEntity, dmg, origin: args.Data.Gun);
+
+        if (damageDealt == null)
+            return;
+
+        var damageEvent = new HitscanDamageDealtEvent
+        {
+            Target = args.Data.HitEntity.Value,
+            DamageDealt = damageDealt,
+        };
+
+        RaiseLocalEvent(ent, ref damageEvent);
+    }
+}
diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicEffectsSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicEffectsSystem.cs
new file mode 100644
index 0000000000..4713734be7
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicEffectsSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Damage;
+using Content.Shared.Effects;
+using Content.Shared.Weapons.Hitscan.Components;
+using Content.Shared.Weapons.Hitscan.Events;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Weapons.Hitscan.Systems;
+
+public sealed class HitscanBasicEffectsSystem : EntitySystem
+{
+    [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
+    [Dependency] private readonly SharedGunSystem _gun = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HitscanBasicEffectsComponent, HitscanDamageDealtEvent>(OnHitscanDamageDealt);
+    }
+
+    private void OnHitscanDamageDealt(Entity<HitscanBasicEffectsComponent> ent, ref HitscanDamageDealtEvent args)
+    {
+        if (Deleted(args.Target))
+            return;
+
+        if (ent.Comp.HitColor != null && args.DamageDealt.GetTotal() != 0)
+        {
+            _color.RaiseEffect(ent.Comp.HitColor.Value,
+                new List<EntityUid> { args.Target },
+                Filter.Pvs(args.Target, entityManager: EntityManager));
+        }
+
+        _gun.PlayImpactSound(args.Target, args.DamageDealt, ent.Comp.Sound, ent.Comp.ForceSound);
+    }
+}
diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicRaycastSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicRaycastSystem.cs
new file mode 100644
index 0000000000..4bcfe8a69f
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicRaycastSystem.cs
@@ -0,0 +1,150 @@
+using System.Numerics;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Damage.Components;
+using Content.Shared.Database;
+using Content.Shared.Weapons.Hitscan.Components;
+using Content.Shared.Weapons.Hitscan.Events;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Weapons.Hitscan.Systems;
+
+public sealed class HitscanBasicRaycastSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly ISharedAdminLogManager _log = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    private EntityQuery<HitscanBasicVisualsComponent> _visualsQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _visualsQuery = GetEntityQuery<HitscanBasicVisualsComponent>();
+
+        SubscribeLocalEvent<HitscanBasicRaycastComponent, HitscanTraceEvent>(OnHitscanFired);
+    }
+
+    private void OnHitscanFired(Entity<HitscanBasicRaycastComponent> ent, ref HitscanTraceEvent args)
+    {
+        var shooter = args.Shooter ?? args.Gun;
+        var mapCords = _transform.ToMapCoordinates(args.FromCoordinates);
+        var ray = new CollisionRay(mapCords.Position, args.ShotDirection, (int) ent.Comp.CollisionMask);
+        var rayCastResults = _physics.IntersectRay(mapCords.MapId, ray, ent.Comp.MaxDistance, shooter, false);
+
+        var target = args.Target;
+        // If you are in a container, use the raycast result
+        // Otherwise:
+        //  1.) Hit the first entity that you targeted.
+        //  2.) Hit the first entity that doesn't require you to aim at it specifically to be hit.
+        var result = _container.IsEntityOrParentInContainer(shooter)
+            ? rayCastResults.FirstOrNull()
+            : rayCastResults.FirstOrNull(hit => hit.HitEntity == target
+                                                || CompOrNull<RequireProjectileTargetComponent>(hit.HitEntity)?.Active != true);
+
+        var distanceTried = result?.Distance ?? ent.Comp.MaxDistance;
+
+        // Do visuals without an event. They should always happen and putting it on the attempt event is weird!
+        // If more stuff gets added here, it should probably be turned into an event.
+        FireEffects(args.FromCoordinates, distanceTried, args.ShotDirection.ToAngle(), ent.Owner);
+
+        // Admin logging
+        if (result?.HitEntity != null)
+        {
+            _log.Add(LogType.HitScanHit,
+                $"{ToPrettyString(shooter):user} hit {ToPrettyString(result.Value.HitEntity):target}"
+                + $" using {ToPrettyString(args.Gun):entity}.");
+        }
+
+        var data = new HitscanRaycastFiredData
+        {
+            ShotDirection = args.ShotDirection,
+            Gun = args.Gun,
+            Shooter = args.Shooter,
+            HitEntity = result?.HitEntity,
+        };
+
+        var attemptEvent = new AttemptHitscanRaycastFiredEvent { Data = data };
+        RaiseLocalEvent(ent, ref attemptEvent);
+
+        if (attemptEvent.Cancelled)
+            return;
+
+        var hitEvent = new HitscanRaycastFiredEvent { Data = data };
+        RaiseLocalEvent(ent, ref hitEvent);
+    }
+
+    /// <summary>
+    /// Create visual effects for the fired hitscan weapon.
+    /// </summary>
+    /// <param name="fromCoordinates">Location to start the effect.</param>
+    /// <param name="distance">Distance of the hitscan shot.</param>
+    /// <param name="shotAngle">Angle of the shot.</param>
+    /// <param name="hitscanUid">The hitscan entity itself.</param>
+    private void FireEffects(EntityCoordinates fromCoordinates, float distance, Angle shotAngle, EntityUid hitscanUid)
+    {
+        if (distance == 0 || !_visualsQuery.TryComp(hitscanUid, out var vizComp))
+            return;
+
+        var sprites = new List<(NetCoordinates coordinates, Angle angle, SpriteSpecifier sprite, float scale)>();
+        var fromXform = Transform(fromCoordinates.EntityId);
+
+        // We'll get the effects relative to the grid / map of the firer
+        // Look you could probably optimise this a bit with redundant transforms at this point.
+
+        var gridUid = fromXform.GridUid;
+        if (gridUid != fromCoordinates.EntityId && TryComp(gridUid, out TransformComponent? gridXform))
+        {
+            var (_, gridRot, gridInvMatrix) = _transform.GetWorldPositionRotationInvMatrix(gridXform);
+            var map = _transform.ToMapCoordinates(fromCoordinates);
+            fromCoordinates = new EntityCoordinates(gridUid.Value, Vector2.Transform(map.Position, gridInvMatrix));
+            shotAngle -= gridRot;
+        }
+        else
+        {
+            shotAngle -= _transform.GetWorldRotation(fromXform);
+        }
+
+        if (distance >= 1f)
+        {
+            if (vizComp.MuzzleFlash != null)
+            {
+                var coords = fromCoordinates.Offset(shotAngle.ToVec().Normalized() / 2);
+                var netCoords = GetNetCoordinates(coords);
+
+                sprites.Add((netCoords, shotAngle, vizComp.MuzzleFlash, 1f));
+            }
+
+            if (vizComp.TravelFlash != null)
+            {
+                var coords = fromCoordinates.Offset(shotAngle.ToVec() * (distance + 0.5f) / 2);
+                var netCoords = GetNetCoordinates(coords);
+
+                sprites.Add((netCoords, shotAngle, vizComp.TravelFlash, distance - 1.5f));
+            }
+        }
+
+        if (vizComp.ImpactFlash != null)
+        {
+            var coords = fromCoordinates.Offset(shotAngle.ToVec() * distance);
+            var netCoords = GetNetCoordinates(coords);
+
+            sprites.Add((netCoords, shotAngle.FlipPositive(), vizComp.ImpactFlash, 1f));
+        }
+
+        if (sprites.Count > 0)
+        {
+            RaiseNetworkEvent(new SharedGunSystem.HitscanEvent
+            {
+                Sprites = sprites,
+            }, Filter.Pvs(fromCoordinates, entityMan: EntityManager));
+        }
+    }
+}
diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanReflectSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanReflectSystem.cs
new file mode 100644
index 0000000000..389e944942
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanReflectSystem.cs
@@ -0,0 +1,50 @@
+using Content.Shared.Weapons.Hitscan.Components;
+using Content.Shared.Weapons.Hitscan.Events;
+using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Weapons.Reflect;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Weapons.Hitscan.Systems;
+
+public sealed class HitscanReflectSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HitscanReflectComponent, AttemptHitscanRaycastFiredEvent>(OnHitscanHit);
+    }
+
+    private void OnHitscanHit(Entity<HitscanReflectComponent> hitscan, ref AttemptHitscanRaycastFiredEvent args)
+    {
+        var data = args.Data;
+
+        if (hitscan.Comp.ReflectiveType == ReflectType.None || data.HitEntity == null)
+            return;
+
+        if (hitscan.Comp.CurrentReflections >= hitscan.Comp.MaxReflections)
+            return;
+
+        var ev = new HitScanReflectAttemptEvent(data.Shooter ?? data.Gun, data.Gun, hitscan.Comp.ReflectiveType, data.ShotDirection, false);
+        RaiseLocalEvent(data.HitEntity.Value, ref ev);
+
+        if (!ev.Reflected)
+            return;
+
+        hitscan.Comp.CurrentReflections++;
+
+        args.Cancelled = true;
+
+        var fromEffect = Transform(data.HitEntity.Value).Coordinates;
+
+        var hitFiredEvent = new HitscanTraceEvent
+        {
+            FromCoordinates = fromEffect,
+            ShotDirection = ev.Direction,
+            Gun = data.Gun,
+            Shooter = data.HitEntity.Value,
+        };
+
+        RaiseLocalEvent(hitscan, ref hitFiredEvent);
+    }
+}
diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanStunSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanStunSystem.cs
new file mode 100644
index 0000000000..8c1d1b45fb
--- /dev/null
+++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanStunSystem.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Damage.Systems;
+using Content.Shared.Weapons.Hitscan.Components;
+using Content.Shared.Weapons.Hitscan.Events;
+
+namespace Content.Shared.Weapons.Hitscan.Systems;
+
+public sealed class HitscanStunSystem : EntitySystem
+{
+    [Dependency] private readonly SharedStaminaSystem _stamina = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HitscanStaminaDamageComponent, HitscanRaycastFiredEvent>(OnHitscanHit);
+    }
+
+    private void OnHitscanHit(Entity<HitscanStaminaDamageComponent> hitscan, ref HitscanRaycastFiredEvent args)
+    {
+        if (args.Data.HitEntity == null)
+            return;
+
+        _stamina.TakeStaminaDamage(args.Data.HitEntity.Value, hitscan.Comp.StaminaDamage, source: args.Data.Shooter ?? args.Data.Gun);
+    }
+}
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 7d0d7577a4..9bc0b845ae 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -7,6 +7,7 @@ using Content.Shared.Administration.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CombatMode;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
@@ -63,6 +64,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
     [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private   readonly SharedStaminaSystem _stamina = default!;
+    [Dependency] private   readonly DamageExamineSystem _damageExamine = default!;
 
     private const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
 
@@ -83,6 +85,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         SubscribeLocalEvent<MeleeWeaponComponent, HandSelectedEvent>(OnMeleeSelected);
         SubscribeLocalEvent<MeleeWeaponComponent, ShotAttemptedEvent>(OnMeleeShotAttempted);
         SubscribeLocalEvent<MeleeWeaponComponent, GunShotEvent>(OnMeleeShot);
+        SubscribeLocalEvent<MeleeWeaponComponent, DamageExamineEvent>(OnMeleeExamineDamage);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetMeleeDamageEvent>(OnGetBonusMeleeDamage);
         SubscribeLocalEvent<BonusMeleeDamageComponent, GetHeavyDamageModifierEvent>(OnGetBonusHeavyDamageModifier);
         SubscribeLocalEvent<BonusMeleeAttackRateComponent, GetMeleeAttackRateEvent>(OnGetBonusMeleeAttackRate);
@@ -95,8 +98,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         SubscribeAllEvent<StopAttackEvent>(OnStopAttack);
 
 #if DEBUG
-        SubscribeLocalEvent<MeleeWeaponComponent,
-                            MapInitEvent>                   (OnMapInit);
+        SubscribeLocalEvent<MeleeWeaponComponent, MapInitEvent>(OnMapInit);
     }
 
     private void OnMapInit(EntityUid uid, MeleeWeaponComponent component, MapInitEvent args)
@@ -124,6 +126,18 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         }
     }
 
+    private void OnMeleeExamineDamage(EntityUid uid, MeleeWeaponComponent component, ref DamageExamineEvent args)
+    {
+        if (component.Hidden)
+            return;
+
+        var damageSpec = GetDamage(uid, args.User, component);
+
+        if (damageSpec.Empty)
+            return;
+
+        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), Loc.GetString("damage-melee"));
+    }
     private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, HandSelectedEvent args)
     {
         var attackRate = GetAttackRate(uid, args.User, component);
diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index 1a0a31d4b1..a3c5a322ee 100644
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -66,7 +66,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem
             var visuals = EnsureComp<JointVisualsComponent>(shotUid.Value);
             visuals.Sprite = component.RopeSprite;
             visuals.OffsetA = new Vector2(0f, 0.5f);
-            visuals.Target = GetNetEntity(uid);
+            visuals.Target = uid;
             Dirty(shotUid.Value, visuals);
         }
 
diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
index 0ba8a5faee..0fedf95146 100644
--- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
@@ -34,6 +34,12 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent
     [DataField, AutoNetworkedField]
     public bool Spent;
 
+    /// <summary>
+    /// Is this cartridge automatically marked as trash once spent?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool MarkSpentAsTrash = true;
+
     /// <summary>
     /// Caseless ammunition.
     /// </summary>
diff --git a/Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs
index be9d9805a8..cdbf51456e 100644
--- a/Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs
@@ -1,11 +1,11 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Weapons.Ranged.Components;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class HitscanBatteryAmmoProviderComponent : BatteryAmmoProviderComponent
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("proto", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<HitscanPrototype>))]
-    public string Prototype = default!;
+    [DataField("proto", required: true)]
+    public EntProtoId HitscanEntityProto;
 }
diff --git a/Content.Shared/Weapons/Ranged/HitscanPrototype.cs b/Content.Shared/Weapons/Ranged/HitscanPrototype.cs
deleted file mode 100644
index 3e0c15b879..0000000000
--- a/Content.Shared/Weapons/Ranged/HitscanPrototype.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Physics;
-using Content.Shared.Weapons.Reflect;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Weapons.Ranged;
-
-[Prototype]
-public sealed partial class HitscanPrototype : IPrototype, IShootable
-{
-    [ViewVariables]
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("staminaDamage")]
-    public float StaminaDamage;
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("damage")]
-    public DamageSpecifier? Damage;
-
-    [ViewVariables(VVAccess.ReadOnly), DataField("muzzleFlash")]
-    public SpriteSpecifier? MuzzleFlash;
-
-    [ViewVariables(VVAccess.ReadOnly), DataField("travelFlash")]
-    public SpriteSpecifier? TravelFlash;
-
-    [ViewVariables(VVAccess.ReadOnly), DataField("impactFlash")]
-    public SpriteSpecifier? ImpactFlash;
-
-    [DataField("collisionMask")]
-    public int CollisionMask = (int) CollisionGroup.Opaque;
-
-    /// <summary>
-    /// What we count as for reflection.
-    /// </summary>
-    [DataField("reflective")] public ReflectType Reflective = ReflectType.Energy;
-
-    /// <summary>
-    /// Sound that plays upon the thing being hit.
-    /// </summary>
-    [DataField("sound")]
-    public SoundSpecifier? Sound;
-
-    /// <summary>
-    /// Force the hitscan sound to play rather than potentially playing the entity's sound.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("forceSound")]
-    public bool ForceSound;
-
-    /// <summary>
-    /// Try not to set this too high.
-    /// </summary>
-    [DataField("maxLength")]
-    public float MaxLength = 20f;
-}
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
index ea865fced6..663f5f1faa 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
@@ -1,8 +1,13 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
 using Content.Shared.Examine;
+using Content.Shared.Projectiles;
+using Content.Shared.Weapons.Hitscan.Components;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
@@ -18,6 +23,7 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, TakeAmmoEvent>(OnBatteryTakeAmmo);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, GetAmmoCountEvent>(OnBatteryAmmoCount);
         SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, ExaminedEvent>(OnBatteryExamine);
+        SubscribeLocalEvent<HitscanBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
 
         // Projectile
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ComponentGetState>(OnBatteryGetState);
@@ -25,6 +31,7 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, TakeAmmoEvent>(OnBatteryTakeAmmo);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, GetAmmoCountEvent>(OnBatteryAmmoCount);
         SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, ExaminedEvent>(OnBatteryExamine);
+        SubscribeLocalEvent<ProjectileBatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
     }
 
     private void OnBatteryHandleState(EntityUid uid, BatteryAmmoProviderComponent component, ref ComponentHandleState args)
@@ -53,6 +60,53 @@ public abstract partial class SharedGunSystem
         args.PushMarkup(Loc.GetString("gun-battery-examine", ("color", AmmoExamineColor), ("count", component.Shots)));
     }
 
+    private void OnBatteryDamageExamine<T>(Entity<T> entity, ref DamageExamineEvent args) where T : BatteryAmmoProviderComponent
+    {
+        var damageSpec = GetDamage(entity.Comp);
+
+        if (damageSpec == null)
+            return;
+
+        var damageType = entity.Comp switch
+        {
+            HitscanBatteryAmmoProviderComponent => Loc.GetString("damage-hitscan"),
+            ProjectileBatteryAmmoProviderComponent => Loc.GetString("damage-projectile"),
+            _ => throw new ArgumentOutOfRangeException(),
+        };
+
+        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), damageType);
+    }
+
+    private DamageSpecifier? GetDamage(BatteryAmmoProviderComponent component)
+    {
+        if (component is ProjectileBatteryAmmoProviderComponent battery)
+        {
+            if (ProtoManager.Index<EntityPrototype>(battery.Prototype).Components
+                .TryGetValue(Factory.GetComponentName<ProjectileComponent>(), out var projectile))
+            {
+                var p = (ProjectileComponent) projectile.Component;
+
+                if (!p.Damage.Empty)
+                {
+                    return p.Damage * Damageable.UniversalProjectileDamageModifier;
+                }
+            }
+
+            return null;
+        }
+
+        if (component is HitscanBatteryAmmoProviderComponent hitscan)
+        {
+            var dmg = ProtoManager.Index(hitscan.HitscanEntityProto);
+            if (!dmg.TryGetComponent<HitscanBasicDamageComponent>(out var basicDamageComp, Factory))
+                return null;
+
+            return basicDamageComp.Damage * Damageable.UniversalHitscanDamageModifier;
+        }
+
+        return null;
+    }
+
     private void OnBatteryTakeAmmo(EntityUid uid, BatteryAmmoProviderComponent component, TakeAmmoEvent args)
     {
         var shots = Math.Min(args.Shots, component.Shots);
@@ -104,7 +158,8 @@ public abstract partial class SharedGunSystem
                 var ent = Spawn(proj.Prototype, coordinates);
                 return (ent, EnsureShootable(ent));
             case HitscanBatteryAmmoProviderComponent hitscan:
-                return (null, ProtoManager.Index<HitscanPrototype>(hitscan.Prototype));
+                var hitscanEnt = Spawn(hitscan.HitscanEntityProto);
+                return (hitscanEnt, EnsureShootable(hitscanEnt));
             default:
                 throw new ArgumentOutOfRangeException();
         }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index e3fbec0d5d..1b7bf4bae8 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -16,6 +16,7 @@ using Content.Shared.Tag;
 using Content.Shared.Throwing;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
+using Content.Shared.Weapons.Hitscan.Components;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
@@ -65,6 +66,8 @@ public abstract partial class SharedGunSystem : EntitySystem
     [Dependency] private   readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
+    private static readonly ProtoId<TagPrototype> TrashTag = "Trash";
+
     private const float InteractNextFire = 0.3f;
     private const double SafetyNextFire = 0.5;
     private const float EjectOffset = 0.4f;
@@ -452,6 +455,14 @@ public abstract partial class SharedGunSystem : EntitySystem
 
         cartridge.Spent = spent;
         Appearance.SetData(uid, AmmoVisuals.Spent, spent);
+
+        if (!cartridge.MarkSpentAsTrash)
+            return;
+
+        if (spent)
+            TagSystem.AddTag(uid, TrashTag);
+        else
+            TagSystem.RemoveTag(uid, TrashTag);
     }
 
     /// <summary>
@@ -490,6 +501,9 @@ public abstract partial class SharedGunSystem : EntitySystem
         if (TryComp<CartridgeAmmoComponent>(uid, out var cartridge))
             return cartridge;
 
+        if (TryComp<HitscanAmmoComponent>(uid, out var hitscanAmmo))
+            return hitscanAmmo;
+
         return EnsureComp<AmmoComponent>(uid);
     }
 
@@ -604,6 +618,8 @@ public abstract partial class SharedGunSystem : EntitySystem
 
     protected abstract void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message, EntityUid? user = null);
 
+    public abstract void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound);
+
     /// <summary>
     /// Used for animated effects on the client.
     /// </summary>
@@ -612,6 +628,26 @@ public abstract partial class SharedGunSystem : EntitySystem
     {
         public List<(NetCoordinates coordinates, Angle angle, SpriteSpecifier Sprite, float Distance)> Sprites = new();
     }
+
+    /// <summary>
+    /// Get the ammo count for a given EntityUid. Can be a firearm or magazine.
+    /// </summary>
+    public int GetAmmoCount(EntityUid uid)
+    {
+        var ammoEv = new GetAmmoCountEvent();
+        RaiseLocalEvent(uid, ref ammoEv);
+        return ammoEv.Count;
+    }
+
+    /// <summary>
+    /// Get the ammo capacity for a given EntityUid. Can be a firearm or magazine.
+    /// </summary>
+    public int GetAmmoCapacity(EntityUid uid)
+    {
+        var ammoEv = new GetAmmoCountEvent();
+        RaiseLocalEvent(uid, ref ammoEv);
+        return ammoEv.Capacity;
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Weapons/Reflect/ReflectComponent.cs b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
index ea906810a5..06923612de 100644
--- a/Content.Shared/Weapons/Reflect/ReflectComponent.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
@@ -56,6 +56,10 @@ public sealed partial class ReflectComponent : Component
     public SoundSpecifier? SoundOnReflect = new SoundPathSpecifier("/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg", AudioParams.Default.WithVariation(0.05f));
 }
 
+/// <summary>
+/// Used for both the projectiles being reflected and the entities reflecting. If there is ever overlap between the
+/// reflection types, the projectile will be reflected.
+/// </summary>
 [Flags, Serializable, NetSerializable]
 public enum ReflectType : byte
 {
diff --git a/Content.Shared/Wieldable/SharedWieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs
index 3b9b8dd8e7..49db4ff86c 100644
--- a/Content.Shared/Wieldable/SharedWieldableSystem.cs
+++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs
@@ -259,7 +259,7 @@ public abstract class SharedWieldableSystem : EntitySystem
             return false;
         }
 
-        if (_hands.CountFreeableHands((user, hands)) < component.FreeHandsRequired)
+        if (_hands.CountFreeableHands((user, hands), except: uid) < component.FreeHandsRequired)
         {
             if (!quiet)
             {
diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERandomTeleportInvokerSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERandomTeleportInvokerSystem.cs
index 24563cbff7..462d44cac0 100644
--- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERandomTeleportInvokerSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERandomTeleportInvokerSystem.cs
@@ -1,7 +1,10 @@
 using Content.Shared.Popups;
+using Content.Shared.Xenoarchaeology.Artifact.Components;
 using Content.Shared.Xenoarchaeology.Artifact.XAE.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Systems;
 
 namespace Content.Shared.Xenoarchaeology.Artifact.XAE;
 
@@ -11,6 +14,7 @@ public sealed class XAERandomTeleportInvokerSystem : BaseXAESystem<XAERandomTele
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedJointSystem _jointSystem = default!;
 
     /// <inheritdoc />
     protected override void OnActivated(Entity<XAERandomTeleportInvokerComponent> ent, ref XenoArtifactNodeActivatedEvent args)
@@ -20,10 +24,13 @@ public sealed class XAERandomTeleportInvokerSystem : BaseXAESystem<XAERandomTele
         // todo: teleport person who activated artifact with artifact itself
         var component = ent.Comp;
 
-        var xform = Transform(ent.Owner);
-        _popup.PopupCoordinates(Loc.GetString("blink-artifact-popup"), xform.Coordinates, PopupType.Medium);
+        var xform = Transform(args.Artifact);
+        _popup.PopupPredictedCoordinates(Loc.GetString("blink-artifact-popup"), xform.Coordinates, args.User, PopupType.Medium);
 
         var offsetTo = _random.NextVector2(component.MinRange, component.MaxRange);
-        _xform.SetCoordinates(ent.Owner, xform, xform.Coordinates.Offset(offsetTo));
+
+        _xform.AttachToGridOrMap(args.Artifact);
+        _jointSystem.ClearJoints(args.Artifact);
+        _xform.SetCoordinates(args.Artifact, xform, xform.Coordinates.Offset(offsetTo));
     }
 }
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
index 3247e3365a..3f59628714 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs
@@ -17,7 +17,7 @@ public sealed partial class AnalysisConsoleComponent : Component
     /// Can be null if not linked.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public NetEntity? AnalyzerEntity;
+    public EntityUid? AnalyzerEntity;
 
     [DataField]
     public SoundSpecifier? ScanFinishedSound = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg");
@@ -35,7 +35,7 @@ public sealed partial class AnalysisConsoleComponent : Component
     };
 
     /// <summary>
-    /// The machine linking port for the analyzer
+    /// The machine linking port for linking the console with the analyzer.
     /// </summary>
     [DataField]
     public ProtoId<SourcePortPrototype> LinkingPort = "ArtifactAnalyzerSender";
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
index 05d17bb123..9581285efb 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs
@@ -1,5 +1,6 @@
-using Robust.Shared.Audio;
+using Content.Shared.DeviceLinking;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Xenoarchaeology.Equipment.Components;
 
@@ -35,4 +36,10 @@ public sealed partial class ArtifactAnalyzerComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     public bool ReadyToPrint = false;
+
+    /// <summary>
+    /// The machine linking port for linking the analyzer with the console.
+    /// </summary>
+    [DataField]
+    public ProtoId<SinkPortPrototype> LinkingPort = "ArtifactAnalyzerReceiver";
 }
diff --git a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs
index 69a682b660..1130d9f305 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactCrusherComponent.cs
@@ -2,7 +2,6 @@ using Content.Shared.Damage;
 using Content.Shared.Stacks;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
-using Robust.Shared.Audio.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -14,7 +13,8 @@ namespace Content.Shared.Xenoarchaeology.Equipment.Components;
 /// <summary>
 /// This is an entity storage that, when activated, crushes the artifact inside of it and gives artifact fragments.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(SharedArtifactCrusherSystem))]
 public sealed partial class ArtifactCrusherComponent : Component
 {
@@ -27,19 +27,21 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// <summary>
     /// When the current crushing will end.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
     public TimeSpan CrushEndTime;
 
     /// <summary>
     /// The next second. Used to apply damage over time.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
     public TimeSpan NextSecond;
 
     /// <summary>
     /// The total duration of the crushing.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public TimeSpan CrushDuration = TimeSpan.FromSeconds(10);
 
     /// <summary>
@@ -51,19 +53,19 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// <summary>
     /// The minimum amount of fragments spawned.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public int MinFragments = 2;
 
     /// <summary>
     /// The maximum amount of fragments spawned, non-inclusive.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public int MaxFragments = 5;
 
     /// <summary>
     /// The material for the fragments.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public ProtoId<StackPrototype> FragmentStackProtoId = "ArtifactFragment";
 
     /// <summary>
@@ -100,12 +102,12 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// Stores entity of <see cref="CrushingSound"/> to allow ending it early.
     /// </summary>
     [DataField]
-    public (EntityUid, AudioComponent)? CrushingSoundEntity;
+    public EntityUid? CrushingSoundEntity;
 
     /// <summary>
     /// When enabled, stops the artifact crusher from being opened when it is being crushed.
     /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public bool AutoLock = false;
 }
 
diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs
index e47e964225..086b402bb2 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs
@@ -15,6 +15,7 @@ namespace Content.Shared.Xenoarchaeology.Equipment;
 public abstract class SharedArtifactAnalyzerSystem : EntitySystem
 {
     [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!;
+    [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -23,10 +24,14 @@ public abstract class SharedArtifactAnalyzerSystem : EntitySystem
 
         SubscribeLocalEvent<ArtifactAnalyzerComponent, ItemPlacedEvent>(OnItemPlaced);
         SubscribeLocalEvent<ArtifactAnalyzerComponent, ItemRemovedEvent>(OnItemRemoved);
-        SubscribeLocalEvent<ArtifactAnalyzerComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ArtifactAnalyzerComponent, NewLinkEvent>(OnNewLinkAnalyzer);
+        SubscribeLocalEvent<ArtifactAnalyzerComponent, LinkAttemptEvent>(OnLinkAttemptAnalyzer);
+        SubscribeLocalEvent<ArtifactAnalyzerComponent, PortDisconnectedEvent>(OnPortDisconnectedAnalyzer);
 
-        SubscribeLocalEvent<AnalysisConsoleComponent, NewLinkEvent>(OnNewLink);
-        SubscribeLocalEvent<AnalysisConsoleComponent, PortDisconnectedEvent>(OnPortDisconnected);
+        SubscribeLocalEvent<AnalysisConsoleComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<AnalysisConsoleComponent, NewLinkEvent>(OnNewLinkConsole);
+        SubscribeLocalEvent<AnalysisConsoleComponent, LinkAttemptEvent>(OnLinkAttemptConsole);
+        SubscribeLocalEvent<AnalysisConsoleComponent, PortDisconnectedEvent>(OnPortDisconnectedConsole);
     }
 
     private void OnItemPlaced(Entity<ArtifactAnalyzerComponent> ent, ref ItemPlacedEvent args)
@@ -44,52 +49,74 @@ public abstract class SharedArtifactAnalyzerSystem : EntitySystem
         Dirty(ent);
     }
 
-    private void OnMapInit(Entity<ArtifactAnalyzerComponent> ent, ref MapInitEvent args)
+    private void OnMapInit(Entity<AnalysisConsoleComponent> ent, ref MapInitEvent args)
     {
-        if (!TryComp<DeviceLinkSinkComponent>(ent, out var sink))
+        if (!TryComp<DeviceLinkSourceComponent>(ent, out var source))
             return;
 
-        foreach (var source in sink.LinkedSources)
+        var linkedEntities = _deviceLink.GetLinkedSinks((ent.Owner, source), ent.Comp.LinkingPort);
+
+        foreach (var sink in linkedEntities)
         {
-            if (!TryComp<AnalysisConsoleComponent>(source, out var analysis))
+            if (!TryComp<ArtifactAnalyzerComponent>(sink, out var analyzer))
                 continue;
 
-            analysis.AnalyzerEntity = GetNetEntity(ent);
-            ent.Comp.Console = source;
-            Dirty(source, analysis);
+            ent.Comp.AnalyzerEntity = sink;
+            analyzer.Console = ent.Owner;
             Dirty(ent);
+            Dirty(sink, analyzer);
             break;
         }
     }
 
-    private void OnNewLink(Entity<AnalysisConsoleComponent> ent, ref NewLinkEvent args)
+    private void OnNewLinkConsole(Entity<AnalysisConsoleComponent> ent, ref NewLinkEvent args)
     {
-        if (!TryComp<ArtifactAnalyzerComponent>(args.Sink, out var analyzer))
+        if (args.SourcePort != ent.Comp.LinkingPort || !HasComp<ArtifactAnalyzerComponent>(args.Sink))
             return;
 
-        ent.Comp.AnalyzerEntity = GetNetEntity(args.Sink);
-        analyzer.Console = ent;
-        Dirty(args.Sink, analyzer);
+        ent.Comp.AnalyzerEntity = args.Sink;
         Dirty(ent);
     }
 
-    private void OnPortDisconnected(Entity<AnalysisConsoleComponent> ent, ref PortDisconnectedEvent args)
+    private void OnNewLinkAnalyzer(Entity<ArtifactAnalyzerComponent> ent, ref NewLinkEvent args)
     {
-        var analyzerNetEntity = ent.Comp.AnalyzerEntity;
-        if (args.Port != ent.Comp.LinkingPort || analyzerNetEntity == null)
+        if (args.SinkPort != ent.Comp.LinkingPort || !HasComp<AnalysisConsoleComponent>(args.Source))
             return;
 
-        var analyzerEntityUid = GetEntity(analyzerNetEntity);
-        if (TryComp<ArtifactAnalyzerComponent>(analyzerEntityUid, out var analyzer))
-        {
-            analyzer.Console = null;
-            Dirty(analyzerEntityUid.Value, analyzer);
-        }
+        ent.Comp.Console = args.Source;
+        Dirty(ent);
+    }
+
+    private void OnLinkAttemptConsole(Entity<AnalysisConsoleComponent> ent, ref LinkAttemptEvent args)
+    {
+        if (ent.Comp.AnalyzerEntity != null)
+            args.Cancel(); // can only link to one device at a time
+    }
+
+    private void OnLinkAttemptAnalyzer(Entity<ArtifactAnalyzerComponent> ent, ref LinkAttemptEvent args)
+    {
+        if (ent.Comp.Console != null)
+            args.Cancel(); // can only link to one device at a time
+    }
+
+    private void OnPortDisconnectedConsole(Entity<AnalysisConsoleComponent> ent, ref PortDisconnectedEvent args)
+    {
+        if (args.Port != ent.Comp.LinkingPort || ent.Comp.AnalyzerEntity == null)
+            return;
 
         ent.Comp.AnalyzerEntity = null;
         Dirty(ent);
     }
 
+    private void OnPortDisconnectedAnalyzer(Entity<ArtifactAnalyzerComponent> ent, ref PortDisconnectedEvent args)
+    {
+        if (args.Port != ent.Comp.LinkingPort || ent.Comp.Console == null)
+            return;
+
+        ent.Comp.Console = null;
+        Dirty(ent);
+    }
+
     public bool TryGetAnalyzer(Entity<AnalysisConsoleComponent> ent, [NotNullWhen(true)] out Entity<ArtifactAnalyzerComponent>? analyzer)
     {
         analyzer = null;
@@ -98,14 +125,13 @@ public abstract class SharedArtifactAnalyzerSystem : EntitySystem
         if (!_powerReceiver.IsPowered(consoleEnt))
             return false;
 
-        var analyzerUid = GetEntity(ent.Comp.AnalyzerEntity);
-        if (!TryComp<ArtifactAnalyzerComponent>(analyzerUid, out var analyzerComp))
+        if (!TryComp<ArtifactAnalyzerComponent>(ent.Comp.AnalyzerEntity, out var analyzerComp))
             return false;
 
-        if (!_powerReceiver.IsPowered(analyzerUid.Value))
+        if (!_powerReceiver.IsPowered(ent.Comp.AnalyzerEntity.Value))
             return false;
 
-        analyzer = (analyzerUid.Value, analyzerComp);
+        analyzer = (ent.Comp.AnalyzerEntity.Value, analyzerComp);
         return true;
     }
 
diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
index 64f3126297..a8c4b9ff06 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
@@ -1,9 +1,16 @@
-using Content.Shared.Examine;
-using Content.Shared.Storage.Components;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
+using Content.Shared.Damage;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Popups;
+using Content.Shared.Power;
+using Content.Shared.Power.EntitySystems;
+using Content.Shared.Storage.Components;
+using Content.Shared.Verbs;
 using Content.Shared.Xenoarchaeology.Equipment.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Collections;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Xenoarchaeology.Equipment;
 
@@ -12,10 +19,14 @@ namespace Content.Shared.Xenoarchaeology.Equipment;
 /// </summary>
 public abstract class SharedArtifactCrusherSystem : EntitySystem
 {
-    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem AudioSystem = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -27,6 +38,8 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
         SubscribeLocalEvent<ArtifactCrusherComponent, StorageOpenAttemptEvent>(OnStorageOpenAttempt);
         SubscribeLocalEvent<ArtifactCrusherComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<ArtifactCrusherComponent, GotEmaggedEvent>(OnEmagged);
+        SubscribeLocalEvent<ArtifactCrusherComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerbs);
+        SubscribeLocalEvent<ArtifactCrusherComponent, PowerChangedEvent>(OnPowerChanged);
     }
 
     private void OnInit(Entity<ArtifactCrusherComponent> ent, ref ComponentInit args)
@@ -53,6 +66,7 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
 
         ent.Comp.AutoLock = true;
         args.Handled = true;
+        Dirty(ent);
     }
 
     private void OnStorageOpenAttempt(Entity<ArtifactCrusherComponent> ent, ref StorageOpenAttemptEvent args)
@@ -66,22 +80,94 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
         args.PushMarkup(ent.Comp.AutoLock ? Loc.GetString("artifact-crusher-examine-autolocks") : Loc.GetString("artifact-crusher-examine-no-autolocks"));
     }
 
-    public void StopCrushing(Entity<ArtifactCrusherComponent> ent, bool early = true)
+    private void OnGetVerbs(Entity<ArtifactCrusherComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
     {
-        var (_, crusher) = ent;
-
-        if (!crusher.Crushing)
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || ent.Comp.Crushing)
             return;
 
-        crusher.Crushing = false;
-        Appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, false);
+        if (!TryComp<EntityStorageComponent>(ent, out var entityStorageComp) ||
+            entityStorageComp.Contents.ContainedEntities.Count == 0)
+            return;
+
+        if (!_power.IsPowered(ent.Owner))
+            return;
+
+        var user = args.User;
+        var verb = new AlternativeVerb
+        {
+            Text = Loc.GetString("artifact-crusher-verb-start-crushing"),
+            Priority = 2,
+            Act = () => StartCrushing((ent, ent.Comp, entityStorageComp), user)
+        };
+        args.Verbs.Add(verb);
+    }
+
+    private void OnPowerChanged(Entity<ArtifactCrusherComponent> ent, ref PowerChangedEvent args)
+    {
+        if (!args.Powered)
+            StopCrushing(ent);
+    }
+
+    public void StartCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent, EntityUid? user = null)
+    {
+        var (uid, crusher, _) = ent;
+
+        if (crusher.Crushing)
+            return;
+
+        if (crusher.AutoLock)
+            _popup.PopupPredicted(Loc.GetString("artifact-crusher-autolocks-enable"), uid, user);
+
+        crusher.Crushing = true;
+        crusher.NextSecond = _timing.CurTime + TimeSpan.FromSeconds(1);
+        crusher.CrushEndTime = _timing.CurTime + crusher.CrushDuration;
+        crusher.CrushingSoundEntity = AudioSystem.PlayPvs(crusher.CrushingSound, ent)?.Entity;
+        _appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, true);
+        Dirty(ent, ent.Comp1);
+    }
+
+    public void StopCrushing(Entity<ArtifactCrusherComponent> ent, bool early = true)
+    {
+        if (!ent.Comp.Crushing)
+            return;
+
+        ent.Comp.Crushing = false;
+        _appearance.SetData(ent, ArtifactCrusherVisuals.Crushing, false);
 
         if (early)
         {
-            AudioSystem.Stop(crusher.CrushingSoundEntity?.Item1, crusher.CrushingSoundEntity?.Item2);
-            crusher.CrushingSoundEntity = null;
+            AudioSystem.Stop(ent.Comp.CrushingSoundEntity);
+            ent.Comp.CrushingSoundEntity = null;
         }
 
         Dirty(ent, ent.Comp);
     }
+
+    public virtual void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageComponent> ent) { }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<ArtifactCrusherComponent, EntityStorageComponent>();
+        while (query.MoveNext(out var uid, out var crusher, out var storage))
+        {
+            if (!crusher.Crushing)
+                continue;
+
+            if (crusher.NextSecond < _timing.CurTime)
+            {
+                var contents = new ValueList<EntityUid>(storage.Contents.ContainedEntities);
+                foreach (var contained in contents)
+                {
+                    _damageable.TryChangeDamage(contained, crusher.CrushingDamage);
+                }
+                crusher.NextSecond += TimeSpan.FromSeconds(1);
+                Dirty(uid, crusher);
+            }
+
+            if (crusher.CrushEndTime < _timing.CurTime)
+                FinishCrushing((uid, crusher, storage));
+        }
+    }
 }
diff --git a/Content.Server/Zombies/IncurableZombieComponent.cs b/Content.Shared/Zombies/IncurableZombieComponent.cs
similarity index 77%
rename from Content.Server/Zombies/IncurableZombieComponent.cs
rename to Content.Shared/Zombies/IncurableZombieComponent.cs
index 375b814b51..2d54950291 100644
--- a/Content.Server/Zombies/IncurableZombieComponent.cs
+++ b/Content.Shared/Zombies/IncurableZombieComponent.cs
@@ -1,10 +1,11 @@
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Zombies;
+namespace Content.Shared.Zombies;
 
 /// <summary>
 /// This is used for a zombie that cannot be cured by any methods. Gives a succumb to zombie infection action.
 /// </summary>
+/// <remarks> We don't network this component for anti-cheat purposes.</remarks>
 [RegisterComponent]
 public sealed partial class IncurableZombieComponent : Component
 {
diff --git a/Content.Tools/test/run.sh b/Content.Tools/test/run.sh
index 7809b4dc92..876325ba56 100755
--- a/Content.Tools/test/run.sh
+++ b/Content.Tools/test/run.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 cp 0A.yml out.yml
 ../bin/Debug/net5.0/Content.Tools out.yml 0B.yml 0C.yml
diff --git a/Resources/Audio/Effects/spray2.ogg b/Resources/Audio/Effects/spray2.ogg
index d184d76bd0..f1a04ddac8 100644
Binary files a/Resources/Audio/Effects/spray2.ogg and b/Resources/Audio/Effects/spray2.ogg differ
diff --git a/Resources/Audio/MidiCustom/GeneralUser-GS-Bank0.sf2 b/Resources/Audio/MidiCustom/GeneralUser-GS.sf2
similarity index 81%
rename from Resources/Audio/MidiCustom/GeneralUser-GS-Bank0.sf2
rename to Resources/Audio/MidiCustom/GeneralUser-GS.sf2
index a7eefb3df5..2fdd31c69e 100644
Binary files a/Resources/Audio/MidiCustom/GeneralUser-GS-Bank0.sf2 and b/Resources/Audio/MidiCustom/GeneralUser-GS.sf2 differ
diff --git a/Resources/Audio/MidiCustom/space-station-14.sf2 b/Resources/Audio/MidiCustom/space-station-14.sf2
index 54c6eb6196..879bb082dc 100644
Binary files a/Resources/Audio/MidiCustom/space-station-14.sf2 and b/Resources/Audio/MidiCustom/space-station-14.sf2 differ
diff --git a/Resources/Audio/Voice/Vox/attributions.yml b/Resources/Audio/Voice/Vox/attributions.yml
index dd31a9c4cd..b1b0c7d054 100644
--- a/Resources/Audio/Voice/Vox/attributions.yml
+++ b/Resources/Audio/Voice/Vox/attributions.yml
@@ -28,3 +28,14 @@
   copyright: "raptorgoesextinct.wav by Nerdwizard78"
   source: "https://freesound.org/people/Nerdwizard78/sounds/643928/"
 
+- files:
+  - vox_chitter.ogg
+  license: "CC0-1.0"
+  copyright: "dinosaur.wav by JhennaSide"
+  source: "https://freesound.org/people/JhennaSide/sounds/455906/"
+  
+- files:
+  - vox_click.ogg
+  license: "CC0-1.0"
+  copyright: "Storks bill-clapping by Breviceps"
+  source: "https://freesound.org/people/Breviceps/sounds/705861/"
diff --git a/Resources/Audio/Voice/Vox/vox_chitter.ogg b/Resources/Audio/Voice/Vox/vox_chitter.ogg
new file mode 100644
index 0000000000..0353d3e57a
Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_chitter.ogg differ
diff --git a/Resources/Audio/Voice/Vox/vox_click.ogg b/Resources/Audio/Voice/Vox/vox_click.ogg
new file mode 100644
index 0000000000..696a063976
Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_click.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index b2ebdecbfd..eb2d5599f4 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1461,5 +1461,27 @@ Entries:
   id: 177
   time: '2025-10-05T07:40:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40709
+- author: Samuka
+  changes:
+  - message: Added bank account toolshed commands
+    type: Add
+  id: 178
+  time: '2025-10-15T15:21:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40614
+- author: Errant
+  changes:
+  - message: The old buttons to Teleport and kick (Player Actions Panel) have been
+      removed from the first tab of the admin menu.
+    type: Remove
+  id: 179
+  time: '2025-10-17T15:38:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40904
+- author: PJB3005
+  changes:
+  - message: Fixed pre-round lobby Discord ahelps showing incorrect round number
+    type: Fix
+  id: 180
+  time: '2025-10-23T14:16:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41060
 Name: Admin
 Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 917d2c1f78..ba2ba073c7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,763 +1,4 @@
 Entries:
-- author: CoconutThunder
-  changes:
-  - message: Fixed lubed items being thrown when looking at the pickup verb.
-    type: Fix
-  - message: Fixed multihanded items showing a popup when looking at the pickup verb.
-    type: Fix
-  - message: Fixed a bug with lubed handcuffs.
-    type: Fix
-  id: 8561
-  time: '2025-05-25T05:10:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38705
-- author: CoconutThunder
-  changes:
-  - message: The Chief Medical Officer should now appear with the correct precedence
-      in the crew manifest.
-    type: Fix
-  id: 8560
-  time: '2025-05-24T05:10:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37774
-- author: TiniestShark
-  changes:
-  - message: Added inhand sprites for the bartender utensils and mugs.
-    type: Add
-  id: 8561
-  time: '2025-05-24T17:32:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37771
-- author: K-Dynamic
-  changes:
-  - message: Shutters and blast doors now appear welded when welded.
-    type: Fix
-  id: 8562
-  time: '2025-05-25T15:57:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37807
-- author: Stop-Signs
-  changes:
-  - message: Meals now better reflect the amount of ingredients put into them.
-    type: Tweak
-  id: 8563
-  time: '2025-05-25T18:02:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34138
-- author: brainfood1183
-  changes:
-  - message: Kangaroos can now be equipped with northstars and knuckle dusters.
-    type: Tweak
-  id: 8564
-  time: '2025-05-25T18:03:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37789
-- author: Moomoobeef
-  changes:
-  - message: Added new variants to dirty tiles.
-    type: Tweak
-  id: 8565
-  time: '2025-05-25T18:11:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37800
-- author: AsnDen
-  changes:
-  - message: Tile-aligned bar sign version was added.
-    type: Add
-  - message: Bar signs now have proper collision.
-    type: Fix
-  id: 8566
-  time: '2025-05-25T18:36:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37756
-- author: Fildrance
-  changes:
-  - message: Spray nozzle now can consume liquids from puddles and put it right into
-      backpacked tank.
-    type: Add
-  id: 8567
-  time: '2025-05-26T03:36:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30600
-- author: Southbridge
-  changes:
-  - message: On Amber, gave security its missing beacon and barriers.
-    type: Fix
-  id: 8568
-  time: '2025-05-26T07:29:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37700
-- author: jessicamaybe
-  changes:
-  - message: NPC Gorillas can now pry open doors and vault/smash tables!
-    type: Tweak
-  id: 8569
-  time: '2025-05-26T10:49:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37822
-- author: ArtisticRoomba
-  changes:
-  - message: The TEG's efficiency in extracting power from gasses has been tweaked
-      to promote dual-loop designs that recycle the waste heat of gasses, and punish
-      "meta" single loop designs.
-    type: Tweak
-  id: 8570
-  time: '2025-05-26T11:53:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37728
-- author: ArtisticRoomba
-  changes:
-  - message: The TEG now outputs smoother power when pressure across the circulators
-      flutter. (This was causing epilepsy in extreme circumstances).
-    type: Fix
-  id: 8571
-  time: '2025-05-26T12:07:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37658
-- author: chromiumboy
-  changes:
-  - message: Sentry turret control panels can now be found adjacent to rooms containing
-      sentry turrets. Authorized personnel can use these panels to remotely monitor
-      and alter the settings of any linked sentry turrets.
-    type: Add
-  id: 8572
-  time: '2025-05-26T13:00:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35235
-- author: metalgearsloth
-  changes:
-  - message: You no longer face items for a single frame when clicking while moving.
-    type: Tweak
-  id: 8573
-  time: '2025-05-27T11:34:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37874
-- author: Simyon
-  changes:
-  - message: Capacitors and Matter bins have been combined into the Manipulator.
-    type: Remove
-  id: 8574
-  time: '2025-05-27T11:47:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37725
-- author: PicklOH
-  changes:
-  - message: Gas Pipes are now named as such in the construction menu.
-    type: Tweak
-  id: 8575
-  time: '2025-05-27T16:26:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37881
-- author: ProfRenderer
-  changes:
-  - message: Cluwne ID cards now have a job icon.
-    type: Tweak
-  id: 8576
-  time: '2025-05-27T16:39:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37834
-- author: Moomoobeef
-  changes:
-  - message: Bookshelves now contain a more reasonable amount of books.
-    type: Tweak
-  id: 8577
-  time: '2025-05-27T21:21:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37866
-- author: SlamBamActionman
-  changes:
-  - message: Seismic Charges now trigger the timer when sent a signal, instead of
-      detonating instantly.
-    type: Tweak
-  - message: Signal Triggers for modular grenades now detonate after a 3 second delay.
-    type: Tweak
-  id: 8578
-  time: '2025-05-28T07:31:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34465
-- author: Minemoder5000
-  changes:
-  - message: Grape juice cups now contain grape juice.
-    type: Fix
-  id: 8579
-  time: '2025-05-28T09:32:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37895
-- author: Moomoobeef
-  changes:
-  - message: Made high-viz vest less visible.
-    type: Tweak
-  id: 8580
-  time: '2025-05-28T09:39:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37869
-- author: deltanedas
-  changes:
-  - message: Diona "Gib yourself!" action now has a suicide warning like microbombs.
-    type: Tweak
-  id: 8581
-  time: '2025-05-28T19:52:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27422
-- author: sowelipililimute
-  changes:
-  - message: Plants can process nutrition again
-    type: Fix
-  - message: Plants can process robust harvest again
-    type: Fix
-  id: 8582
-  time: '2025-05-28T22:51:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37912
-- author: mhamster
-  changes:
-  - message: Chameleon clothes are now affected by any kind of EMP explosion, which
-      makes them go wild and change your current outfit to a random mess once.
-    type: Tweak
-  id: 8583
-  time: '2025-05-30T00:06:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30924
-- author: brainfood1183
-  changes:
-  - message: Bananium Rock Anomaly added
-    type: Add
-  id: 8584
-  time: '2025-05-30T01:16:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37787
-- author: Seam_Less
-  changes:
-  - message: Added practice magazines to the Secfab as a roundstart recipe
-    type: Add
-  id: 8585
-  time: '2025-05-30T01:24:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37710
-- author: Beck, SlamBamActionman
-  changes:
-  - message: Added a chameleon controller implant that allows you to quickly switch
-      between job outfits! It also interacts with Agent IDs and fake mindshield implant.
-      Will use your profile's loadout if possible.
-    type: Add
-  - message: The chameleon kit now includes the chameleon controller implant.
-    type: Add
-  id: 8586
-  time: '2025-05-30T10:07:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33887
-- author: aada
-  changes:
-  - message: Filter categories added to the cutter machine.
-    type: Add
-  id: 8587
-  time: '2025-05-30T15:19:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34321
-- author: Nox38
-  changes:
-  - message: Assault Rifles can now be switched between semi and full auto.
-    type: Tweak
-  id: 8588
-  time: '2025-05-30T15:50:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34907
-- author: Alpaccalypse
-  changes:
-  - message: Absinthe makes you mildly hallucinate.
-    type: Tweak
-  - message: Absinthe is served in a smaller glass. No more vomiting.
-    type: Tweak
-  id: 8589
-  time: '2025-05-30T16:03:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34371
-- author: Nox38
-  changes:
-  - message: Increased firerate and cooldown of Drozd's burst mode.
-    type: Tweak
-  id: 8590
-  time: '2025-05-30T16:16:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34906
-- author: spanky-spanky
-  changes:
-  - message: Secret door sprites now display correctly when facing all directions.
-    type: Fix
-  id: 8591
-  time: '2025-05-30T18:11:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37914
-- author: ArtisticRoomba
-  changes:
-  - message: The TEG now shows its capable peak power output on inspect, making it
-      easier for engineers to match the TEG's power output with the current grid demand
-      (to save fuel!).
-    type: Add
-  id: 8592
-  time: '2025-05-30T21:41:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37957
-- author: Centronias
-  changes:
-  - message: Headphones show animated music notes when activated again.
-    type: Fix
-  id: 8593
-  time: '2025-05-30T23:53:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35341
-- author: beck-thompson
-  changes:
-  - message: Removed the keep alive traitor objective.
-    type: Remove
-  id: 8594
-  time: '2025-05-31T02:09:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37945
-- author: ScarKy0
-  changes:
-  - message: Priority mail now grants slightly more spesos if delivered on time, and
-      slightly less if done otherwise.
-    type: Tweak
-  - message: Bomb mail now explodes way after and deals slightly more damage.
-    type: Tweak
-  id: 8595
-  time: '2025-06-01T04:28:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37986
-- author: TheFlyingSentry
-  changes:
-  - message: Added a new disability called Monochromacy, total colorblindness.
-    type: Add
-  id: 8596
-  time: '2025-06-01T05:31:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37989
-- author: Hitlinemoss
-  changes:
-  - message: Cargo can now order the bulk cleanades crate, containing two cleanade
-      boxes for $400.
-    type: Add
-  id: 8597
-  time: '2025-06-01T15:48:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38000
-- author: chromiumboy
-  changes:
-  - message: Atmospheric pipes can now be built on three different sublayers, allowing
-      for multiple pipe networks on a single tile
-    type: Add
-  - message: Pipe manifolds can now be constructed to connect pipes across different
-      sublayers
-    type: Add
-  id: 8599
-  time: '2025-06-02T05:01:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36124
-- author: ScarKy0
-  changes:
-  - message: Air Grenades can now be ordered from your request consoles.
-    type: Add
-  id: 8600
-  time: '2025-06-02T09:18:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38010
-- author: Cojoke-dot
-  changes:
-  - message: Lube now evaporates slowly
-    type: Tweak
-  id: 8601
-  time: '2025-06-02T10:41:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37998
-- author: ciaran
-  changes:
-  - message: Clearer labels for toggle internals actions
-    type: Add
-  id: 8602
-  time: '2025-06-02T11:09:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36073
-- author: BarryNorfolk
-  changes:
-  - message: New component and system for creating more multipart machines!
-    type: Add
-  - message: Converted the Particle Accelerator to use new multipart machine system.
-    type: Tweak
-  - message: Examining a Particle Accelerator now shows ghosts of what and where to
-      place the exact parts.
-    type: Add
-  id: 8603
-  time: '2025-06-02T14:02:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35969
-- author: slarticodefast
-  changes:
-  - message: The detective's noir glasses now show red colors in a Sin City style
-      shader.
-    type: Tweak
-  id: 8604
-  time: '2025-06-02T16:16:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37996
-- author: Krunklehorn
-  changes:
-  - message: Animals can no longer fiddle with guns, radiation collectors, emitters,
-      welders, stun batons, cameras and camera routers.
-    type: Fix
-  - message: Animals can no longer rotate and flip buildings or unbuckle others.
-    type: Fix
-  id: 8605
-  time: '2025-06-02T17:06:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37246
-- author: ManuelGusmao
-  changes:
-  - message: Fixed wall-mounted objects so that after their deconstruction they don't
-      spawn the result inside a wall, or on the other side of it.
-    type: Fix
-  id: 8606
-  time: '2025-06-02T21:20:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36353
-- author: ScarKy0
-  changes:
-  - message: Directional reinforced plasma and uranium windows are now correctly more
-      durable than regular directional reinforced windows.
-    type: Fix
-  - message: Directional uranium windows can no longer be deconstructed with an RCD.
-    type: Fix
-  id: 8607
-  time: '2025-06-03T11:49:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38038
-- author: Hitlinemoss
-  changes:
-  - message: Most cargo food orders are now more expensive.
-    type: Tweak
-  - message: Disaster pizza deliveries and softdrinks bulk crates have been removed.
-    type: Remove
-  id: 8608
-  time: '2025-06-03T16:01:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38006
-- author: TheFlyingSentry
-  changes:
-  - message: Electropacks now shock people regardless of if they have insulated gloves
-      or not
-    type: Tweak
-  id: 8609
-  time: '2025-06-03T17:38:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38011
-- author: K-Dynamic
-  changes:
-  - message: Cryo sleep units no longer pin players against walls.
-    type: Fix
-  id: 8610
-  time: '2025-06-03T18:13:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37979
-- author: ScarKy0
-  changes:
-  - message: Increased the health of uranium windows, making them a reasonable upgrade
-      over regular plasma.
-    type: Tweak
-  id: 8611
-  time: '2025-06-03T18:20:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38040
-- author: Moomoobeef
-  changes:
-  - message: Nanotask printouts now look much nicer!
-    type: Tweak
-  id: 8612
-  time: '2025-06-04T08:16:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37805
-- author: TheCactus, ilovehans10
-  changes:
-  - message: Added text highlighting.
-    type: Add
-  id: 8613
-  time: '2025-06-04T10:12:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31442
-- author: SlamBamActionman
-  changes:
-  - message: Diona can now root, keeping them from slipping but absorbing fluids from
-      the ground.
-    type: Add
-  id: 8614
-  time: '2025-06-04T10:53:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32782
-- author: spanky-spanky
-  changes:
-  - message: Evac repair lockers, which contain equipment to repair shuttle bombing.
-    type: Add
-  id: 8615
-  time: '2025-06-05T06:08:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38075
-- author: slarticodefast
-  changes:
-  - message: Fixed the game not launching in compability mode.
-    type: Fix
-  id: 8616
-  time: '2025-06-05T12:52:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38080
-- author: Orsoniks
-  changes:
-  - message: Added more in-hand sprites for food items
-    type: Add
-  id: 8617
-  time: '2025-06-05T21:06:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38024
-- author: chromiumboy
-  changes:
-  - message: Holopads now provide less visual coverage to station AIs (1 tile radius,
-      down from 7.5). Holopads must also be anchored to the floor to provide vision.
-    type: Tweak
-  id: 8618
-  time: '2025-06-05T23:15:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38059
-- author: Simyon
-  changes:
-  - message: Sleeper agents no longer have different codewords than round-start traitors.
-    type: Fix
-  id: 8619
-  time: '2025-06-05T23:19:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37928
-- author: Gentleman-Bird
-  changes:
-  - message: Fixed the "create soap" recipe so it can actually be made
-    type: Fix
-  id: 8620
-  time: '2025-06-05T23:20:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37923
-- author: Hitlinemoss
-  changes:
-  - message: The security mime mask has been added to the SecDrobe's manager inventory.
-    type: Add
-  id: 8621
-  time: '2025-06-05T23:23:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37890
-- author: ArtisticRoomba
-  changes:
-  - message: Most syndicate contraband have been given sell prices (depending on the
-      "power" of the item) to discourage powergaming and encourage Security's interaction
-      with Departmental Economy.
-    type: Add
-  id: 8622
-  time: '2025-06-05T23:26:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37835
-- author: RedBookcase
-  changes:
-  - message: The running and walking speed debuffs on equipped gear have been standardized.
-    type: Tweak
-  id: 8623
-  time: '2025-06-05T23:27:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37828
-- author: august-sun
-  changes:
-  - message: Added individual Bulldog drum magazines for sale in the syndicate uplink.
-      Ammo types available are pellets and slugs.
-    type: Add
-  id: 8624
-  time: '2025-06-05T23:35:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37917
-- author: Xeri7
-  changes:
-  - message: Added ability to pick up potted plants in two hands, as well as store
-      them in crates!
-    type: Add
-  - message: Added purchasable potted plant crate!
-    type: Add
-  id: 8625
-  time: '2025-06-05T23:36:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37591
-- author: K-Dynamic
-  changes:
-  - message: Rifle crates with two Lecters and four magazines can be ordered from
-      Cargo for 8000 spesos.
-    type: Add
-  - message: Lethal Weapons gift event now includes a Rifle crate.
-    type: Tweak
-  - message: SMG crates are properly described and no longer reference 'semiautomatic
-      rifles.'
-    type: Tweak
-  id: 8626
-  time: '2025-06-05T23:40:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35535
-- author: themias
-  changes:
-  - message: Wearing a muzzle now reduces the sound of vocal emotes
-    type: Tweak
-  id: 8627
-  time: '2025-06-05T23:45:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34444
-- author: RedBookcase
-  changes:
-  - message: Added Scrap Armor and Scrap Helmets.
-    type: Add
-  id: 8628
-  time: '2025-06-06T00:13:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37601
-- author: Samuka
-  changes:
-  - message: Fire bombs are now minor contra
-    type: Tweak
-  - message: Pipe bombs are now minor contra
-    type: Tweak
-  id: 8629
-  time: '2025-06-06T02:28:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38088
-- author: Minemoder
-  changes:
-  - message: Shark plushies now bite.
-    type: Tweak
-  id: 8630
-  time: '2025-06-06T21:07:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38113
-- author: themias
-  changes:
-  - message: Increased the chance of throwing trash into a disposal unit
-    type: Tweak
-  id: 8631
-  time: '2025-06-06T22:13:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38116
-- author: spanky-spanky
-  changes:
-  - message: Landmines now light up in the dark!
-    type: Tweak
-  id: 8632
-  time: '2025-06-06T23:01:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38092
-- author: slarticodefast
-  changes:
-  - message: Fixed wallmount vending machines dispensing in the wrong direction.
-    type: Fix
-  id: 8633
-  time: '2025-06-06T23:08:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38112
-- author: hoshizora-sayo
-  changes:
-  - message: Added proper name to the chameleon controller implanter
-    type: Add
-  id: 8634
-  time: '2025-06-07T02:29:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38117
-- author: K-Dynamic
-  changes:
-  - message: Disablers now hold 16 shots instead of 20
-    type: Tweak
-  id: 8635
-  time: '2025-06-07T13:05:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36019
-- author: perryprog
-  changes:
-  - message: Diamonds can now be ejected from lathes and material silos.
-    type: Fix
-  id: 8636
-  time: '2025-06-07T17:36:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38132
-- author: slarticodefast
-  changes:
-  - message: Fixed the stripping UI layout when having more than 2 hands.
-    type: Fix
-  id: 8637
-  time: '2025-06-07T22:23:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37577
-- author: Nox38
-  changes:
-  - message: Space Carp ghost roles no longer have a raffle!
-    type: Tweak
-  id: 8638
-  time: '2025-06-08T02:49:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38101
-- author: archee1
-  changes:
-  - message: Seismic Charges are now marked as cargo/sec contraband
-    type: Tweak
-  - message: Modular grenade payloads such as explosive or flash payloads, are now
-      properly marked as their relative department's contraband.
-    type: Tweak
-  - message: Improvised explosives are now considered minor contraband.
-    type: Tweak
-  id: 8639
-  time: '2025-06-09T01:05:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37521
-- author: Orsoniks
-  changes:
-  - message: Reworked the Health examination text
-    type: Tweak
-  id: 8640
-  time: '2025-06-09T07:31:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38126
-- author: TiniestShark
-  changes:
-  - message: Mecha parts now require two hands to pick up.
-    type: Tweak
-  id: 8641
-  time: '2025-06-09T07:40:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38162
-- author: DrSmugleaf
-  changes:
-  - message: Fixed eating and drinking verbs showing up after a short delay and their
-      effect being delayed.
-    type: Fix
-  id: 8642
-  time: '2025-06-09T14:36:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38164
-- author: sowelipililimute
-  changes:
-  - message: Departmental request computers now send their orders directly to Cargo,
-      instead of requiring paper slips be brought to Cargo for insertion
-    type: Tweak
-  id: 8643
-  time: '2025-06-09T15:11:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37943
-- author: Disp-Dev
-  changes:
-  - message: Two new recipes have been added, Full English and Full American breakfast.
-    type: Add
-  id: 8644
-  time: '2025-06-09T22:33:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37279
-- author: cnv41
-  changes:
-  - message: Fixed a minor typo in coffin description.
-    type: Fix
-  id: 8645
-  time: '2025-06-09T22:33:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38193
-- author: ArtisticRoomba
-  changes:
-  - message: Convex, Loop, Meta, and Omega have been removed from the map rotation
-      pool to make way for new maps. Thank you Spessmann for Convex, TytosB for Loop,
-      Nox38 for her recent Meta overhauls, and Emisse for Omega.
-    type: Remove
-  id: 8646
-  time: '2025-06-09T22:37:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38190
-- author: nabegator
-  changes:
-  - message: hi-viz vest now has a 2% chance to reflect lasers
-    type: Tweak
-  id: 8647
-  time: '2025-06-09T23:03:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38180
-- author: ArtisticRoomba
-  changes:
-  - message: Spacing damage has been brought back to its unnerfed value, as Atmospherics
-      and Engineering now have better tools to combat spacing.
-    type: Tweak
-  id: 8648
-  time: '2025-06-10T00:05:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38196
-- author: Southbridge
-  changes:
-  - message: AI camera static shader has been updated to be more consistent.
-    type: Tweak
-  id: 8649
-  time: '2025-06-10T04:47:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38093
-- author: BramvanZijp
-  changes:
-  - message: Added Stamina Damage resistance to the raid/hard-suits used by Nuclear
-      Operatives and Emergency Response Teams. [TEST MERGE]
-    type: Tweak
-  id: 8650
-  time: '2025-06-10T19:31:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37040
-- author: themias
-  changes:
-  - message: Returned the cooldown for bike horn implants
-    type: Fix
-  id: 8651
-  time: '2025-06-10T21:40:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38237
-- author: eoineoineoin
-  changes:
-  - message: Technology disks will now show the tech they contain in their name.
-    type: Add
-  id: 8652
-  time: '2025-06-11T01:15:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38157
-- author: hoshizora-sayo
-  changes:
-  - message: Fixed mops, rags, and towels being unable to be properly emptied into
-      drains
-    type: Fix
-  id: 8653
-  time: '2025-06-11T04:54:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38252
-- author: Boaz1111
-  changes:
-  - message: Grenadine bottles now start closed, instead of opened.
-    type: Tweak
-  id: 8654
-  time: '2025-06-11T14:01:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38219
-- author: ScarKy0
-  changes:
-  - message: Reinforced plasma windows no longer block laser shots.
-    type: Fix
-  id: 8655
-  time: '2025-06-11T15:36:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38041
-- author: Simyon264
-  changes:
-  - message: The MIDI Channel Selector now shows the instrument name of the track!
-    type: Tweak
-  id: 8656
-  time: '2025-06-11T18:32:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38083
 - author: Seam_Less
   changes:
   - message: Practice Magazines are now white, Incendiary Magazines are now orange.
@@ -3572,6 +2813,14 @@
   id: 9012
   time: '2025-09-27T20:51:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40572
+- author: keronshb
+  changes:
+  - message: 'EXPERIMENTAL: Tasers, a short-ranged gun capable of causing targets
+      to become prone, are now added into Warden, HoS, and Security locker fills.'
+    type: Add
+  id: 9013
+  time: '2025-09-27T21:21:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39087
 - author: SurrealShibe
   changes:
   - message: Vulpkanin now audibly gasp.
@@ -3930,6 +3179,14 @@
   id: 9059
   time: '2025-10-08T23:45:56.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40786
+- author: SlamBamActionman
+  changes:
+  - message: EXPERIMENTAL Nocturine now slows the target down, with a longer duration
+      and shorter delay before activating.
+    type: Tweak
+  id: 9060
+  time: '2025-10-09T13:32:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40797
 - author: Princess-Cheeseballs
   changes:
   - message: Dying while asleep shouldn't permanently blind you anymore.
@@ -3944,3 +3201,731 @@
   id: 9062
   time: '2025-10-09T14:00:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40790
+- author: Princess-Cheeseballs
+  changes:
+  - message: The thieving beacon can now detect the officer's handgun objective.
+    type: Fix
+  id: 9063
+  time: '2025-10-10T04:59:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40811
+- author: Hitlinemoss
+  changes:
+  - message: The Paladin AI lawset has been rewritten.
+    type: Tweak
+  id: 9064
+  time: '2025-10-10T12:41:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40343
+- author: kontakt
+  changes:
+  - message: Ninjas can now have a bombing target at any warp point.
+    type: Tweak
+  id: 9065
+  time: '2025-10-10T21:27:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40726
+- author: frigid-dev
+  changes:
+  - message: Ore Crabs now collide with the player if mob collisions are enabled.
+    type: Tweak
+  - message: Ore Crabs now show they are stunned
+    type: Fix
+  id: 9066
+  time: '2025-10-10T23:31:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40764
+- author: Crude Oil
+  changes:
+  - message: Removed 'Activate Holopad Projector' verb from the station AI core.
+    type: Fix
+  id: 9067
+  time: '2025-10-11T00:03:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39937
+- author: Hitlinemoss
+  changes:
+  - message: Ice now satiates thirst.
+    type: Tweak
+  - message: Ice now evaporates.
+    type: Tweak
+  id: 9068
+  time: '2025-10-11T00:20:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40149
+- author: slarticodefast
+  changes:
+  - message: The artifact analysis console no longer breaks when trying to link it
+      to multiple artifact analyzers or vice versa.
+    type: Fix
+  id: 9069
+  time: '2025-10-11T00:33:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39984
+- author: qwerltaz
+  changes:
+  - message: The ID card computer now has buttons to grant or revoke all access from
+      the target ID card.
+    type: Add
+  id: 9070
+  time: '2025-10-11T00:52:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39375
+- author: Centronias
+  changes:
+  - message: The HugBot, which is similar in purpose and construction to other small
+      robots like the CleanBot.
+    type: Add
+  id: 9071
+  time: '2025-10-11T01:05:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37557
+- author: PicklOH
+  changes:
+  - message: Added more Syndie ammo to the EMAG lathe inventory
+    type: Add
+  id: 9072
+  time: '2025-10-11T05:14:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40822
+- author: TrixxedHeart
+  changes:
+  - message: Updated Xenoarchaeology guidebook page to current system.
+    type: Tweak
+  id: 9073
+  time: '2025-10-11T17:32:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40621
+- author: HTMLSystem
+  changes:
+  - message: Added infectious anom sprites for moths and arachnids.
+    type: Add
+  id: 9074
+  time: '2025-10-11T18:01:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39508
+- author: ScarKy0
+  changes:
+  - message: Mice, cockroaches and other small mobs can no longer unwrap parcels.
+    type: Fix
+  id: 9075
+  time: '2025-10-11T21:32:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40838
+- author: Hitlinemoss
+  changes:
+  - message: Autolathes can now print durathread.
+    type: Add
+  id: 9076
+  time: '2025-10-11T21:46:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40837
+- author: cloudyias
+  changes:
+  - message: Added the ability for droppers to be printed via autolathes and medfabs
+    type: Add
+  id: 9077
+  time: '2025-10-11T23:15:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40074
+- author: jessicamaybe
+  changes:
+  - message: Added swabs and an emag inventory to the biogenerator
+    type: Tweak
+  id: 9078
+  time: '2025-10-12T00:15:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39037
+- author: SuperGDPWYL
+  changes:
+  - message: Added the Syndicate ID Card to the uplink for 1 TC.
+    type: Add
+  id: 9079
+  time: '2025-10-12T00:56:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38381
+- author: aada
+  changes:
+  - message: Cannabis no longer stacks infinitely. Sorry, botanists!
+    type: Fix
+  id: 9080
+  time: '2025-10-12T01:29:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38412
+- author: GovnokradZXC
+  changes:
+  - message: New hair named Pigtail (Over Eye)
+    type: Add
+  id: 9081
+  time: '2025-10-12T05:45:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39850
+- author: Princess-Cheeseballs
+  changes:
+  - message: Meat Kudzu gasps less often.
+    type: Tweak
+  id: 9082
+  time: '2025-10-12T10:47:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39304
+- author: PJB3005
+  changes:
+  - message: The patrons list in the in-game credits works again.
+    type: Fix
+  id: 9083
+  time: '2025-10-12T11:02:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40840
+- author: DrSmugleaf
+  changes:
+  - message: Fixed species not being ordered alphabetically in the character customization
+      UI.
+    type: Fix
+  id: 9084
+  time: '2025-10-12T11:14:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39359
+- author: Callmore
+  changes:
+  - message: Bullet casings can now be picked up again.
+    type: Fix
+  id: 9085
+  time: '2025-10-12T18:45:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40829
+- author: CoconutThunder
+  changes:
+  - message: Fixed lubed items being thrown when looking at the pickup verb.
+    type: Fix
+  - message: Fixed multihanded items showing a popup when looking at the pickup verb.
+    type: Fix
+  - message: Fixed a bug with lubed handcuffs.
+    type: Fix
+  id: 9086
+  time: '2025-05-25T05:10:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38705
+- author: GitHubUser53123
+  changes:
+  - message: Zombies that aren't supposed to spread the zombie virus now don't do
+      so on mobs in critical state.
+    type: Fix
+  id: 9087
+  time: '2025-10-13T01:24:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40857
+- author: PotentiallyTom
+  changes:
+  - message: Added a page in the guidebook listing common AI and silicon lawsets.
+    type: Add
+  id: 9088
+  time: '2025-10-13T11:55:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38225
+- author: meganerobot
+  changes:
+  - message: SmartFridges are now airtight.
+    type: Tweak
+  id: 9089
+  time: '2025-10-13T16:19:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40196
+- author: TrixxedHeart
+  changes:
+  - message: Renamed "trash" reagent to "reprocessed material"
+    type: Tweak
+  id: 9090
+  time: '2025-10-13T17:18:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39761
+- author: ScarKy0
+  changes:
+  - message: Station AI can no longer control bolts, emergency access and electrify
+      status on doors it has no access to.
+    type: Fix
+  id: 9091
+  time: '2025-10-13T20:53:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38444
+- author: Myra
+  changes:
+  - message: The built-in soundfont for MIDI's should sound better, especially for
+      songs with percussion.
+    type: Tweak
+  id: 9092
+  time: '2025-10-13T21:22:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40888
+- author: KittyCat432
+  changes:
+  - message: Slime guidebook is more representative of their actual strengths.
+    type: Tweak
+  id: 9093
+  time: '2025-10-14T04:21:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40842
+- author: MilenVolf
+  changes:
+  - message: Fixed some physics bugs that could cause the grappling hook to teleport
+      entities.
+    type: Fix
+  id: 9094
+  time: '2025-10-14T10:35:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40899
+- author: SirWarock
+  changes:
+  - message: Made Bodybags slightly harder to drag, and rollerbeds slightly easier.
+      They have wheels.
+    type: Tweak
+  id: 9095
+  time: '2025-10-14T11:41:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40880
+- author: aada
+  changes:
+  - message: Geiger counters can now be placed on a utility belt.
+    type: Fix
+  id: 9096
+  time: '2025-10-14T12:12:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40898
+- author: kontakt
+  changes:
+  - message: Singulo now consumes carpet tiles.
+    type: Fix
+  id: 9097
+  time: '2025-10-14T18:27:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40896
+- author: B_Kirill
+  changes:
+  - message: Fixed blocked rotation of zombie NPCs.
+    type: Fix
+  id: 9098
+  time: '2025-10-14T19:12:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40812
+- author: temm1ie, aksosotl
+  changes:
+  - message: Added new botany-themed poster.
+    type: Add
+  id: 9099
+  time: '2025-10-14T19:42:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40908
+- author: ArtisticRoomba
+  changes:
+  - message: Atmospherics Delta-Pressure now properly computes delta pressure for
+      structures that can hold air in their tile while still being airtight (ex. directional
+      windows, diagonal windows).
+    type: Fix
+  id: 9100
+  time: '2025-10-14T22:46:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40435
+- author: SlamBamActionman
+  changes:
+  - message: Lying trait now features more grammatically correct lying.
+    type: Fix
+  id: 9101
+  time: '2025-10-14T23:13:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39370
+- author: Winkarst-cpu
+  changes:
+  - message: Now doors play an animation while being emagged.
+    type: Fix
+  id: 9102
+  time: '2025-10-14T23:31:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40350
+- author: slarticodefast
+  changes:
+  - message: Zombified arachnids can no longer spam infinite silk due to having no
+      hunger.
+    type: Fix
+  id: 9103
+  time: '2025-10-14T23:31:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40279
+- author: telavivgamers
+  changes:
+  - message: You may put ashes and matchsticks into ashtrays.
+    type: Tweak
+  id: 9104
+  time: '2025-10-15T12:38:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40926
+- author: slarticodefast, Davyei
+  changes:
+  - message: You can now use parcelwrap on humanoids.
+    type: Add
+  id: 9105
+  time: '2025-10-15T20:30:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40911
+- author: aada
+  changes:
+  - message: Grenade penguins have new AI. They won't bite your hand while holding
+      them, and hone in on a single target when released.
+    type: Tweak
+  id: 9106
+  time: '2025-10-15T23:59:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34935
+- author: DinnerCalzone
+  changes:
+  - message: ID card sprites have been tweaked to unsquish their job icons.
+    type: Tweak
+  id: 9107
+  time: '2025-10-16T03:35:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40414
+- author: redmushie
+  changes:
+  - message: Fixed power sensors not respecting their configured network setting
+    type: Fix
+  id: 9108
+  time: '2025-10-16T12:38:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40934
+- author: Quasr
+  changes:
+  - message: Sky blue fancy tables and curtains are now construct-able
+    type: Add
+  - message: Sky blue carpet is now printable
+    type: Fix
+  id: 9109
+  time: '2025-10-16T13:37:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40867
+- author: Worldwaker
+  changes:
+  - message: Fixed parcels being indestructible for all damage types except Slash
+      damage.
+    type: Fix
+  id: 9110
+  time: '2025-10-16T16:28:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40940
+- author: FairlySadPanda
+  changes:
+  - message: Two new instrument options for the microphone, Wa and Wah.
+    type: Add
+  - message: Fixed the gilded bike horn's instrument not playing properly, causing
+      listening to it to be even worse than it is supposed to be.
+    type: Fix
+  - message: Fixed the microphone's Kweh instrument not playing properly, causing
+      listening it to be even worse than it is supposed to be.
+    type: Fix
+  id: 9111
+  time: '2025-10-16T17:03:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39210
+- author: MilenVolf
+  changes:
+  - message: Go go hat's activation phrase can be reset to the default without having
+      to record it manually to reset the phrase.
+    type: Tweak
+  id: 9112
+  time: '2025-10-16T18:47:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35636
+- author: Wolfkey-SomeoneElseTookMyUsername
+  changes:
+  - message: The recipes for grilled cheese, cotton buns, cotton cakes, and cotton
+      grilled cheese are now in the correct category in the guidebook
+    type: Fix
+  id: 9113
+  time: '2025-10-17T18:56:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40949
+- author: TrixxedHeart
+  changes:
+  - message: Added Enter/Leave Genpop access to Security by default, allowing them
+      to be able to fix Genpop turnstiles with the access configurator if they are
+      destroyed.
+    type: Tweak
+  id: 9114
+  time: '2025-10-18T00:28:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39515
+- author: TrixxedHeart
+  changes:
+  - message: Added Vox Chitter and Clicking emotes
+    type: Add
+  id: 9115
+  time: '2025-10-18T00:28:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40878
+- author: Kittygyat
+  changes:
+  - message: Added a new generic Artistry borg module!
+    type: Add
+  id: 9116
+  time: '2025-10-18T07:13:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39679
+- author: Hitlinemoss
+  changes:
+  - message: Folders and clipboards now recycle into sensible material components,
+      rather than only cardboard.
+    type: Fix
+  - message: Clipboards and plastic clipboards require slightly more steel to produce
+      in autolathes.
+    type: Tweak
+  id: 9117
+  time: '2025-10-18T09:25:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40954
+- author: PicklOH
+  changes:
+  - message: Rags can no longer be used to remove evidence.
+    type: Remove
+  id: 9118
+  time: '2025-10-18T13:49:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40818
+- author: MissKay1994
+  changes:
+  - message: Vox organs now have unique sprites.
+    type: Add
+  id: 9119
+  time: '2025-10-18T17:07:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40555
+- author: Hitlinemoss
+  changes:
+  - message: Cargo orders containing beverages now ship in freezers.
+    type: Tweak
+  id: 9120
+  time: '2025-10-18T17:20:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40955
+- author: perryprog
+  changes:
+  - message: Drag-and-dropping liquids between containers has been adjusted.
+    type: Tweak
+  - message: You can no longer insert liquids into foods by clicking. Using syringes
+      still works as before.
+    type: Tweak
+  id: 9121
+  time: '2025-10-18T17:58:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38871
+- author: Mehnix
+  changes:
+  - message: All pens now embed when thrown.
+    type: Tweak
+  id: 9122
+  time: '2025-10-18T21:39:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39104
+- author: JackRyd3r
+  changes:
+  - message: You can now put the Energy Magnum to into jackboots/combat boots and
+      security belts/carriers
+    type: Fix
+  id: 9123
+  time: '2025-10-19T06:55:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40974
+- author: AlwyAnri
+  changes:
+  - message: Added a ninja headset.
+    type: Add
+  id: 9124
+  time: '2025-10-19T11:45:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40054
+- author: Pgriha
+  changes:
+  - message: Cotton seeds added to seeds crate from Cargo.
+    type: Add
+  id: 9125
+  time: '2025-10-19T16:02:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40970
+- author: SpaceLizard24
+  changes:
+  - message: Creating crystal chemical reaction now can produce yellow and black crystals!
+    type: Fix
+  id: 9126
+  time: '2025-10-19T18:37:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40985
+- author: Kittygyat
+  changes:
+  - message: Monkeys, Kobolds & Scurrets can now shove/disarm like regular species!
+    type: Tweak
+  id: 9127
+  time: '2025-10-19T19:09:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38542
+- author: PotentiallyTom
+  changes:
+  - message: AI Law boards now have a link to the lawsets guide page
+    type: Tweak
+  - message: Added the My, Robot book.
+    type: Add
+  id: 9128
+  time: '2025-10-19T21:10:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40944
+- author: aspiringLich
+  changes:
+  - message: UIs have been brought more in line with each other with a standardized
+      palette, as well as other changes resulting from a new styling mechanism.
+    type: Tweak
+  id: 9129
+  time: '2025-10-19T21:23:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29903
+- author: ArtisticRoomba, seam_less
+  changes:
+  - message: Job-themed lizard plushies! You can equip them in your loadout if you
+      have 20 hours on the job.
+    type: Add
+  id: 9130
+  time: '2025-10-19T22:28:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34127
+- author: AsnDen
+  changes:
+  - message: Large thruster (2x2) was added.
+    type: Add
+  id: 9131
+  time: '2025-10-19T23:51:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37681
+- author: ArtisticRoomba
+  changes:
+  - message: Slimes can now metabolize their own slime to restore their blood level.
+    type: Add
+  - message: Slime is no longer effective at satiating hunger when metabolized by
+      a Slime.
+    type: Tweak
+  id: 9132
+  time: '2025-10-20T00:40:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32537
+- author: Kittygyat
+  changes:
+  - message: Added a cosmetic carp suit to the AutoDrobe's contraband inventory!
+    type: Add
+  id: 9133
+  time: '2025-10-20T02:56:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40995
+- author: Princess-Cheeseballs
+  changes:
+  - message: Zombies can no longer hurt Initial Infected
+    type: Tweak
+  id: 9134
+  time: '2025-10-20T18:06:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41007
+- author: B_Kirill
+  changes:
+  - message: Hostile and Eliminated criminal statuses
+    type: Add
+  id: 9135
+  time: '2025-10-21T08:56:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36244
+- author: michaelchessall
+  changes:
+  - message: Matches can now be placed into ashtrays.
+    type: Tweak
+  id: 9136
+  time: '2025-10-21T09:37:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41016
+- author: SnappingOpossum
+  changes:
+  - message: Upgraded solar panels can now take structural damage.
+    type: Fix
+  id: 9137
+  time: '2025-10-21T09:50:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40992
+- author: qwerltaz
+  changes:
+  - message: Goats and cows eat kudzu again.
+    type: Fix
+  id: 9138
+  time: '2025-10-21T10:02:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40220
+- author: Krzeszny
+  changes:
+  - message: Updated the controls guide.
+    type: Tweak
+  id: 9139
+  time: '2025-10-21T10:14:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40978
+- author: Quasr
+  changes:
+  - message: The "Friendly Fauna" artifact node no longer spawns hostile mobs
+    type: Tweak
+  id: 9140
+  time: '2025-10-21T10:27:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40979
+- author: Fildrance
+  changes:
+  - message: Door remotes now have a radial menu for changing modes.
+    type: Tweak
+  id: 9141
+  time: '2025-10-21T12:28:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36378
+- author: TrixxedHeart
+  changes:
+  - message: Vox can now have up to 4 head markings.
+    type: Fix
+  id: 9142
+  time: '2025-10-21T14:16:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40542
+- author: Princess-Cheeseballs
+  changes:
+  - message: You can now get drunk again.
+    type: Fix
+  id: 9143
+  time: '2025-10-21T20:24:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41002
+- author: SlamBamActionman
+  changes:
+  - message: The hypopen now requires a short delay before being filled.
+    type: Tweak
+  id: 9144
+  time: '2025-10-21T22:17:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40538
+- author: SolidSyn
+  changes:
+  - message: Changed the cooldown on wizards mind swap spell from 5 minutes to 3 minutes.
+    type: Tweak
+  id: 9145
+  time: '2025-10-21T22:47:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41027
+- author: ToastEnjoyer
+  changes:
+  - message: A security flashlight now spawns in the HoS's locker roundstart.
+    type: Add
+  id: 9146
+  time: '2025-10-22T13:32:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41031
+- author: SolidSyn
+  changes:
+  - message: Wizards Slippery Slope spell no longer requires a robe and hat to be
+      cast.
+    type: Tweak
+  id: 9147
+  time: '2025-10-23T01:28:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41038
+- author: Moomoobeef
+  changes:
+  - message: Fixed banana bread being missing from the guidebook.
+    type: Fix
+  id: 9148
+  time: '2025-10-23T07:00:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41047
+- author: Absotively
+  changes:
+  - message: Minor hand labeler UI improvements
+    type: Tweak
+  id: 9149
+  time: '2025-10-23T15:27:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40318
+- author: Silverfur-underscore
+  changes:
+  - message: The Mime Job Lizard plushie no longer breaks its vow when being thrown
+      against something or eaten.
+    type: Fix
+  id: 9150
+  time: '2025-10-24T00:02:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41063
+- author: MDuch369
+  changes:
+  - message: Added guidebook entry for gas recycler.
+    type: Add
+  - message: Gas recycler can now be rotated.
+    type: Fix
+  id: 9151
+  time: '2025-10-24T01:07:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39212
+- author: Princess_Chzblz, AdmiralObvious, hyphenation, Is-A-Slark, beck
+  changes:
+  - message: PAIs will no longer get uplinks instead of traitors when a player is
+      selected as an traitor and holding a pAI
+    type: Fix
+  id: 9152
+  time: '2025-10-24T05:58:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41069
+- author: slarticodefast
+  changes:
+  - message: Fixed being able to wield two-handed weapons when having only one hand.
+    type: Fix
+  id: 9153
+  time: '2025-10-24T07:36:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40966
+- author: TheGrimbeeper
+  changes:
+  - message: Fix artifact radiation trigger not being triggered by ambient radiation.
+    type: Fix
+  id: 9154
+  time: '2025-10-24T09:21:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41065
+- author: PicklOH
+  changes:
+  - message: Space Dragon and Carp are more heat resistant. Carp no longer take fire
+      damage.
+    type: Tweak
+  id: 9155
+  time: '2025-10-24T19:26:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40820
+- author: Centronias
+  changes:
+  - message: Solution reactions which create items scale their resulting products
+      with the reactants, instead of eating extra reactants.
+    type: Fix
+  id: 9156
+  time: '2025-10-25T00:29:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41091
+- author: Princess-Cheeseballs
+  changes:
+  - message: Eating stacks of items no longer consumes the whole stack in one bite.
+    type: Fix
+  id: 9157
+  time: '2025-10-26T01:09:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41092
+- author: TheGrimbeeper
+  changes:
+  - message: Artifact instantly teleporting themselves fixed.
+    type: Fix
+  id: 9158
+  time: '2025-10-26T10:36:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41049
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 6d59319598..6142cb3b67 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -764,4 +764,45 @@
   id: 92
   time: '2025-10-08T20:41:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40785
+- author: ToastEnjoyer
+  changes:
+  - message: On Plasma, added more nitrogen canisters to the maintenance hallways
+    type: Add
+  id: 93
+  time: '2025-10-10T01:11:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40794
+- author: opl
+  changes:
+  - message: On Packed, prisoners can now use the Megaseed in brig.
+    type: Fix
+  id: 94
+  time: '2025-10-10T20:33:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40821
+- author: CoconutThunder
+  changes:
+  - message: Reduced frequency of syndicate shark attacks
+    type: Tweak
+  id: 95
+  time: '2025-10-12T18:45:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40855
+- author: CoconutThunder
+  changes:
+  - message: added pressure regulator to TEG burn chamber on Plasma Station
+    type: Tweak
+  id: 96
+  time: '2025-10-13T02:35:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40874
+- author: Southbridge
+  changes:
+  - message: On Amber, redesigned the kitchen to be slightly larger.
+    type: Tweak
+  - message: On Amber, converted the method to get to the AI core from a disposal
+      chute to an actual sky-bridge.
+    type: Tweak
+  - message: On Amber, added an abundance of cameras to allow the AI to actually see
+      the station now.
+    type: Fix
+  id: 97
+  time: '2025-10-13T21:06:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40717
 Order: 1
diff --git a/Resources/ConfigPresets/Build/development.toml b/Resources/ConfigPresets/Build/development.toml
index 7849124a18..f10b685322 100644
--- a/Resources/ConfigPresets/Build/development.toml
+++ b/Resources/ConfigPresets/Build/development.toml
@@ -38,6 +38,7 @@ preload_grids = false
 
 [admin]
 see_own_notes = true
+new_player_threshold = 120
 
 [ic]
 random_characters = true
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index ca08fb2939..b81e816676 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, pgraycs, PGrayCS, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, anri, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, GitHubUser53123, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, JackRyd3r, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, JesterX666, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, Jopogrechkin, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, LinkUyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MDuch369, meganerobot, MehimoNemo, Mehnix, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, mtrs163, muburu, MureixloI, murolem, murphyneko, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, Pok27, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Silverfur-underscore, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, SnappingOpossum, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, SpaceLizard24, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, SuperGDPWYL, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telavivgamers, telyonok, temm1ie, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, thanosdegraf, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheGrimbeeper, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheSecondLord, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, Uberration, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, Worldwaker, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml
index fe313d4a8e..d736857edc 100644
--- a/Resources/Credits/Patrons.yml
+++ b/Resources/Credits/Patrons.yml
@@ -1,1417 +1,895 @@
-- Name: Luaan
+- Name: "'-Y-"
   Tier: Syndicate Agent
-- Name: Nugmania
-  Tier: Revolutionary
-- Name: Xoxeyos
-  Tier: Free
-- Name: CobaltCobra
-  Tier: Syndicate Agent
-- Name: Train
-  Tier: Free
-- Name: ExclusiveWizard
-  Tier: Syndicate Agent
-- Name: Matthew Umney
-  Tier: Free
-- Name: Hat Kid
-  Tier: Revolutionary
-- Name: Ingvar Tornberg
-  Tier: Revolutionary
-- Name: Joshua Hines
-  Tier: Nuclear Operative
-- Name: Ashley Parfitt
-  Tier: Revolutionary
-- Name: thehomelessmanbehindthedumpster
-  Tier: Free
-- Name: VmasterVX
-  Tier: Revolutionary
-- Name: JenericJen
-  Tier: Nuclear Operative
-- Name: Cosu
-  Tier: Revolutionary
-- Name: AileenOnline
-  Tier: Free
-- Name: Grotty Bepis
-  Tier: Nuclear Operative
-- Name: Dizzy_Eevee
-  Tier: Syndicate Agent
-- Name: Lizard
-  Tier: Free
-- Name: Michael Van Gaasbeck
-  Tier: Revolutionary
-- Name: Statix AraAra
-  Tier: Revolutionary
-- Name: WWII Kitsune
-  Tier: Nuclear Operative
-- Name: Bruno Bigras
-  Tier: Revolutionary
-- Name: TheLocalTryHard
-  Tier: Free
-- Name: Sufary
-  Tier: Nuclear Operative
-- Name: taydeo
-  Tier: Nuclear Operative
-- Name: dubdubchan
-  Tier: Syndicate Agent
-- Name: tremors08
-  Tier: Syndicate Agent
-- Name: Jan Gocník
-  Tier: Free
-- Name: Tret Mekiao
-  Tier: Free
-- Name: Ben Joja Hotop
-  Tier: Free
-- Name: Sean Lenin
-  Tier: Free
-- Name: KiddoTBH
-  Tier: Free
-- Name: Kubakura
-  Tier: Syndicate Agent
-- Name: Bullet Kin
-  Tier: Free
-- Name: Abby Eveland
-  Tier: Revolutionary
-- Name: Zoe
-  Tier: Free
-- Name: ghost--page
-  Tier: Nuclear Operative
-- Name: MechaKitty
-  Tier: Revolutionary
-- Name: BlueNexa
-  Tier: Free
-- Name: Noah Heaverin
-  Tier: Free
-- Name: jamozen
-  Tier: Free
-- Name: SireHambone
-  Tier: Nuclear Operative
-- Name: Blair Cyprus
-  Tier: Free
-- Name: Ryan Hanson
-  Tier: Revolutionary
-- Name: Heinrick Archsider
-  Tier: Free
-- Name: Arsalan Sarwari
-  Tier: Free
-- Name: Scardy
-  Tier: Free
-- Name: Nagano
-  Tier: Revolutionary
-- Name: Aridia
-  Tier: Free
-- Name: illpala
-  Tier: Revolutionary
-- Name: kayo josé
-  Tier: Free
-- Name: Tymon Tymek
-  Tier: Free
-- Name: AlexDragoon
-  Tier: Revolutionary
-- Name: Henrik Møller
-  Tier: Syndicate Agent
-- Name: Mythtic B
-  Tier: Revolutionary
-- Name: zedd
-  Tier: Nuclear Operative
-- Name: Penguin Commoner
-  Tier: Revolutionary
-- Name: Davyei
-  Tier: Free
-- Name: Akaelik
-  Tier: Nuclear Operative
-- Name: Kyle Tyo
-  Tier: Revolutionary
-- Name: Rhys Williams
-  Tier: Free
-- Name: Drakkenlupen
-  Tier: Revolutionary
-- Name: Randomposter
-  Tier: Free
-- Name: Justin White
-  Tier: Free
-- Name: Ty Ashley
-  Tier: Revolutionary
-- Name: Scorching Rae
-  Tier: Nuclear Operative
-- Name: Cindy Sampaga
-  Tier: Free
-- Name: Plague
-  Tier: Free
-- Name: dude
-  Tier: Free
-- Name: NIACO
-  Tier: Free
-- Name: Tee The Kobold
-  Tier: Revolutionary
-- Name: Redstones563
-  Tier: Free
-- Name: Celestrogen
-  Tier: Syndicate Agent
-- Name: SotetSotetSotetSotetSotet
-  Tier: Syndicate Agent
-- Name: Guffin
-  Tier: Free
-- Name: Southbridge
-  Tier: Nuclear Operative
-- Name: ZazaRyn
-  Tier: Syndicate Agent
-- Name: Magic Crystal Radio
-  Tier: Free
-- Name: Sam Sullins
-  Tier: Free
-- Name: Widoux 341
-  Tier: Free
-- Name: spookerton
-  Tier: Syndicate Agent
-- Name: Tom Goodman (TauOmicronMu#2500)
-  Tier: Revolutionary
-- Name: Robbie Me
-  Tier: Free
-- Name: momochitters
-  Tier: Free
-- Name: Raspberry1111
-  Tier: Revolutionary
-- Name: flipways
-  Tier: Nuclear Operative
-- Name: Nictis
-  Tier: Revolutionary
-- Name: crazybrain
-  Tier: Free
-- Name: peanut
-  Tier: Nuclear Operative
-- Name: Lewis McCalmont
-  Tier: Free
-- Name: T.P_Gaming
-  Tier: Revolutionary
-- Name: A Patreon of the Ahts
-  Tier: Free
-- Name: brbrbrbrbr brbrbr
-  Tier: Revolutionary
-- Name: Shadcake
-  Tier: Free
-- Name: kristopher arnott
-  Tier: Syndicate Agent
-- Name: Reebe
-  Tier: Free
-- Name: blossom
-  Tier: Revolutionary
-- Name: ml726
-  Tier: Free
-- Name: Logan Splett
-  Tier: Free
-- Name: Patrick Mitchell
-  Tier: Free
-- Name: Semiotics
-  Tier: Syndicate Agent
-- Name: Snowlili
-  Tier: Revolutionary
-- Name: Hyeronimus Bosch
-  Tier: Free
-- Name: S1rFl0
-  Tier: Revolutionary
-- Name: Gavin
-  Tier: Free
-- Name: Faust Statler
-  Tier: Syndicate Agent
-- Name: the good king wompicus
-  Tier: Syndicate Agent
-- Name: DerBall
-  Tier: Revolutionary
-- Name: Gallagin
-  Tier: Revolutionary
-- Name: Edward Doyle
-  Tier: Revolutionary
-- Name: Preston Pickering
-  Tier: Revolutionary
-- Name: Andrew Danke
-  Tier: Syndicate Agent
-- Name: Alexis
-  Tier: Nuclear Operative
-- Name: Saphinara
-  Tier: Free
-- Name: Random Person
-  Tier: Syndicate Agent
-- Name: mage_period
-  Tier: Syndicate Agent
-- Name: piras314
-  Tier: Free
-- Name: Mark Khudaev
-  Tier: Free
-- Name: Saver
-  Tier: Free
-- Name: Snilo Black
-  Tier: Free
-- Name: CptFalcon
-  Tier: Revolutionary
-- Name: Daxx (Justin Winningham)
-  Tier: Syndicate Agent
-- Name: Posters Union Australia (Shlee)
-  Tier: Free
-- Name: nathan
-  Tier: Free
-- Name: funnylookingwolf
-  Tier: Revolutionary
-- Name: Sporkyz
-  Tier: Revolutionary
-- Name: SarahRaven
-  Tier: Revolutionary
-- Name: Da Skolin
-  Tier: Free
-- Name: Joshua Meyer
-  Tier: Free
-- Name: BUMBLE
-  Tier: Free
-- Name: Lily Roche
-  Tier: Free
-- Name: Klive McToaster
-  Tier: Free
-- Name: CasuallyAPerson
-  Tier: Free
-- Name: Powder
-  Tier: Revolutionary
-- Name: Noah Heaverin
-  Tier: Free
-- Name: Violette
-  Tier: Revolutionary
-- Name: Amble
-  Tier: Nuclear Operative
-- Name: James Sanders
-  Tier: Free
-- Name: Susaniel
-  Tier: Free
-- Name: Eve Holly
-  Tier: Free
-- Name: Superscope
-  Tier: Free
-- Name: Nyxilath
-  Tier: Nuclear Operative
-- Name: RedChair368
-  Tier: Revolutionary
-- Name: Blumbee
-  Tier: Revolutionary
-- Name: Mason Fawcett
-  Tier: Revolutionary
-- Name: Cerzix
-  Tier: Revolutionary
-- Name: Aeris Ophelia
-  Tier: Free
-- Name: Troll_King_907
-  Tier: Nuclear Operative
-- Name: Certified Hood Classic
-  Tier: Free
-- Name: Hydraliks
-  Tier: Free
-- Name: Meguneri
-  Tier: Free
-- Name: hyphenation
-  Tier: Nuclear Operative
-- Name: Psy
-  Tier: Revolutionary
-- Name: Pinet
-  Tier: Nuclear Operative
-- Name: Vivi Bunny
-  Tier: Free
-- Name: James Stevens
-  Tier: Revolutionary
-- Name: anharmlessguest
-  Tier: Syndicate Agent
-- Name: Outlier
-  Tier: Free
-- Name: Brandon Hackney
-  Tier: Free
-- Name: eleanor nora
-  Tier: Free
-- Name: starch
-  Tier: Syndicate Agent
-- Name: Jacob Watson
-  Tier: Syndicate Agent
-- Name: Seinfeld
-  Tier: Revolutionary
-- Name: Prime!
-  Tier: Free
-- Name: John
-  Tier: Free
-- Name: FauxParadox
-  Tier: Revolutionary
-- Name: Mr_Clank
-  Tier: Revolutionary
-- Name: rafael rabelo
-  Tier: Free
-- Name: TBF_Jack
-  Tier: Free
-- Name: StaceyBalcom
-  Tier: Revolutionary
-- Name: guh
-  Tier: Revolutionary
-- Name: Fran Picek
-  Tier: Free
-- Name: Austenn
-  Tier: Revolutionary
-- Name: Flayn
-  Tier: Free
-- Name: Nye
-  Tier: Free
-- Name: Phycoweirdo
-  Tier: Nuclear Operative
-- Name: Madeleine LeFleur
-  Tier: Syndicate Agent
-- Name: Anton
-  Tier: Revolutionary
-- Name: That Furry Fuck
-  Tier: Free
-- Name: sat
-  Tier: Free
-- Name: goober
-  Tier: Free
-- Name: Boogerfoot
-  Tier: Nuclear Operative
-- Name: Raiden Johnson
-  Tier: Revolutionary
-- Name: Talbot
-  Tier: Revolutionary
-- Name: Alen Kadric
-  Tier: Free
-- Name: pogcat
-  Tier: Free
-- Name: Dave
-  Tier: Free
-- Name: Nathaniel Taylor
-  Tier: Revolutionary
-- Name: Z4NEER
-  Tier: Nuclear Operative
-- Name: Laying on my penis until it falls asleep, so it feels like I'm giving someone else a hando
-  Tier: Revolutionary
-- Name: Sam Caesar
-  Tier: Revolutionary
-- Name: Lykan
-  Tier: Free
-- Name: tarna41
-  Tier: Free
-- Name: Ryan Johnson
-  Tier: Free
-- Name: Andrew Montagne
-  Tier: Syndicate Agent
-- Name: yakub mobutu
-  Tier: Free
-- Name: Michael Krebs
-  Tier: Free
-- Name: mr funny swag
-  Tier: Free
-- Name: Crazyeyes24
-  Tier: Syndicate Agent
-- Name: Zylo
-  Tier: Free
-- Name: ScarKy0
-  Tier: Revolutionary
-- Name: Randall Hudson
-  Tier: Free
-- Name: FaberTheCatboy
-  Tier: Free
-- Name: IamOzyman
-  Tier: Revolutionary
-- Name: Jado0213
-  Tier: Revolutionary
-- Name: StaticeStorm
-  Tier: Syndicate Agent
-- Name: Baron Mathot
-  Tier: Free
-- Name: CrudeOil
-  Tier: Nuclear Operative
-- Name: Sartec
-  Tier: Revolutionary
-- Name: Mathew McGuire
-  Tier: Revolutionary
-- Name: Jelloterd2
-  Tier: Free
-- Name: Commissar Fox
-  Tier: Syndicate Agent
-- Name: tyler adams
-  Tier: Revolutionary
-- Name: Logan Britt
-  Tier: Free
-- Name: Joshua A.
-  Tier: Free
-- Name: ya boi darth Vader
-  Tier: Free
-- Name: Syndlkat
-  Tier: Free
-- Name: Zyleak
-  Tier: Revolutionary
-- Name: Hunter
-  Tier: Free
-- Name: Killerqu00
-  Tier: Free
-- Name: lzk
-  Tier: Free
-- Name: Cai Williamson
-  Tier: Syndicate Agent
-- Name: Arykh
-  Tier: Nuclear Operative
-- Name: Pallastovid
-  Tier: Free
-- Name: Rome
-  Tier: Revolutionary
-- Name: mawrk
-  Tier: Free
-- Name: Jack
-  Tier: Revolutionary
-- Name: stikfigz
-  Tier: Revolutionary
-- Name: RyanTuek
-  Tier: Revolutionary
-- Name: David N
-  Tier: Syndicate Agent
-- Name: Panzer IV
-  Tier: Free
-- Name: Novaq
-  Tier: Revolutionary
-- Name: Trevor Doyle
-  Tier: Free
-- Name: Borna Punda
-  Tier: Revolutionary
-- Name: Patrick Long
-  Tier: Free
-- Name: Alpha
-  Tier: Nuclear Operative
-- Name: Gaëtan GOUSSEAUD
-  Tier: Revolutionary
-- Name: Hayden Wessing
-  Tier: Revolutionary
-- Name: Noodle is me
-  Tier: Syndicate Agent
-- Name: snakebb
-  Tier: Revolutionary
-- Name: Patrick
-  Tier: Revolutionary
-- Name: Väinö Kontinen
-  Tier: Free
-- Name: Devin Nelson
-  Tier: Revolutionary
-- Name: Rat Man
-  Tier: Revolutionary
-- Name: Christopher Day
-  Tier: Free
-- Name: Wilhelm 17
-  Tier: Free
-- Name: Kieue Caprie
-  Tier: Revolutionary
-- Name: RamenZorn
-  Tier: Syndicate Agent
-- Name: Swix Swix
-  Tier: Revolutionary
-- Name: Katharina
-  Tier: Free
-- Name: Blackmare
-  Tier: Syndicate Agent
-- Name: lukiw
-  Tier: Revolutionary
-- Name: Magelfik
-  Tier: Revolutionary
-- Name: Kevin
-  Tier: Nuclear Operative
-- Name: Tomáš Sitarčík
-  Tier: Syndicate Agent
-- Name: Coolsurf6
-  Tier: Revolutionary
-- Name: Neexdle
-  Tier: Free
-- Name: Lucid
-  Tier: Free
-- Name: MissKay1994
-  Tier: Syndicate Agent
-- Name: Raccoononi
-  Tier: Revolutionary
-- Name: Avocado999
-  Tier: Free
-- Name: Invisorum
-  Tier: Nuclear Operative
-- Name: Hannah
-  Tier: Nuclear Operative
-- Name: Thomas
-  Tier: Revolutionary
-- Name: Cozmicc
-  Tier: Free
-- Name: Unalterableness Happiness
-  Tier: Free
-- Name: Sparlight
-  Tier: Nuclear Operative
-- Name: MAILS ADVISORY
-  Tier: Free
-- Name: Rq52
-  Tier: Free
-- Name: Ben Wahba
-  Tier: Free
-- Name: North
-  Tier: Free
-- Name: Tyran
-  Tier: Free
-- Name: TheSimpleTime
-  Tier: Free
-- Name: Minemoder
-  Tier: Syndicate Agent
-- Name: Richard "Rei" Weeks
-  Tier: Syndicate Agent
-- Name: Sika-Voi
-  Tier: Free
-- Name: Dumbdestroyer2
-  Tier: Free
-- Name: Ferox Heist
-  Tier: Free
-- Name: Ryan Vieira
-  Tier: Free
-- Name: kithri
-  Tier: Nuclear Operative
-- Name: Luzurper
-  Tier: Revolutionary
-- Name: Rainy
-  Tier: Revolutionary
-- Name: Dusk
-  Tier: Revolutionary
-- Name: Apocist
-  Tier: Revolutionary
-- Name: Yukari_TK
-  Tier: Free
-- Name: Iris
-  Tier: Free
-- Name: Jamie Forkner
-  Tier: Free
-- Name: rokudara
-  Tier: Free
-- Name: Xionwalker
-  Tier: Free
-- Name: Michael Schrader
-  Tier: Free
-- Name: JT Billings
-  Tier: Revolutionary
-- Name: Stedar
-  Tier: Syndicate Agent
-- Name: Alex Burd
-  Tier: Nuclear Operative
-- Name: Vasilis The Pikachu
-  Tier: Free
-- Name: Erik Meinke
-  Tier: Revolutionary
-- Name: Sleeepz
-  Tier: Syndicate Agent
-- Name: Jonathan
-  Tier: Free
-- Name: Trent Warfel
-  Tier: Nuclear Operative
-- Name: Fritz Vohlkson
-  Tier: Free
-- Name: Гоша Ушаров
-  Tier: Free
-- Name: Cpt Blastahoe
-  Tier: Free
-- Name: dedomena
-  Tier: Free
-- Name: Nolan Downing
-  Tier: Free
-- Name: Seth Morron
-  Tier: Revolutionary
-- Name: Fumo Legionnaire
-  Tier: Free
-- Name: obama
-  Tier: Free
-- Name: Daniel Megiddo
-  Tier: Free
-- Name: Денис
-  Tier: Free
-- Name: Ubaser
-  Tier: Revolutionary
-- Name: Catdere
-  Tier: Syndicate Agent
-- Name: valery xolstov
-  Tier: Free
-- Name: Marios Sardis
-  Tier: Revolutionary
-- Name: Constrife
-  Tier: Free
-- Name: TINYANGRYWOMAN
-  Tier: Free
-- Name: Kerensky
-  Tier: Revolutionary
-- Name: DEATHB4DEFEAT
-  Tier: Free
-- Name: Kristy Denniss
-  Tier: Free
-- Name: orange color
-  Tier: Revolutionary
-- Name: Hectik
-  Tier: Free
-- Name: SomeDogo
-  Tier: Free
-- Name: Joshua Meyer
-  Tier: Nuclear Operative
-- Name: Matthias Bechtold
-  Tier: Revolutionary
-- Name: Serafim
-  Tier: Free
-- Name: Cindy Xiao
-  Tier: Free
-- Name: SmokingKilz
-  Tier: Free
-- Name: Jacob Scott
-  Tier: Free
-- Name: Ryan Kelly
-  Tier: Revolutionary
-- Name: mikiju
-  Tier: Syndicate Agent
-- Name: TheGungeonologist
-  Tier: Revolutionary
-- Name: Tia
-  Tier: Revolutionary
-- Name: yeoshua
-  Tier: Syndicate Agent
-- Name: David Ilina
-  Tier: Free
-- Name: Robyn Pothagan
-  Tier: Free
-- Name: chomp
-  Tier: Free
-- Name: Maksym Aleinikov
-  Tier: Free
-- Name: Chase M.
-  Tier: Free
-- Name: Ethan Maria
-  Tier: Free
-- Name: Luna Rose
-  Tier: Free
-- Name: Jordon
-  Tier: Revolutionary
-- Name: Godfiend
-  Tier: Revolutionary
-- Name: Jake Huxell
-  Tier: Free
-- Name: Alexander Simakov
-  Tier: Free
-- Name: Hannah Dawson
-  Tier: Syndicate Agent
-- Name: Dieselmohawk D.
-  Tier: Revolutionary
-- Name: Sean Lilly
-  Tier: Syndicate Agent
-- Name: Brandon Roughley
-  Tier: Syndicate Agent
-- Name: Jack
-  Tier: Free
-- Name: Cooliano Rizzo
-  Tier: Free
-- Name: North Star
-  Tier: Free
-- Name: Flamebrain
-  Tier: Free
-- Name: Andrew
-  Tier: Revolutionary
-- Name: Ostoja
-  Tier: Free
-- Name: Russian TS
-  Tier: Nuclear Operative
-- Name: Kyu, The Meme Fairy
-  Tier: Free
-- Name: LIMIT_bro .
-  Tier: Free
-- Name: Kim
-  Tier: Revolutionary
-- Name: Dourbii
-  Tier: Revolutionary
-- Name: Autistic Dog
-  Tier: Free
-- Name: Black Rose
-  Tier: Free
-- Name: rose soul
-  Tier: Free
-- Name: Toast
-  Tier: Free
-- Name: Jiangshi Luvr
-  Tier: Free
-- Name: OllyTheFoxcoon
-  Tier: Free
-- Name: Christopher Peltola
-  Tier: Revolutionary
-- Name: Bonefan223
-  Tier: Nuclear Operative
-- Name: Fie
-  Tier: Free
-- Name: DuskyJay
-  Tier: Free
-- Name: Zella Zane
-  Tier: Revolutionary
-- Name: Pixel Realms
-  Tier: Free
-- Name: ConcaveGnome
-  Tier: Syndicate Agent
-- Name: Ростислав Мірошніченко
-  Tier: Free
-- Name: Hunter Tew
-  Tier: Syndicate Agent
-- Name: Daniel D
-  Tier: Syndicate Agent
-- Name: Kick Buttowski
-  Tier: Free
-- Name: Eggexe
-  Tier: Free
-- Name: Lv
-  Tier: Free
-- Name: Ali Alashar
-  Tier: Free
-- Name: Nathaniel Joseph Hurd
-  Tier: Revolutionary
-- Name: sk3iron
-  Tier: Revolutionary
-- Name: Dax XZ
-  Tier: Free
-- Name: debelizm
-  Tier: Free
-- Name: Kaisering
-  Tier: Revolutionary
-- Name: VividWisp
-  Tier: Syndicate Agent
-- Name: Alex Mercer
-  Tier: Free
-- Name: AmalgoMyte
-  Tier: Revolutionary
-- Name: SeanKim
-  Tier: Free
-- Name: Siegorvus
-  Tier: Free
-- Name: вася васильев
-  Tier: Free
-- Name: Mci
-  Tier: Revolutionary
-- Name: KateSlime206
-  Tier: Nuclear Operative
-- Name: Robert
-  Tier: Free
-- Name: Ben Z'
-  Tier: Revolutionary
-- Name: Luke
-  Tier: Free
-- Name: Tyler Putnam
-  Tier: Free
-- Name: Ville Sarmiola
-  Tier: Free
-- Name: kelaclone
-  Tier: Free
-- Name: Archmonarch
-  Tier: Syndicate Agent
-- Name: Brett
-  Tier: Free
-- Name: Hanzdegloker
-  Tier: Syndicate Agent
-- Name: Piotr
-  Tier: Revolutionary
-- Name: CloudyClover
-  Tier: Revolutionary
-- Name: Jim Masterson
-  Tier: Free
-- Name: kenneth heller
-  Tier: Syndicate Agent
-- Name: Gosera -
-  Tier: Syndicate Agent
-- Name: Asaf Ataş
-  Tier: Free
-- Name: DeckDevilYGO
-  Tier: Free
-- Name: nokko
-  Tier: Free
-- Name: Krokodiel89
-  Tier: Free
-- Name: Nojan Niaki
-  Tier: Revolutionary
-- Name: YuNii
-  Tier: Nuclear Operative
-- Name: Georgia Partyka
-  Tier: Syndicate Agent
-- Name: Teeth
-  Tier: Free
-- Name: DrMelon
-  Tier: Revolutionary
-- Name: Molly the Bully
-  Tier: Nuclear Operative
-- Name: An Evil Eel
-  Tier: Free
-- Name: Hasan al-Binabi
-  Tier: Free
-- Name: franz photos
-  Tier: Free
-- Name: Milkshake45752
-  Tier: Free
-- Name: Bru Tal
-  Tier: Free
-- Name: krberryy
-  Tier: Revolutionary
-- Name: Thomas Mcintosh
-  Tier: Free
-- Name: Alex Nordlund
-  Tier: Syndicate Agent
-- Name: Swindel_
-  Tier: Syndicate Agent
-- Name: MrGloopy
-  Tier: Revolutionary
-- Name: blitz gaming
-  Tier: Free
-- Name: Nicholi
-  Tier: Syndicate Agent
-- Name: Taber
-  Tier: Revolutionary
-- Name: 以迪 黃
-  Tier: Free
-- Name: W Geertsma
-  Tier: Free
-- Name: BloodyJMary
-  Tier: Free
-- Name: quri1q
-  Tier: Free
-- Name: SleepyBody91
-  Tier: Free
-- Name: David Gee
-  Tier: Free
-- Name: ThoranTW
-  Tier: Free
-- Name: pigeopeas
-  Tier: Free
-- Name: Zakory L Holbrook
-  Tier: Revolutionary
-- Name: Aiden
-  Tier: Revolutionary
-- Name: Pangaron
-  Tier: Syndicate Agent
-- Name: NeatVisor
-  Tier: Free
-- Name: Solidus Snake
-  Tier: Nuclear Operative
-- Name: Oliver Skyler
-  Tier: Free
-- Name: mustafa kılıç
-  Tier: Free
-- Name: IceStorm theDragon
-  Tier: Revolutionary
-- Name: Indri
-  Tier: Revolutionary
-- Name: Graded
-  Tier: Free
-- Name: tunnp0
-  Tier: Free
-- Name: Vexxtraordinary
-  Tier: Revolutionary
-- Name: Sam Hediger
-  Tier: Free
-- Name: Aldi Abduali
-  Tier: Free
-- Name: Adam Clarke
-  Tier: Free
-- Name: Munt
-  Tier: Free
-- Name: Obspogon
-  Tier: Free
-- Name: Adrian Thompson
-  Tier: Free
-- Name: albatrossMonarch
-  Tier: Free
-- Name: JaQal
-  Tier: Free
-- Name: Simofie
-  Tier: Free
-- Name: redgunny
-  Tier: Free
-- Name: Kevin Chapman
-  Tier: Free
-- Name: Sjevi Aardvark
-  Tier: Free
-- Name: Chris Walter
-  Tier: Free
-- Name: David Sterling
-  Tier: Free
-- Name: Zcore
-  Tier: Free
-- Name: tapohuy
-  Tier: Free
-- Name: MasterFurret
-  Tier: Revolutionary
-- Name: Christian Hicks
-  Tier: Syndicate Agent
-- Name: François Desautels
-  Tier: Revolutionary
-- Name: awndrssk
-  Tier: Free
-- Name: Vice Emargo
-  Tier: Syndicate Agent
-- Name: Mihailo Trickovic
-  Tier: Syndicate Agent
-- Name: Sandvich enjoyer
-  Tier: Revolutionary
-- Name: Higgtastic
-  Tier: Revolutionary
 - Name: "612"
   Tier: Revolutionary
-- Name: AlecRazec
-  Tier: Revolutionary
-- Name: Repo
-  Tier: Nuclear Operative
-- Name: Ignoramis
-  Tier: Free
-- Name: Jeffery Pointer
-  Tier: Syndicate Agent
-- Name: DireBoar
-  Tier: Free
-- Name: oBerry
-  Tier: Free
-- Name: Adam Smedstad
-  Tier: Free
-- Name: Superglue
-  Tier: Syndicate Agent
-- Name: DrIvoPotato
-  Tier: Nuclear Operative
-- Name: Petalmeat
-  Tier: Free
-- Name: Malachi Housewright
-  Tier: Revolutionary
-- Name: Fallcon
-  Tier: Free
-- Name: ShaunTexas
-  Tier: Free
-- Name: HCG
-  Tier: Free
-- Name: GeneralMarty
-  Tier: Free
-- Name: Nicholas
-  Tier: Nuclear Operative
-- Name: Geekyhobo2
-  Tier: Revolutionary
-- Name: Alexandre Courtin
-  Tier: Revolutionary
-- Name: Wolfie
-  Tier: Revolutionary
-- Name: Shaina Gibson
-  Tier: Free
-- Name: Charles Baron
-  Tier: Free
-- Name: Constellations
-  Tier: Free
-- Name: tynobeard 123
-  Tier: Revolutionary
-- Name: Lyndomen
-  Tier: Revolutionary
-- Name: Glenn Olsen
-  Tier: Syndicate Agent
-- Name: Wiliam
-  Tier: Nuclear Operative
-- Name: SHANE ALAN ZINDA
-  Tier: Free
-- Name: Saiiryn
-  Tier: Free
-- Name: AC Computing
-  Tier: Nuclear Operative
-- Name: eric156
-  Tier: Free
-- Name: Katarn
-  Tier: Free
-- Name: Blight
-  Tier: Syndicate Agent
-- Name: Tim Foley
-  Tier: Free
-- Name: Sven Tammerijn
-  Tier: Revolutionary
-- Name: Raw Toast
-  Tier: Free
-- Name: Watson Whittington
-  Tier: Syndicate Agent
-- Name: David
-  Tier: Revolutionary
-- Name: DadNotTheBelt
-  Tier: Free
-- Name: Enricoc3l
-  Tier: Revolutionary
-- Name: Vandell
-  Tier: Free
-- Name: BlueisDumb
-  Tier: Nuclear Operative
-- Name: Buldinn Girshovich
-  Tier: Nuclear Operative
-- Name: Whistling Jake
-  Tier: Revolutionary
-- Name: Wallace Megas
-  Tier: Free
-- Name: Samtaro
-  Tier: Nuclear Operative
-- Name: Aexxie
-  Tier: Revolutionary
-- Name: Fiebertraum Illhead
-  Tier: Syndicate Agent
-- Name: tokie
-  Tier: Nuclear Operative
-- Name: Odin7heWanderer
-  Tier: Free
-- Name: Jeff Tatem
-  Tier: Nuclear Operative
-- Name: M4shr00m
-  Tier: Free
-- Name: Gordod
-  Tier: Syndicate Agent
-- Name: Skarlet
-  Tier: Free
-- Name: March
-  Tier: Syndicate Agent
-- Name: Александр Белошапка
-  Tier: Revolutionary
-- Name: Dave
-  Tier: Revolutionary
-- Name: Akira
-  Tier: Revolutionary
-- Name: Alix Shepard
-  Tier: Nuclear Operative
-- Name: JhenMaster
-  Tier: Free
-- Name: Lieutenant Colonel Orangejuice
-  Tier: Syndicate Agent
-- Name: TheGoldElite
-  Tier: Revolutionary
-- Name: Gnomo
-  Tier: Nuclear Operative
-- Name: Never Solus
-  Tier: Free
-- Name: Ari.
-  Tier: Revolutionary
-- Name: Kevin
-  Tier: Nuclear Operative
-- Name: DubzyVEVO
-  Tier: Revolutionary
-- Name: ikamuse johnson
-  Tier: Revolutionary
-- Name: Saphire
-  Tier: Revolutionary
-- Name: Gavin Simmons
-  Tier: Syndicate Agent
-- Name: Tamora Droppa
-  Tier: Revolutionary
-- Name: Gaxeer
-  Tier: Syndicate Agent
-- Name: rosysyn
-  Tier: Revolutionary
-- Name: Scott MacCombie
-  Tier: Free
-- Name: Jeremy Hernandez
-  Tier: Syndicate Agent
-- Name: Kai
-  Tier: Nuclear Operative
-- Name: Victoly
-  Tier: Free
-- Name: chilicheesecat
-  Tier: Free
-- Name: Arthur Norris
-  Tier: Syndicate Agent
-- Name: Carbonhell
-  Tier: Syndicate Agent
-- Name: BrittaBee93
-  Tier: Free
-- Name: Rasmus Cedergren
-  Tier: Revolutionary
-- Name: Greggo
-  Tier: Syndicate Agent
-- Name: Pasemi
-  Tier: Revolutionary
-- Name: Unknown Kiwi
-  Tier: Revolutionary
-- Name: Mitchell Marry
-  Tier: Revolutionary
-- Name: Matouš Hrdlička
-  Tier: Revolutionary
-- Name: Roman
-  Tier: Syndicate Agent
-- Name: Jacob Schramm
-  Tier: Free
-- Name: Nathan Zaldivar
-  Tier: Nuclear Operative
-- Name: SpydAxe
-  Tier: Revolutionary
-- Name: BokChoy
-  Tier: Nuclear Operative
-- Name: Nicholas Williamson
-  Tier: Nuclear Operative
-- Name: William Grondin
-  Tier: Revolutionary
-- Name: KevKev
-  Tier: Free
-- Name: Gothryd
-  Tier: Revolutionary
-- Name: Brandon Campbell
-  Tier: Free
-- Name: Matthew C Miklaucic
-  Tier: Revolutionary
-- Name: Serianas
-  Tier: Nuclear Operative
-- Name: lapatison
-  Tier: Revolutionary
-- Name: Uinseann
-  Tier: Revolutionary
-- Name: osborn
-  Tier: Syndicate Agent
-- Name: LPGaming
-  Tier: Free
-- Name: Alex Fry
-  Tier: Nuclear Operative
-- Name: Ramiro Agis
-  Tier: Revolutionary
-- Name: Mikhail
-  Tier: Revolutionary
-- Name: SnapKick
-  Tier: Revolutionary
-- Name: liltenhead
-  Tier: Revolutionary
-- Name: James Andrew Peoples Jr
-  Tier: Revolutionary
-- Name: Serathis
-  Tier: Revolutionary
-- Name: Joel
-  Tier: Revolutionary
-- Name: Rafał Kowalewski
-  Tier: Revolutionary
-- Name: Kris Piper
-  Tier: Free
-- Name: Anthony Chicko
-  Tier: Revolutionary
-- Name: Taylor
-  Tier: Revolutionary
-- Name: Phillip Inman
-  Tier: Revolutionary
-- Name: Zakanater 19
-  Tier: Revolutionary
-- Name: Molon
-  Tier: Syndicate Agent
-- Name: Peter "Azmond" Newhouse
-  Tier: Free
-- Name: Snowni
-  Tier: Nuclear Operative
-- Name: Tom Cruize
-  Tier: Syndicate Agent
-- Name: Corpus Inc.
-  Tier: Revolutionary
-- Name: BlastWind
-  Tier: Free
-- Name: Echinodermata
-  Tier: Revolutionary
-- Name: Hamcha
-  Tier: Revolutionary
-- Name: Kaitlynn Brennan
-  Tier: Syndicate Agent
-- Name: Oxyclean114
-  Tier: Revolutionary
-- Name: JustanAnus
-  Tier: Nuclear Operative
-- Name: wtcwr68
-  Tier: Nuclear Operative
-- Name: Azmith Blackheart
-  Tier: Revolutionary
-- Name: Collin R Terrell
-  Tier: Revolutionary
-- Name: Cormos Lemming
-  Tier: Nuclear Operative
-- Name: grhmhome
-  Tier: Revolutionary
-- Name: SpiffyNnemonic
-  Tier: Revolutionary
-- Name: Callum Tubrett
-  Tier: Nuclear Operative
-- Name: Hydration
-  Tier: Revolutionary
-- Name: Morty
-  Tier: Free
-- Name: Dylan Roberts
-  Tier: Syndicate Agent
-- Name: mrniceguy0o0
-  Tier: Free
-- Name: Wrexbe
-  Tier: Revolutionary
-- Name: Frege Beach
-  Tier: Revolutionary
-- Name: DBF
-  Tier: Syndicate Agent
-- Name: Kesiath
-  Tier: Nuclear Operative
-- Name: Voltinho
-  Tier: Revolutionary
-- Name: AquaDraco
-  Tier: Revolutionary
 - Name: A Yaj
   Tier: Revolutionary
-- Name: Miniwoffer
+- Name: Aaron Handleman
   Tier: Revolutionary
-- Name: hh
+- Name: Abby Eveland
+  Tier: Revolutionary
+- Name: AC Computing
+  Tier: Nuclear Operative
+- Name: Aethan Olsen
+  Tier: Revolutionary
+- Name: Aexxie
+  Tier: Revolutionary
+- Name: Aiden
+  Tier: Revolutionary
+- Name: Akaelik
+  Tier: Nuclear Operative
+- Name: Akira
+  Tier: Revolutionary
+- Name: AlecRazec
+  Tier: Revolutionary
+- Name: Alex Burd
+  Tier: Nuclear Operative
+- Name: Alex Fry
+  Tier: Nuclear Operative
+- Name: Alex Nordlund
   Tier: Syndicate Agent
-- Name: Chase Trotter
-  Tier: Nuclear Operative
-- Name: Skifan180
-  Tier: Free
-- Name: Florian
-  Tier: Revolutionary
-- Name: Hoplophobia
-  Tier: Revolutionary
-- Name: Viridian
-  Tier: Free
-- Name: Daskata
-  Tier: Nuclear Operative
-- Name: TacoCub
-  Tier: Revolutionary
-- Name: Jack Rose
-  Tier: Revolutionary
-- Name: Chem_Inventory
-  Tier: Nuclear Operative
-- Name: Jax
-  Tier: Nuclear Operative
-- Name: The Hateful Flesh
-  Tier: Revolutionary
-- Name: Gavin Jones
-  Tier: Nuclear Operative
-- Name: Prof. Omii
-  Tier: Nuclear Operative
-- Name: mksky
-  Tier: Revolutionary
-- Name: Greyhound Connect
-  Tier: Revolutionary
 - Name: Alex Tempest
   Tier: Revolutionary
-- Name: Rat Fungus
+- Name: Alexandre Courtin
+  Tier: Revolutionary
+- Name: AlexDragoon
+  Tier: Revolutionary
+- Name: Alexis
   Tier: Nuclear Operative
-- Name: Will M.
-  Tier: Revolutionary
-- Name: spinnermaster
-  Tier: Free
-- Name: Koyki
-  Tier: Revolutionary
-- Name: Hunter James
+- Name: Alix Shepard
   Tier: Nuclear Operative
-- Name: Valinov
-  Tier: Nuclear Operative
-- Name: Nemmay
-  Tier: Revolutionary
-- Name: Dylan Hull
-  Tier: Revolutionary
-- Name: FungiFog
-  Tier: Revolutionary
-- Name: S.C.
+- Name: all fields
   Tier: Syndicate Agent
-- Name: "'-Y-"
-  Tier: Syndicate Agent
-- Name: pooba
-  Tier: Revolutionary
-- Name: evilJenny
-  Tier: Revolutionary
-- Name: clyf
-  Tier: Free
-- Name: Kerb
-  Tier: Revolutionary
-- Name: queednyeb
-  Tier: Revolutionary
-- Name: Robin Rottstock
-  Tier: Revolutionary
-- Name: Third
-  Tier: Revolutionary
+- Name: Alpha
+  Tier: Nuclear Operative
 - Name: Altana
   Tier: Revolutionary
-- Name: showgun117
+- Name: AmalgoMyte
+  Tier: Revolutionary
+- Name: Amble
+  Tier: Nuclear Operative
+- Name: Andrew Danke
   Tier: Syndicate Agent
-- Name: Durp
-  Tier: Revolutionary
-- Name: Joshington Awesomahee
-  Tier: Revolutionary
-- Name: Diklyquill
-  Tier: Revolutionary
-- Name: Eric VW
-  Tier: Revolutionary
-- Name: Nat
-  Tier: Revolutionary
-- Name: Evan Armstrong
-  Tier: Revolutionary
-- Name: Citizen Battle
-  Tier: Nuclear Operative
-- Name: Cyberate
-  Tier: Revolutionary
-- Name: Enzoman12
-  Tier: Nuclear Operative
-- Name: Curtis Pearson
-  Tier: Revolutionary
-- Name: Mono
-  Tier: Revolutionary
-- Name: Xenon Dragon
+- Name: Andrew Montagne
   Tier: Syndicate Agent
-- Name: Jerg Jerginson
-  Tier: Nuclear Operative
-- Name: kik
+- Name: Androidonator
   Tier: Revolutionary
-- Name: Star Lord
+- Name: anharmlessguest
   Tier: Syndicate Agent
-- Name: kannthus
-  Tier: Syndicate Agent
-- Name: Ethan Keller
+- Name: Anthony Chicko
   Tier: Revolutionary
-- Name: John Doe
-  Tier: Nuclear Operative
-- Name: Robert Reed
-  Tier: Nuclear Operative
-- Name: DramaBuns
-  Tier: Revolutionary
-- Name: Bush Boy
-  Tier: Nuclear Operative
-- Name: Quonn
-  Tier: Syndicate Agent
-- Name: KrystalDisc
-  Tier: Revolutionary
-- Name: LeTobbs
-  Tier: Revolutionary
-- Name: Darren Brady
-  Tier: Free
-- Name: Zandario
-  Tier: Revolutionary
-- Name: Lucas Welsh
-  Tier: Revolutionary
-- Name: Nico Thate
-  Tier: Free
 - Name: Anthony Fleck
   Tier: Nuclear Operative
-- Name: vifs_vestige
-  Tier: Syndicate Agent
-- Name: Bobberunio
+- Name: Anton
   Tier: Revolutionary
-- Name: Zadenae
-  Tier: Nuclear Operative
-- Name: Into the Stars - Community Host
+- Name: AquaDraco
+  Tier: Revolutionary
+- Name: Arandomartfan
+  Tier: Revolutionary
+- Name: Archie Hicks
+  Tier: Revolutionary
+- Name: Archmonarch
+  Tier: Syndicate Agent
+- Name: Ari.
+  Tier: Revolutionary
+- Name: Arin Pearce
+  Tier: Revolutionary
+- Name: Arrol Gantry
   Tier: Nuclear Operative
 - Name: arthropods
   Tier: Revolutionary
-- Name: Jack Gardiner
-  Tier: Revolutionary
-- Name: BigMcLargeHuge
-  Tier: Free
-- Name: merklaw
-  Tier: Revolutionary
-- Name: CPM311
-  Tier: Revolutionary
-- Name: NetGlitch
-  Tier: Nuclear Operative
-- Name: Bahke
-  Tier: Nuclear Operative
-- Name: Prayer
-  Tier: Nuclear Operative
-- Name: Trevor McConnell
-  Tier: Nuclear Operative
-- Name: MetalClone
-  Tier: Free
-- Name: Farewell Fire
+- Name: Arthur Norris
   Tier: Syndicate Agent
-- Name: Ninja
-  Tier: Syndicate Agent
-- Name: all fields
-  Tier: Syndicate Agent
-- Name: Kyle Hipke
+- Name: Arykh
   Tier: Nuclear Operative
-- Name: Daniel Thompson
+- Name: Ashley Parfitt
   Tier: Revolutionary
-- Name: Tyler Young
-  Tier: Nuclear Operative
-- Name: LeoZ
+- Name: Asterisk
+  Tier: Syndicate Agent
+- Name: Aussiemandias
+  Tier: Syndicate Agent
+- Name: Austenn
   Tier: Revolutionary
 - Name: avcde
   Tier: Nuclear Operative
+- Name: Azmith Blackheart
+  Tier: Revolutionary
+- Name: Bahke
+  Tier: Nuclear Operative
+- Name: Ben Z'
+  Tier: Revolutionary
+- Name: Bex
+  Tier: Revolutionary
+- Name: Blackmare
+  Tier: Syndicate Agent
+- Name: Blight
+  Tier: Syndicate Agent
+- Name: blossom
+  Tier: Revolutionary
+- Name: BlueisDumb
+  Tier: Nuclear Operative
+- Name: Blumbee
+  Tier: Revolutionary
+- Name: Bobberunio
+  Tier: Revolutionary
+- Name: BokChoy
+  Tier: Nuclear Operative
+- Name: Bonefan223
+  Tier: Nuclear Operative
+- Name: Boogerfoot
+  Tier: Nuclear Operative
+- Name: Borna Punda
+  Tier: Revolutionary
+- Name: Brandon
+  Tier: Revolutionary
+- Name: Brandon Roughley
+  Tier: Syndicate Agent
+- Name: brbrbrbrbr brbrbr
+  Tier: Revolutionary
+- Name: BrunBytes
+  Tier: Revolutionary
+- Name: Bruno Bigras
+  Tier: Revolutionary
+- Name: Buldinn Girshovich
+  Tier: Nuclear Operative
+- Name: Bumlocked
+  Tier: Revolutionary
+- Name: Bush Boy
+  Tier: Nuclear Operative
+- Name: Callum Tubrett
+  Tier: Nuclear Operative
+- Name: Carbonhell
+  Tier: Syndicate Agent
+- Name: Catdere
+  Tier: Syndicate Agent
+- Name: Celestrogen
+  Tier: Syndicate Agent
+- Name: Cerzix
+  Tier: Revolutionary
+- Name: Chase Trotter
+  Tier: Nuclear Operative
+- Name: Chem_Inventory
+  Tier: Nuclear Operative
+- Name: Christian Hicks
+  Tier: Syndicate Agent
+- Name: Citizen Battle
+  Tier: Nuclear Operative
+- Name: CloudyClover
+  Tier: Revolutionary
+- Name: Collin R Terrell
+  Tier: Revolutionary
+- Name: Commissar Fox
+  Tier: Syndicate Agent
+- Name: ConcaveGnome
+  Tier: Syndicate Agent
+- Name: Coolsurf6
+  Tier: Revolutionary
+- Name: Cormos Lemming
+  Tier: Nuclear Operative
+- Name: Corpus Inc.
+  Tier: Revolutionary
+- Name: CPM311
+  Tier: Revolutionary
+- Name: CptFalcon
+  Tier: Revolutionary
+- Name: Crazyeyes24
+  Tier: Syndicate Agent
+- Name: CrudeOil
+  Tier: Nuclear Operative
+- Name: Curtis Pearson
+  Tier: Revolutionary
+- Name: Cyberate
+  Tier: Revolutionary
+- Name: Daniel D
+  Tier: Syndicate Agent
+- Name: Daniel Thompson
+  Tier: Revolutionary
+- Name: Daskata
+  Tier: Nuclear Operative
+- Name: Dastion
+  Tier: Revolutionary
+- Name: Dave
+  Tier: Revolutionary
+- Name: David
+  Tier: Revolutionary
+- Name: David N
+  Tier: Syndicate Agent
+- Name: Davyei
+  Tier: Revolutionary
+- Name: Daxx (Justin Winningham)
+  Tier: Syndicate Agent
+- Name: DBF
+  Tier: Syndicate Agent
+- Name: DerBall
+  Tier: Revolutionary
+- Name: Devin Nelson
+  Tier: Revolutionary
+- Name: Dieselmohawk D.
+  Tier: Revolutionary
+- Name: Diklyquill
+  Tier: Revolutionary
+- Name: Dizzy_Eevee
+  Tier: Syndicate Agent
+- Name: Dourbii
+  Tier: Revolutionary
+- Name: Dr.Raccoon
+  Tier: Revolutionary
+- Name: Dr_Med_Izin
+  Tier: Revolutionary
+- Name: Drakkenlupen
+  Tier: Revolutionary
+- Name: DramaBuns
+  Tier: Revolutionary
+- Name: DrIvoPotato
+  Tier: Nuclear Operative
+- Name: DrMelon
+  Tier: Revolutionary
+- Name: dubdubchan
+  Tier: Syndicate Agent
+- Name: DubzyVEVO
+  Tier: Revolutionary
+- Name: Durp
+  Tier: Revolutionary
+- Name: Dusk
+  Tier: Revolutionary
+- Name: Dylan Hull
+  Tier: Revolutionary
+- Name: Dylan Roberts
+  Tier: Syndicate Agent
+- Name: Echinodermata
+  Tier: Revolutionary
+- Name: Edward Doyle
+  Tier: Revolutionary
+- Name: Enricoc3l
+  Tier: Revolutionary
+- Name: Enzoman12
+  Tier: Nuclear Operative
+- Name: Erik Meinke
+  Tier: Revolutionary
+- Name: Ethan Keller
+  Tier: Revolutionary
+- Name: Evan Armstrong
+  Tier: Revolutionary
+- Name: evilJenny
+  Tier: Revolutionary
+- Name: ExclusiveWizard
+  Tier: Syndicate Agent
+- Name: Farewell Fire
+  Tier: Syndicate Agent
+- Name: Faust Statler
+  Tier: Syndicate Agent
+- Name: FauxParadox
+  Tier: Revolutionary
+- Name: Fiebertraum Illhead
+  Tier: Syndicate Agent
+- Name: flipways
+  Tier: Nuclear Operative
+- Name: Florian
+  Tier: Revolutionary
+- Name: François Desautels
+  Tier: Revolutionary
+- Name: Frege Beach
+  Tier: Revolutionary
+- Name: FungiFog
+  Tier: Revolutionary
+- Name: funnylookingwolf
+  Tier: Revolutionary
+- Name: Gallagin
+  Tier: Revolutionary
+- Name: Gavin Jones
+  Tier: Nuclear Operative
+- Name: Gavin Simmons
+  Tier: Revolutionary
+- Name: Gaxeer
+  Tier: Syndicate Agent
+- Name: Gaëtan GOUSSEAUD
+  Tier: Revolutionary
+- Name: Geekyhobo2
+  Tier: Revolutionary
+- Name: Georgia Partyka
+  Tier: Syndicate Agent
+- Name: ghost--page
+  Tier: Nuclear Operative
+- Name: Glenn Olsen
+  Tier: Syndicate Agent
+- Name: Gnomo
+  Tier: Nuclear Operative
+- Name: Godfiend
+  Tier: Revolutionary
+- Name: Gordod
+  Tier: Syndicate Agent
+- Name: Gosera -
+  Tier: Syndicate Agent
+- Name: Gothryd
+  Tier: Revolutionary
+- Name: Greggo
+  Tier: Syndicate Agent
+- Name: Greyhound Connect
+  Tier: Revolutionary
+- Name: grhmhome
+  Tier: Revolutionary
+- Name: guh
+  Tier: Revolutionary
+- Name: Hamcha
+  Tier: Revolutionary
+- Name: Hannah
+  Tier: Nuclear Operative
+- Name: Hannah Dawson
+  Tier: Syndicate Agent
+- Name: Hanzdegloker
+  Tier: Syndicate Agent
+- Name: Hat Kid
+  Tier: Revolutionary
+- Name: Hayden
+  Tier: Revolutionary
+- Name: Henrik Møller
+  Tier: Syndicate Agent
+- Name: hh
+  Tier: Syndicate Agent
+- Name: Higgtastic
+  Tier: Revolutionary
+- Name: Hoplophobia
+  Tier: Revolutionary
+- Name: huh?
+  Tier: Revolutionary
+- Name: Hunter James
+  Tier: Nuclear Operative
+- Name: Hunter Tew
+  Tier: Syndicate Agent
+- Name: hyphenation
+  Tier: Nuclear Operative
+- Name: I'm going to resurrect Charlie Kirk as a gay zombie with a permanent hard cock, like the scene where robocop is lungs, but boner
+  Tier: Revolutionary
+- Name: IamOzyman
+  Tier: Revolutionary
+- Name: IceStorm theDragon
+  Tier: Revolutionary
+- Name: ikamuse johnson
+  Tier: Revolutionary
+- Name: illpala
+  Tier: Revolutionary
+- Name: Ingvar Tornberg
+  Tier: Revolutionary
+- Name: Into the Stars - Community Host
+  Tier: Nuclear Operative
+- Name: Invisorum
+  Tier: Nuclear Operative
+- Name: Irish Kelly
+  Tier: Syndicate Agent
+- Name: Jack
+  Tier: Revolutionary
+- Name: Jack Gardiner
+  Tier: Revolutionary
+- Name: Jack Rose
+  Tier: Revolutionary
+- Name: Jacob Watson
+  Tier: Syndicate Agent
+- Name: Jado0213
+  Tier: Revolutionary
+- Name: JagerVonS
+  Tier: Revolutionary
+- Name: James Andrew Peoples Jr
+  Tier: Revolutionary
+- Name: James Stevens
+  Tier: Revolutionary
+- Name: Jax
+  Tier: Nuclear Operative
+- Name: Jeaglekill
+  Tier: Revolutionary
+- Name: Jeff Tatem
+  Tier: Nuclear Operative
+- Name: Jeffery Pointer
+  Tier: Syndicate Agent
+- Name: JenericJen
+  Tier: Revolutionary
+- Name: Jeremy Hernandez
+  Tier: Syndicate Agent
+- Name: Jerg Jerginson
+  Tier: Nuclear Operative
+- Name: Joel
+  Tier: Revolutionary
+- Name: JohannVanDerwis
+  Tier: Revolutionary
+- Name: John Doe
+  Tier: Nuclear Operative
+- Name: Jordon
+  Tier: Revolutionary
+- Name: Joshington Awesomahee
+  Tier: Revolutionary
+- Name: Joshua Hines
+  Tier: Nuclear Operative
+- Name: Joshua Meyer
+  Tier: Nuclear Operative
+- Name: JT Billings
+  Tier: Revolutionary
+- Name: JustanAnus
+  Tier: Nuclear Operative
+- Name: Kai
+  Tier: Nuclear Operative
+- Name: Kaitlynn Brennan
+  Tier: Syndicate Agent
+- Name: kannthus
+  Tier: Syndicate Agent
+- Name: Karma Hunter
+  Tier: Revolutionary
+- Name: Kashieru
+  Tier: Revolutionary
+- Name: KateSlime206
+  Tier: Nuclear Operative
+- Name: Kayla Solace
+  Tier: Revolutionary
+- Name: kenneth heller
+  Tier: Syndicate Agent
+- Name: Kerb
+  Tier: Revolutionary
+- Name: Kerensky
+  Tier: Revolutionary
+- Name: Kesiath
+  Tier: Nuclear Operative
+- Name: Kevin
+  Tier: Nuclear Operative
+- Name: Kevin
+  Tier: Nuclear Operative
+- Name: Kieue Caprie
+  Tier: Revolutionary
+- Name: kik
+  Tier: Revolutionary
+- Name: Kim
+  Tier: Revolutionary
+- Name: kithri
+  Tier: Nuclear Operative
+- Name: Koyki
+  Tier: Revolutionary
+- Name: krberryy
+  Tier: Revolutionary
+- Name: kristopher arnott
+  Tier: Syndicate Agent
+- Name: KrystalDisc
+  Tier: Revolutionary
+- Name: Krystian Janecki
+  Tier: Revolutionary
+- Name: Kubakura
+  Tier: Revolutionary
+- Name: Kyle Hipke
+  Tier: Nuclear Operative
+- Name: Kyle Tyo
+  Tier: Syndicate Agent
+- Name: lapatison
+  Tier: Revolutionary
+- Name: LeoZ
+  Tier: Revolutionary
+- Name: LeTobbs
+  Tier: Revolutionary
+- Name: Lieutenant Colonel Orangejuice
+  Tier: Syndicate Agent
+- Name: Lilith
+  Tier: Nuclear Operative
+- Name: liltenhead
+  Tier: Revolutionary
+- Name: Luaan
+  Tier: Syndicate Agent
+- Name: Lucas Welsh
+  Tier: Revolutionary
+- Name: lukiw
+  Tier: Revolutionary
+- Name: Luzurper
+  Tier: Revolutionary
+- Name: Lyndomen
+  Tier: Revolutionary
+- Name: Madeleine LeFleur
+  Tier: Syndicate Agent
+- Name: mage_period
+  Tier: Syndicate Agent
+- Name: Magelfik
+  Tier: Revolutionary
+- Name: Malachi Housewright
+  Tier: Revolutionary
+- Name: March
+  Tier: Syndicate Agent
+- Name: Marios Sardis
+  Tier: Revolutionary
+- Name: Mason Fawcett
+  Tier: Revolutionary
+- Name: MasterFurret
+  Tier: Revolutionary
+- Name: Mathew McGuire
+  Tier: Revolutionary
+- Name: Matthew C Miklaucic
+  Tier: Revolutionary
+- Name: Matthias Bechtold
+  Tier: Revolutionary
+- Name: Mci
+  Tier: Revolutionary
+- Name: MechaKitty
+  Tier: Revolutionary
+- Name: Mega Awesome Man
+  Tier: Syndicate Agent
+- Name: merklaw
+  Tier: Revolutionary
+- Name: Michael Van Gaasbeck
+  Tier: Revolutionary
+- Name: Mihailo Trickovic
+  Tier: Syndicate Agent
+- Name: Mikhail
+  Tier: Revolutionary
+- Name: mikiju
+  Tier: Syndicate Agent
+- Name: Minemoder
+  Tier: Syndicate Agent
+- Name: Miniwoffer
+  Tier: Revolutionary
+- Name: Mitchell Marry
+  Tier: Revolutionary
+- Name: mksky
+  Tier: Revolutionary
+- Name: Molly the Bully
+  Tier: Nuclear Operative
+- Name: Molon
+  Tier: Syndicate Agent
+- Name: Mono
+  Tier: Revolutionary
+- Name: Mr_Clank
+  Tier: Revolutionary
+- Name: MrGloopy
+  Tier: Revolutionary
+- Name: Mythtic B
+  Tier: Revolutionary
+- Name: Nagano
+  Tier: Revolutionary
+- Name: Nat
+  Tier: Revolutionary
+- Name: Nathan Zaldivar
+  Tier: Nuclear Operative
+- Name: Nathaniel Joseph Hurd
+  Tier: Revolutionary
+- Name: Nathaniel Taylor
+  Tier: Revolutionary
+- Name: Nemmay
+  Tier: Revolutionary
+- Name: Neo Move
+  Tier: Syndicate Agent
+- Name: NetGlitch
+  Tier: Nuclear Operative
+- Name: Nicholas
+  Tier: Nuclear Operative
+- Name: Nicholas Williamson
+  Tier: Nuclear Operative
+- Name: Nicholi
+  Tier: Syndicate Agent
+- Name: Nictis
+  Tier: Revolutionary
+- Name: Ninja
+  Tier: Syndicate Agent
+- Name: Nojan Niaki
+  Tier: Revolutionary
+- Name: Noodle is me
+  Tier: Syndicate Agent
+- Name: Novaq
+  Tier: Revolutionary
+- Name: Noxy
+  Tier: Syndicate Agent
+- Name: Nudal
+  Tier: Revolutionary
+- Name: Nugmania
+  Tier: Revolutionary
+- Name: Nyxilath
+  Tier: Nuclear Operative
+- Name: orange color
+  Tier: Revolutionary
+- Name: osborn
+  Tier: Syndicate Agent
+- Name: Oscar Tobias Herra Bravo
+  Tier: Revolutionary
+- Name: Oxyclean114
+  Tier: Revolutionary
+- Name: Pangaron
+  Tier: Syndicate Agent
+- Name: Pasemi
+  Tier: Revolutionary
+- Name: peanut
+  Tier: Revolutionary
+- Name: Penguin Commoner
+  Tier: Revolutionary
+- Name: Phillip Inman
+  Tier: Revolutionary
+- Name: Phycoweirdo
+  Tier: Nuclear Operative
+- Name: Pinet
+  Tier: Nuclear Operative
+- Name: Piotr
+  Tier: Revolutionary
+- Name: pooba
+  Tier: Revolutionary
+- Name: Powder
+  Tier: Revolutionary
+- Name: ppie
+  Tier: Syndicate Agent
+- Name: Prayer
+  Tier: Nuclear Operative
+- Name: Preston Pickering
+  Tier: Revolutionary
+- Name: Prof. Omii
+  Tier: Nuclear Operative
+- Name: ProxyGen
+  Tier: Revolutionary
+- Name: Psy
+  Tier: Revolutionary
+- Name: queednyeb
+  Tier: Revolutionary
+- Name: Quonn
+  Tier: Syndicate Agent
+- Name: Raccoononi
+  Tier: Revolutionary
+- Name: Rafał Kowalewski
+  Tier: Revolutionary
+- Name: Raiden Johnson
+  Tier: Revolutionary
+- Name: Rainy
+  Tier: Revolutionary
+- Name: RamenZorn
+  Tier: Syndicate Agent
+- Name: Ramiro Agis
+  Tier: Revolutionary
+- Name: Random Person
+  Tier: Syndicate Agent
+- Name: Rasmus Cedergren
+  Tier: Revolutionary
+- Name: Raspberry1111
+  Tier: Revolutionary
+- Name: Rat Fungus
+  Tier: Nuclear Operative
+- Name: Rat Man
+  Tier: Revolutionary
+- Name: RedChair368
+  Tier: Revolutionary
+- Name: Repo
+  Tier: Nuclear Operative
+- Name: Richard "Rei" Weeks
+  Tier: Syndicate Agent
+- Name: Robert Reed
+  Tier: Nuclear Operative
+- Name: Robin Rottstock
+  Tier: Revolutionary
+- Name: Roman
+  Tier: Syndicate Agent
+- Name: Rome
+  Tier: Revolutionary
+- Name: rosysyn
+  Tier: Revolutionary
+- Name: Rusty Shackleford
+  Tier: Nuclear Operative
+- Name: Ryan Hanson
+  Tier: Revolutionary
+- Name: Ryan Kelly
+  Tier: Revolutionary
+- Name: RyanTuek
+  Tier: Revolutionary
+- Name: S.C.
+  Tier: Syndicate Agent
+- Name: S1rFl0
+  Tier: Revolutionary
+- Name: Sam Caesar
+  Tier: Revolutionary
+- Name: Samtaro
+  Tier: Nuclear Operative
+- Name: Sandvich enjoyer
+  Tier: Revolutionary
+- Name: Saphire
+  Tier: Revolutionary
+- Name: SarahRaven
+  Tier: Revolutionary
+- Name: Sartec
+  Tier: Revolutionary
+- Name: ScarKy0
+  Tier: Revolutionary
+- Name: Sean Lilly
+  Tier: Syndicate Agent
+- Name: Seinfeld
+  Tier: Revolutionary
+- Name: Semiotics
+  Tier: Syndicate Agent
+- Name: Serathis
+  Tier: Revolutionary
+- Name: Serianas
+  Tier: Nuclear Operative
+- Name: Seth Morron
+  Tier: Revolutionary
+- Name: showgun117
+  Tier: Syndicate Agent
+- Name: Simon N Heath
+  Tier: Revolutionary
+- Name: SireHambone
+  Tier: Nuclear Operative
+- Name: sk3iron
+  Tier: Revolutionary
+- Name: Sleeepz
+  Tier: Syndicate Agent
+- Name: SnapKick
+  Tier: Revolutionary
+- Name: Snowlili
+  Tier: Revolutionary
+- Name: Snowni
+  Tier: Nuclear Operative
+- Name: Solid_Syn
+  Tier: Revolutionary
+- Name: Solidus Snake
+  Tier: Nuclear Operative
+- Name: SotetSotetSotetSotetSotet
+  Tier: Syndicate Agent
+- Name: Southbridge
+  Tier: Nuclear Operative
+- Name: Sparlight
+  Tier: Nuclear Operative
+- Name: SpiffyNnemonic
+  Tier: Revolutionary
+- Name: spookerton
+  Tier: Syndicate Agent
+- Name: Sporkyz
+  Tier: Revolutionary
+- Name: SpydAxe
+  Tier: Revolutionary
+- Name: StaceyBalcom
+  Tier: Revolutionary
+- Name: Star Lord
+  Tier: Syndicate Agent
+- Name: starch
+  Tier: Syndicate Agent
+- Name: StaticeStorm
+  Tier: Syndicate Agent
+- Name: Statix AraAra
+  Tier: Revolutionary
+- Name: Stedar
+  Tier: Syndicate Agent
+- Name: stikfigz
+  Tier: Revolutionary
+- Name: Sufary
+  Tier: Nuclear Operative
+- Name: Superglue
+  Tier: Syndicate Agent
+- Name: Sven Tammerijn
+  Tier: Revolutionary
+- Name: Swindel_
+  Tier: Syndicate Agent
+- Name: Swix Swix
+  Tier: Revolutionary
+- Name: T.P_Gaming
+  Tier: Revolutionary
+- Name: Tabatha Mendonski
+  Tier: Revolutionary
+- Name: Taber
+  Tier: Revolutionary
+- Name: TacoCub
+  Tier: Revolutionary
+- Name: Tairenar
+  Tier: Nuclear Operative
+- Name: Talbot
+  Tier: Revolutionary
+- Name: Tamora Droppa
+  Tier: Revolutionary
+- Name: taydeo
+  Tier: Nuclear Operative
+- Name: Taylor
+  Tier: Revolutionary
+- Name: Tee The Kobold
+  Tier: Revolutionary
+- Name: The Best Sean
+  Tier: Syndicate Agent
+- Name: the good king wompicus
+  Tier: Syndicate Agent
+- Name: The Hateful Flesh
+  Tier: Revolutionary
+- Name: The Pain
+  Tier: Syndicate Agent
+- Name: Thebluegameingdoggo
+  Tier: Revolutionary
+- Name: TheGoldElite
+  Tier: Revolutionary
+- Name: TheGungeonologist
+  Tier: Revolutionary
+- Name: Third
+  Tier: Revolutionary
+- Name: Thomas Pollard
+  Tier: Nuclear Operative
+- Name: Tia
+  Tier: Revolutionary
+- Name: tokie
+  Tier: Nuclear Operative
+- Name: Tom Cruize
+  Tier: Syndicate Agent
+- Name: Tom Goodman (TauOmicronMu#2500)
+  Tier: Revolutionary
 - Name: Tomeno
   Tier: Revolutionary
+- Name: ToonaLemons
+  Tier: Revolutionary
+- Name: tremors08
+  Tier: Syndicate Agent
+- Name: Trent Warfel
+  Tier: Nuclear Operative
+- Name: Trevor Johnson
+  Tier: Revolutionary
+- Name: Trevor McConnell
+  Tier: Nuclear Operative
+- Name: TrixxedHeart
+  Tier: Nuclear Operative
+- Name: Troll_King_907
+  Tier: Nuclear Operative
+- Name: Ty Ashley
+  Tier: Revolutionary
+- Name: tyler adams
+  Tier: Revolutionary
+- Name: Tyler Young
+  Tier: Nuclear Operative
+- Name: tynobeard 123
+  Tier: Revolutionary
+- Name: Uinseann
+  Tier: Revolutionary
+- Name: Unknown Kiwi
+  Tier: Revolutionary
+- Name: Valinov
+  Tier: Nuclear Operative
+- Name: Vexxtraordinary
+  Tier: Revolutionary
+- Name: Vice Emargo
+  Tier: Syndicate Agent
+- Name: vifs_vestige
+  Tier: Syndicate Agent
+- Name: Violette
+  Tier: Revolutionary
+- Name: VividWisp
+  Tier: Syndicate Agent
+- Name: VmasterVX
+  Tier: Revolutionary
+- Name: Voidliing
+  Tier: Revolutionary
+- Name: Voltinho
+  Tier: Revolutionary
+- Name: Watson Whittington
+  Tier: Syndicate Agent
+- Name: Whistling Jake
+  Tier: Revolutionary
+- Name: Wiliam
+  Tier: Nuclear Operative
+- Name: Will M.
+  Tier: Revolutionary
+- Name: William Grondin
+  Tier: Revolutionary
+- Name: Wolfie
+  Tier: Revolutionary
+- Name: Wrexbe
+  Tier: Revolutionary
+- Name: wtcwr68
+  Tier: Nuclear Operative
+- Name: WWII Kitsune
+  Tier: Nuclear Operative
+- Name: Xenon Dragon
+  Tier: Syndicate Agent
+- Name: yeoshua
+  Tier: Syndicate Agent
+- Name: YuNii
+  Tier: Nuclear Operative
+- Name: Z4NEER
+  Tier: Nuclear Operative
+- Name: Zadenae
+  Tier: Nuclear Operative
+- Name: Zak The Dragon
+  Tier: Revolutionary
+- Name: Zakanater 19
+  Tier: Revolutionary
+- Name: Zakory L Holbrook
+  Tier: Revolutionary
+- Name: Zandario
+  Tier: Revolutionary
+- Name: zedd
+  Tier: Nuclear Operative
+- Name: Zella Zane
+  Tier: Revolutionary
+- Name: Zenari Ari
+  Tier: Nuclear Operative
+- Name: Zero
+  Tier: Revolutionary
+- Name: Zoe Rose
+  Tier: Syndicate Agent
+- Name: Александр Белошапка
+  Tier: Revolutionary
 
diff --git a/Resources/Locale/en-US/access/components/id-card-console-component.ftl b/Resources/Locale/en-US/access/components/id-card-console-component.ftl
index 7793b34846..0418d32062 100644
--- a/Resources/Locale/en-US/access/components/id-card-console-component.ftl
+++ b/Resources/Locale/en-US/access/components/id-card-console-component.ftl
@@ -5,7 +5,9 @@ id-card-console-window-save-button = Save
 id-card-console-window-job-title-label = Job title:
 id-card-console-window-eject-button = Eject
 id-card-console-window-insert-button = Insert
-id-card-console-window-job-selection-label = Job presets (sets department and job icon):
+id-card-console-window-job-selection-label = Job preset (sets department and job icon):
+id-card-console-window-select-all-button = Grant all
+id-card-console-window-deselect-all-button = Revoke all
 
 access-id-card-console-component-no-hands-error = You have no hands.
 id-card-console-privileged-id = Privileged ID
diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 50d2b2790e..b9b103b58a 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -199,3 +199,4 @@ marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp
 marking-HumanHairLongWithBangs = Long With Bangs
+marking-HumanHairOverEyePigtail = Pigtail (Over Eye)
diff --git a/Resources/Locale/en-US/administration/admin-verbs.ftl b/Resources/Locale/en-US/administration/admin-verbs.ftl
index 13be0a876d..8007aa6cca 100644
--- a/Resources/Locale/en-US/administration/admin-verbs.ftl
+++ b/Resources/Locale/en-US/administration/admin-verbs.ftl
@@ -1,3 +1,4 @@
+# Generic verbs
 delete-verb-get-data-text = Delete
 edit-solutions-verb-get-data-text = Edit Solutions
 explode-verb-get-data-text = Explode
@@ -18,3 +19,47 @@ toolshed-verb-mark = Mark
 toolshed-verb-mark-description = Places this entity into the $marked variable, a list of entities, replacing its prior value.
 
 export-entity-verb-get-data-text = Export sprite
+
+# Tools verbs
+admin-verbs-rejuvenate = Rejuvenate
+admin-verbs-make-indestructible = Make Indestructible
+admin-verbs-make-vulnerable = Make Vulnerable
+admin-verbs-refill-battery = Refill Battery
+admin-verbs-drain-battery = Drain Battery
+admin-verbs-infinite-battery = Infinite Battery
+admin-verbs-block-unanchoring = Block Unanchoring
+admin-verbs-refill-internals-oxygen = Refill Internals Oxygen
+admin-verbs-refill-internals-nitrogen = Refill Internals Nitrogen
+admin-verbs-refill-internals-plasma = Refill Internals Plasma
+admin-verbs-send-to-test-arena = Send to test arena
+admin-verbs-grant-all-access = Grant All Access
+admin-verbs-revoke-all-access = Revoke All Access
+admin-verbs-adjust-stack = Adjust Stack
+admin-verbs-fill-stack = Fill Stack
+admin-verbs-rename = Rename
+admin-verbs-redescribe = Redescribe
+admin-verbs-rename-and-redescribe = Rename & Redescribe
+admin-verbs-bar-job-slots = Bar job slots
+admin-verbs-locate-cargo-shuttle = Locate Cargo Shuttle
+admin-verbs-halt-movement = Halt Movement
+admin-verbs-unpause-map = Unpause Map
+admin-verbs-pause-map = Pause Map
+admin-verbs-snap-joints = Snap Joints
+admin-verbs-make-minigun = Make Minigun
+admin-verbs-set-bullet-amount = Set Bullet Amount
+
+# Toggles verbs
+admin-verbs-bolt = Bolt
+admin-verbs-unbolt = Unbolt
+admin-verbs-emergency-access-on = Emergency Access On
+admin-verbs-emergency-access-off = Emergency Access Off
+
+# Dialogs verbs
+admin-verbs-dialog-adjust-stack-amount = Amount (max {$max})
+admin-verbs-dialog-rename-title = Rename
+admin-verbs-dialog-rename-name = Name
+admin-verbs-dialog-redescribe-title = Redescribe
+admin-verbs-dialog-redescribe-description = Description
+admin-verbs-dialog-rename-and-redescribe-title = Rename & Redescribe
+admin-verbs-dialog-set-bullet-amount-title = Set Bullet Amount
+admin-verbs-dialog-set-bullet-amount-amount = Amount (standard {$cap})
diff --git a/Resources/Locale/en-US/administration/bwoink.ftl b/Resources/Locale/en-US/administration/bwoink.ftl
index 9c305569e1..2012f9bd0e 100644
--- a/Resources/Locale/en-US/administration/bwoink.ftl
+++ b/Resources/Locale/en-US/administration/bwoink.ftl
@@ -1,4 +1,5 @@
 bwoink-user-title = Admin Message
+bwoink-admin-title = Admin Help
 
 bwoink-system-starmute-message-no-other-users = *System: Nobody is available to receive your message. Try pinging Game Admins on Discord.
 
diff --git a/Resources/Locale/en-US/administration/ui/tabs/admin-tab/player-actions-window.ftl b/Resources/Locale/en-US/administration/ui/tabs/admin-tab/player-actions-window.ftl
index 62b253e3f5..171e25d29f 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/admin-tab/player-actions-window.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/admin-tab/player-actions-window.ftl
@@ -1,11 +1,8 @@
-admin-player-actions-window-title = Player Actions Panel
 admin-player-actions-window-ban = Banning panel
 admin-player-actions-window-admin-ghost = Admin Ghost
-admin-player-actions-window-teleport = Teleport
 admin-player-actions-window-permissions = Permissions Panel
 admin-player-actions-window-announce = Announce
 admin-player-actions-window-shuttle = (Re)call Shuttle
 admin-player-actions-window-admin-logs = Admin Logs
-admin-player-actions-window-admin-notes = Admin Notes
 admin-player-actions-window-admin-fax = Admin Fax
 admin-player-actions-window-admin-chat = Admin Chat
diff --git a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
index 6621c000a3..11b2fb9402 100644
--- a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
@@ -92,6 +92,8 @@ wanted-list-status-label = [color=darkgray]status:[/color] {$status ->
         [detained] [color=#b18644]detained[/color]
         [paroled] [color=green]paroled[/color]
         [discharged] [color=green]discharged[/color]
+        [hostile] [color=darkred]hostile[/color]
+        [eliminated] [color=gray]eliminated[/color]
         *[other] none
     }
 
diff --git a/Resources/Locale/en-US/cluwne/cluwne.ftl b/Resources/Locale/en-US/cluwne/cluwne.ftl
index 0ffd3f32df..e469cbfbac 100644
--- a/Resources/Locale/en-US/cluwne/cluwne.ftl
+++ b/Resources/Locale/en-US/cluwne/cluwne.ftl
@@ -1,2 +1,4 @@
 cluwne-transform = {CAPITALIZE(THE($target))} turned into a cluwne!
 cluwne-name-prefix = cluwnified {$baseName}
+cluwne-knock-emote = spasms
+cluwne-giggle-emote = honks
diff --git a/Resources/Locale/en-US/commands/toolshed-commands.ftl b/Resources/Locale/en-US/commands/toolshed-commands.ftl
index 2e3c395198..218235338c 100644
--- a/Resources/Locale/en-US/commands/toolshed-commands.ftl
+++ b/Resources/Locale/en-US/commands/toolshed-commands.ftl
@@ -6,6 +6,16 @@ command-description-acmd-perms =
     Returns the admin permissions of the given command, if any.
 command-description-acmd-caninvoke =
     Check if the given player can invoke the given command.
+command-description-bank-accounts = 
+    Returns all accounts on a station.
+command-description-bank-account = 
+    Returns a given bank account from a station.
+command-description-bank-adjust =
+    Adjusts the money for the given bank account.
+command-description-bank-set =
+    Sets the money for the given bank account.
+command-description-bank-amount =
+    Returns the money for the given bank account.
 command-description-jobs-jobs =
     Returns all jobs on a station.
 command-description-jobs-job =
diff --git a/Resources/Locale/en-US/components/storage-component.ftl b/Resources/Locale/en-US/components/storage-component.ftl
index e742c83f6a..2d3953c1a1 100644
--- a/Resources/Locale/en-US/components/storage-component.ftl
+++ b/Resources/Locale/en-US/components/storage-component.ftl
@@ -8,5 +8,6 @@ comp-storage-cant-drop = You can't let go of { THE($entity) }!
 comp-storage-window-title = Storage Item
 comp-storage-window-weight = { $weight }/{ $maxWeight }, Max Size: {$size}
 comp-storage-window-slots = Slots: { $itemCount }/{ $maxCount }, Max Size: {$size}
+comp-storage-window-dummy = Dummy
 comp-storage-verb-open-storage = Open Storage
 comp-storage-verb-close-storage = Close Storage
diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index befe646676..3a9bd5f097 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -57,8 +57,8 @@ baby-jail-account-reason-overall = Your overall playtime on the server must be y
 
 generic-misconfigured = The server is misconfigured and is not accepting players. Please contact the server owner and try again later.
 
-ipintel-server-ratelimited = This server uses a security system with external verification, which has reached its maximum verification limit. Please contact the administration team of the server for assistance and try again later.
-ipintel-unknown = This server uses a security system with external verification, but it encountered an error. Please contact the administration team of the server for assistance and try again later.
-ipintel-suspicious = You seem to be connecting through a datacenter or VPN. For administrative reasons we do not allow VPN connections to play. Please contact the administration team of the server for assistance if you believe this is false.
+ipintel-server-ratelimited = This server uses an auditing system with external verification, but the server has reached its maximum verification limit with the external service. Please contact the administration team of the server to inform them and for further assistance, or try again later.
+ipintel-unknown = This server uses an auditing system with external verification, but an error was encountered while verifying your connection. Please contact the administration team of the server to inform them and for further assistance, or try again later.
+ipintel-suspicious = You seem to be attempting to connect using a datacenter, proxy, VPN or otherwise suspicious connection. For administrative reasons, we do not allow these connections to play. If you have a VPN or similar enabled, please turn it off and attempt to reconnect or contact the administration team of the server for assistance on how to continue if you believe this is false or require using these services to play.
 
 hwid-required = Your client has refused to send a hardware id. Please contact the administration team for further assistance.
diff --git a/Resources/Locale/en-US/construction/recipes/curtains.ftl b/Resources/Locale/en-US/construction/recipes/curtains.ftl
index 92c3c758f3..ad441b3264 100644
--- a/Resources/Locale/en-US/construction/recipes/curtains.ftl
+++ b/Resources/Locale/en-US/construction/recipes/curtains.ftl
@@ -1,6 +1,7 @@
 construction-recipe-curtains-cloth = curtains (cloth)
 construction-recipe-curtains-black = curtains (black)
 construction-recipe-curtains-blue = curtains (blue)
+construction-recipe-curtains-sky-blue = curtains (sky blue)
 construction-recipe-curtains-cyan = curtains (cyan)
 construction-recipe-curtains-green = curtains (green)
 construction-recipe-curtains-orange = curtains (orange)
diff --git a/Resources/Locale/en-US/construction/recipes/furniture.ftl b/Resources/Locale/en-US/construction/recipes/furniture.ftl
index c9a6265a28..b5c66a6913 100644
--- a/Resources/Locale/en-US/construction/recipes/furniture.ftl
+++ b/Resources/Locale/en-US/construction/recipes/furniture.ftl
@@ -2,6 +2,7 @@ construction-recipe-red-comf-bench = comfortable bench (red)
 construction-recipe-blue-comf-bench = comfortable bench (blue)
 construction-recipe-table-fancy-black = fancy table (black)
 construction-recipe-table-fancy-blue = fancy table (blue)
+construction-recipe-table-fancy-sky-blue = fancy table (sky blue)
 construction-recipe-table-fancy-cyan = fancy table (cyan)
 construction-recipe-table-fancy-green = fancy table (green)
 construction-recipe-table-fancy-orange = fancy table (orange)
diff --git a/Resources/Locale/en-US/credits/credits-window.ftl b/Resources/Locale/en-US/credits/credits-window.ftl
index e1081a95f0..b3373f00f3 100644
--- a/Resources/Locale/en-US/credits/credits-window.ftl
+++ b/Resources/Locale/en-US/credits/credits-window.ftl
@@ -11,6 +11,8 @@ credits-window-codebases-section-title = Space Station 13 Codebases
 credits-window-original-remake-team-section-title = Original Space Station 13 Remake Team
 credits-window-immortals-title = In Memoriam
 credits-window-special-thanks-section-title = Special Thanks
+credits-window-previous-page-button = Previous Page
+credits-window-next-page-button = Next Page
 
 credits-window-attributions-directory = [color=white]Directory:[/color] {$directory}
 credits-window-attributions-files = [color=white]Files:[/color] {$files}
diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
index 2833b0a07f..de7212ad52 100644
--- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl
+++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
@@ -16,6 +16,8 @@ criminal-records-status-detained = Detained
 criminal-records-status-suspected = Suspect
 criminal-records-status-discharged = Discharged
 criminal-records-status-paroled = Paroled
+criminal-records-status-hostile = Hostile
+criminal-records-status-eliminated = Eliminated
 
 criminal-records-console-wanted-reason = Wanted Reason
 criminal-records-console-suspected-reason = Suspected Reason
@@ -42,6 +44,10 @@ criminal-records-console-detained = {$name} ({$job}) has been detained by {$offi
 criminal-records-console-released = {$name} ({$job}) has been released by {$officer}.
 criminal-records-console-paroled = {$name} ({$job}) has been released on parole by {$officer}.
 criminal-records-console-not-parole = {$officer} cleared the parole status of {$name} ({$job}).
+criminal-records-console-hostile = {$name} ({$job}) was marked as hostile by {$officer} for: {$reason}.
+criminal-records-console-not-hostile = {$name} ({$job}) no longer marked as hostile by {$officer}.
+criminal-records-console-eliminated = {$name} ({$job}) was marked as eliminated by {$officer}.
+criminal-records-console-not-eliminated = {$name} ({$job}) no longer marked as eliminated by {$officer}.
 criminal-records-console-unknown-officer = <unknown>
 
 ## Filters
diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl
index c000c37c1e..2c5d073864 100644
--- a/Resources/Locale/en-US/datasets/figurines.ftl
+++ b/Resources/Locale/en-US/datasets/figurines.ftl
@@ -316,3 +316,27 @@ figurines-hamlet-5 = Pip!
 figurines-hamlet-6 = Fwiep!
 figurines-hamlet-7 = Heep!
 figurines-hamlet-8 = NOT THE MICROWAVE!
+
+figurines-thief-1 = You don't have a warrant!
+figurines-thief-2 = This is just a normal beacon!
+figurines-thief-3 = Theres nothing suspicious about this satchel at all, officer.
+figurines-thief-4 = I have NO idea where your pet is...
+figurines-thief-5 = Huh, I didn't know that wall could open up...
+
+figurines-skeleton-1 = ACK ACK!
+figurines-skeleton-2 = Ugh, that locker was cramped!
+figurines-skeleton-3 = You're going to have a bad time.
+figurines-skeleton-4 = Got any milk?
+figurines-skeleton-5 = I have a bone to pick with you!
+
+figurines-owlman-1 = No need to fear, Owlman is here!
+figurines-owlman-2 = Owl be seeing you later!
+figurines-owlman-3 = HOOT!!
+figurines-owlman-4 = What do you call an owl magician, HOO-DINI!
+figurines-owlman-5 = Don't worry citizen, I'll save the day!
+
+figurines-griffin-1 = MUHAHAHAHA, I am so evil!!
+figurines-griffin-2 = The second I see Owlman, they are so dead!!
+figurines-griffin-3 = How do us Griffins deal with stress? We wing it!
+figurines-griffin-4 = My name isn't Gilda!!
+figurines-griffin-5 = Being a criminal mastermind, isn't easy.
diff --git a/Resources/Locale/en-US/date.ftl b/Resources/Locale/en-US/date.ftl
new file mode 100644
index 0000000000..c3525d7899
--- /dev/null
+++ b/Resources/Locale/en-US/date.ftl
@@ -0,0 +1,18 @@
+## Used for date picker
+
+month-1 = January
+month-2 = February
+month-3 = Mars
+month-4 = April
+month-5 = May
+month-6 = June
+month-7 = July
+month-8 = August
+month-9 = September
+month-10 = October
+month-11 = November
+month-12 = December
+
+datepicker-month = Month
+datepicker-day = Day
+datepicker-year = Year
diff --git a/Resources/Locale/en-US/ghost/make-ghost-gui.ftl b/Resources/Locale/en-US/ghost/make-ghost-gui.ftl
new file mode 100644
index 0000000000..99d7f80fa2
--- /dev/null
+++ b/Resources/Locale/en-US/ghost/make-ghost-gui.ftl
@@ -0,0 +1,21 @@
+make-ghost-roles-window-title = Make Ghost Role
+
+make-ghost-roles-window-entity-label = Entity
+make-ghost-roles-window-role-name-label = Role Name
+make-ghost-roles-window-role-description-label = Role Description
+make-ghost-roles-window-role-rules-label = Role Rules
+make-ghost-roles-window-make-sentient-label = Make Sentient
+make-ghost-roles-window-initial-duration-label = Initial Duration (s)
+make-ghost-roles-window-join-extends-by-label = Joins Extend By (s)
+make-ghost-roles-window-max-duration-label = Max Duration (s)
+
+make-ghost-roles-window-make-button = Make
+
+# Raffle
+make-ghost-roles-window-raffle-not-button = Don't raffle
+make-ghost-roles-window-raffle-custom-settings-button = Custom settings
+
+make-ghost-roles-window-raffle-role-label = Raffle Role?
+make-ghost-roles-window-raffle-settings-label = {$id} (initial {$initialDuration}s, max {$maxDuration}s, join adds {$joinExtendsDurationBy}s)
+
+make-ghost-roles-window-raffle-warning-tooltip = The initial duration must not exceed the maximum duration.
diff --git a/Resources/Locale/en-US/guidebook/chemistry/core.ftl b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
index 2ffb0b2be2..bcb3250db6 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/core.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
@@ -1,5 +1,8 @@
 guidebook-reagent-effect-description =
-    {$chance ->
+    {$quantity ->
+        [0] {""}
+        *[other] If there is at least {$quantity}u {$reagent},{" "}
+    }{$chance ->
         [1] { $effect }
         *[other] Has a { NATURALPERCENT($chance, 2) } chance to { $effect }
     }{ $conditionCount ->
diff --git a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
deleted file mode 100644
index 33793048c6..0000000000
--- a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-reagent-effect-status-effect-Stun = stunning
-reagent-effect-status-effect-KnockedDown = knockdown
-reagent-effect-status-effect-Jitter = jittering
-reagent-effect-status-effect-TemporaryBlindness = blindness
-reagent-effect-status-effect-SeeingRainbows = hallucinations
-reagent-effect-status-effect-Muted = inability to speak
-reagent-effect-status-effect-Stutter = stuttering
-reagent-effect-status-effect-ForcedSleep = unconsciousness
-reagent-effect-status-effect-Drunk = drunkenness
-reagent-effect-status-effect-PressureImmunity = pressure immunity
-reagent-effect-status-effect-Pacified = combat pacification
-reagent-effect-status-effect-RatvarianLanguage = ratvarian language patterns
-reagent-effect-status-effect-StaminaModifier = modified stamina
-reagent-effect-status-effect-RadiationProtection = radiation protection
-reagent-effect-status-effect-Drowsiness = drowsiness
-reagent-effect-status-effect-Adrenaline = adrenaline
diff --git a/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl b/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
similarity index 64%
rename from Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
rename to Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
index fe31dd62f8..1d017423d3 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
+++ b/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
@@ -1,4 +1,4 @@
-reagent-effect-condition-guidebook-total-damage =
+entity-condition-guidebook-total-damage =
     { $max ->
         [2147483648] it has at least {NATURALFIXED($min, 2)} total damage
         *[other] { $min ->
@@ -7,7 +7,25 @@ reagent-effect-condition-guidebook-total-damage =
                  }
     }
 
-reagent-effect-condition-guidebook-total-hunger =
+entity-condition-guidebook-type-damage =
+    { $max ->
+        [2147483648] it has at least {NATURALFIXED($min, 2)} of {$type} damage
+        *[other] { $min ->
+                    [0] it has at most {NATURALFIXED($max, 2)} of {$type} damage
+                    *[other] it has between {NATURALFIXED($min, 2)} and {NATURALFIXED($max, 2)} of {$type} damage
+                 }
+    }
+
+entity-condition-guidebook-group-damage =
+    { $max ->
+        [2147483648] it has at least {NATURALFIXED($min, 2)} of {$type} damage.
+        *[other] { $min ->
+                    [0] it has at most {NATURALFIXED($max, 2)} of {$type} damage.
+                    *[other] it has between {NATURALFIXED($min, 2)} and {NATURALFIXED($max, 2)} of {$type} damage
+                 }
+    }
+
+entity-condition-guidebook-total-hunger =
     { $max ->
         [2147483648] the target has at least {NATURALFIXED($min, 2)} total hunger
         *[other] { $min ->
@@ -16,7 +34,7 @@ reagent-effect-condition-guidebook-total-hunger =
                  }
     }
 
-reagent-effect-condition-guidebook-reagent-threshold =
+entity-condition-guidebook-reagent-threshold =
     { $max ->
         [2147483648] there's at least {NATURALFIXED($min, 2)}u of {$reagent}
         *[other] { $min ->
@@ -25,13 +43,13 @@ reagent-effect-condition-guidebook-reagent-threshold =
                  }
     }
 
-reagent-effect-condition-guidebook-mob-state-condition =
+entity-condition-guidebook-mob-state-condition =
     the mob is { $state }
 
-reagent-effect-condition-guidebook-job-condition =
+entity-condition-guidebook-job-condition =
     the target's job is { $job }
 
-reagent-effect-condition-guidebook-solution-temperature =
+entity-condition-guidebook-solution-temperature =
     the solution's temperature is { $max ->
             [2147483648] at least {NATURALFIXED($min, 2)}k
             *[other] { $min ->
@@ -40,7 +58,7 @@ reagent-effect-condition-guidebook-solution-temperature =
                      }
     }
 
-reagent-effect-condition-guidebook-body-temperature =
+entity-condition-guidebook-body-temperature =
     the body's temperature is { $max ->
             [2147483648] at least {NATURALFIXED($min, 2)}k
             *[other] { $min ->
@@ -49,27 +67,27 @@ reagent-effect-condition-guidebook-body-temperature =
                      }
     }
 
-reagent-effect-condition-guidebook-organ-type =
+entity-condition-guidebook-organ-type =
     the metabolizing organ { $shouldhave ->
                                 [true] is
                                 *[false] is not
                            } {INDEFINITE($name)} {$name} organ
 
-reagent-effect-condition-guidebook-has-tag =
+entity-condition-guidebook-has-tag =
     the target { $invert ->
                  [true] does not have
                  *[false] has
                 } the tag {$tag}
 
-reagent-effect-condition-guidebook-this-reagent = this reagent
+entity-condition-guidebook-this-reagent = this reagent
 
-reagent-effect-condition-guidebook-breathing =
+entity-condition-guidebook-breathing =
     the metabolizer is { $isBreathing ->
                 [true] breathing normally
                 *[false] suffocating
                }
 
-reagent-effect-condition-guidebook-internals =
+entity-condition-guidebook-internals =
     the metabolizer is { $usingInternals ->
                 [true] using internals
                 *[false] breathing atmospheric air
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
similarity index 70%
rename from Resources/Locale/en-US/guidebook/chemistry/effects.ftl
rename to Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
index 07c908c035..bbfaca7ee9 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
@@ -16,7 +16,7 @@
         *[other] satiate
     }
 
-reagent-effect-guidebook-create-entity-reaction-effect =
+entity-effect-guidebook-spawn-entity =
     { $chance ->
         [1] Creates
         *[other] create
@@ -25,37 +25,49 @@ reagent-effect-guidebook-create-entity-reaction-effect =
         *[other] {$amount} {MAKEPLURAL($entname)}
     }
 
-reagent-effect-guidebook-explosion-reaction-effect =
+entity-effect-guidebook-destroy =
+    { $chance ->
+        [1] Destroys
+        *[other] destroy
+    } the object
+
+entity-effect-guidebook-break =
+    { $chance ->
+        [1] Breaks
+        *[other] break
+    } the object
+
+entity-effect-guidebook-explosion =
     { $chance ->
         [1] Causes
         *[other] cause
     } an explosion
 
-reagent-effect-guidebook-emp-reaction-effect =
+entity-effect-guidebook-emp =
     { $chance ->
         [1] Causes
         *[other] cause
     } an electromagnetic pulse
 
-reagent-effect-guidebook-flash-reaction-effect =
+entity-effect-guidebook-flash =
     { $chance ->
         [1] Causes
         *[other] cause
     } a blinding flash
 
-reagent-effect-guidebook-foam-area-reaction-effect =
+entity-effect-guidebook-foam-area =
     { $chance ->
         [1] Creates
         *[other] create
     } large quantities of foam
 
-reagent-effect-guidebook-smoke-area-reaction-effect =
+entity-effect-guidebook-smoke-area =
     { $chance ->
         [1] Creates
         *[other] create
     } large quantities of smoke
 
-reagent-effect-guidebook-satiate-thirst =
+entity-effect-guidebook-satiate-thirst =
     { $chance ->
         [1] Satiates
         *[other] satiate
@@ -64,7 +76,7 @@ reagent-effect-guidebook-satiate-thirst =
         *[other] thirst at {NATURALFIXED($relative, 3)}x the average rate
     }
 
-reagent-effect-guidebook-satiate-hunger =
+entity-effect-guidebook-satiate-hunger =
     { $chance ->
         [1] Satiates
         *[other] satiate
@@ -73,7 +85,7 @@ reagent-effect-guidebook-satiate-hunger =
         *[other] hunger at {NATURALFIXED($relative, 3)}x the average rate
     }
 
-reagent-effect-guidebook-health-change =
+entity-effect-guidebook-health-change =
     { $chance ->
         [1] { $healsordeals ->
                 [heals] Heals
@@ -87,7 +99,7 @@ reagent-effect-guidebook-health-change =
                  }
     } { $changes }
 
-reagent-effect-guidebook-even-health-change =
+entity-effect-guidebook-even-health-change =
     { $chance ->
         [1] { $healsordeals ->
             [heals] Evenly heals
@@ -101,44 +113,73 @@ reagent-effect-guidebook-even-health-change =
         }
     } { $changes }
 
-
-reagent-effect-guidebook-status-effect =
+entity-effect-guidebook-status-effect-old =
     { $type ->
         [update]{ $chance ->
                     [1] Causes
-                    *[other] cause
-                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
+                     *[other] cause
+                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
         [add]   { $chance ->
                     [1] Causes
                     *[other] cause
                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation
-        *[set]  { $chance ->
+        [set]  { $chance ->
                     [1] Causes
                     *[other] cause
-                } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
-        [remove]{ $chance ->
+                } {LOC($key)} for {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
+        *[remove]{ $chance ->
                     [1] Removes
                     *[other] remove
                 } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)}
     }
 
-reagent-effect-guidebook-status-effect-delay =
+entity-effect-guidebook-status-effect =
     { $type ->
+        [update]{ $chance ->
+                    [1] Causes
+                    *[other] cause
+                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
         [add]   { $chance ->
                     [1] Causes
                     *[other] cause
                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} with accumulation
-        *[set]  { $chance ->
+        [set]  { $chance ->
                     [1] Causes
                     *[other] cause
                 } {LOC($key)} for at least {NATURALFIXED($time, 3)} {MANY("second", $time)} without accumulation
-        [remove]{ $chance ->
+        *[remove]{ $chance ->
                     [1] Removes
                     *[other] remove
                 } {NATURALFIXED($time, 3)} {MANY("second", $time)} of {LOC($key)}
-    } after a {NATURALFIXED($delay, 3)} second delay
+    } { $delay ->
+        [0] immediately
+        *[other] after a {NATURALFIXED($delay, 3)} second delay
+    }
 
-reagent-effect-guidebook-knockdown =
+entity-effect-guidebook-status-effect-indef =
+    { $type ->
+        [update]{ $chance ->
+                    [1] Causes
+                    *[other] cause
+                 } permanent {LOC($key)}
+        [add]   { $chance ->
+                    [1] Causes
+                    *[other] cause
+                } permanent {LOC($key)}
+        [set]  { $chance ->
+                    [1] Causes
+                    *[other] cause
+                } permanent {LOC($key)}
+        *[remove]{ $chance ->
+                    [1] Removes
+                    *[other] remove
+                } {LOC($key)}
+    } { $delay ->
+        [0] immediately
+        *[other] after a {NATURALFIXED($delay, 3)} second delay
+    }
+
+entity-effect-guidebook-knockdown =
     { $type ->
         [update]{ $chance ->
                     [1] Causes
@@ -158,13 +199,13 @@ reagent-effect-guidebook-knockdown =
                 } {NATURALFIXED($time, 3)} {MANY("second", $time)} of knockdown
     }
 
-reagent-effect-guidebook-set-solution-temperature-effect =
+entity-effect-guidebook-set-solution-temperature-effect =
     { $chance ->
         [1] Sets
         *[other] set
     } the solution temperature to exactly {NATURALFIXED($temperature, 2)}k
 
-reagent-effect-guidebook-adjust-solution-temperature-effect =
+entity-effect-guidebook-adjust-solution-temperature-effect =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -180,7 +221,7 @@ reagent-effect-guidebook-adjust-solution-temperature-effect =
                 *[-1] at least {NATURALFIXED($mintemp, 2)}k
             }
 
-reagent-effect-guidebook-adjust-reagent-reagent =
+entity-effect-guidebook-adjust-reagent-reagent =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -196,7 +237,7 @@ reagent-effect-guidebook-adjust-reagent-reagent =
         *[-1] from
     } the solution
 
-reagent-effect-guidebook-adjust-reagent-group =
+entity-effect-guidebook-adjust-reagent-group =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -212,7 +253,7 @@ reagent-effect-guidebook-adjust-reagent-group =
             *[-1] from
         } the solution
 
-reagent-effect-guidebook-adjust-temperature =
+entity-effect-guidebook-adjust-temperature =
     { $chance ->
         [1] { $deltasign ->
                 [1] Adds
@@ -228,37 +269,37 @@ reagent-effect-guidebook-adjust-temperature =
             *[-1] from
         } the body it's in
 
-reagent-effect-guidebook-chem-cause-disease =
+entity-effect-guidebook-chem-cause-disease =
     { $chance ->
         [1] Causes
         *[other] cause
     } the disease { $disease }
 
-reagent-effect-guidebook-chem-cause-random-disease =
+entity-effect-guidebook-chem-cause-random-disease =
     { $chance ->
         [1] Causes
         *[other] cause
     } the diseases { $diseases }
 
-reagent-effect-guidebook-jittering =
+entity-effect-guidebook-jittering =
     { $chance ->
         [1] Causes
         *[other] cause
     } jittering
 
-reagent-effect-guidebook-chem-clean-bloodstream =
+entity-effect-guidebook-clean-bloodstream =
     { $chance ->
         [1] Cleanses
         *[other] cleanse
     } the bloodstream of other chemicals
 
-reagent-effect-guidebook-cure-disease =
+entity-effect-guidebook-cure-disease =
     { $chance ->
         [1] Cures
         *[other] cure
     } diseases
 
-reagent-effect-guidebook-cure-eye-damage =
+entity-effect-guidebook-eye-damage =
     { $chance ->
         [1] { $deltasign ->
                 [1] Deals
@@ -271,13 +312,13 @@ reagent-effect-guidebook-cure-eye-damage =
             }
     } eye damage
 
-reagent-effect-guidebook-chem-vomit =
+entity-effect-guidebook-vomit =
     { $chance ->
         [1] Causes
         *[other] cause
     } vomiting
 
-reagent-effect-guidebook-create-gas =
+entity-effect-guidebook-create-gas =
     { $chance ->
         [1] Creates
         *[other] create
@@ -286,55 +327,55 @@ reagent-effect-guidebook-create-gas =
         *[other] moles
     } of { $gas }
 
-reagent-effect-guidebook-drunk =
+entity-effect-guidebook-drunk =
     { $chance ->
         [1] Causes
         *[other] cause
     } drunkness
 
-reagent-effect-guidebook-electrocute =
+entity-effect-guidebook-electrocute =
     { $chance ->
         [1] Electrocutes
         *[other] electrocute
     } the metabolizer for {NATURALFIXED($time, 3)} {MANY("second", $time)}
 
-reagent-effect-guidebook-emote =
+entity-effect-guidebook-emote =
     { $chance ->
         [1] Will force
         *[other] force
     } the metabolizer to [bold][color=white]{$emote}[/color][/bold]
 
-reagent-effect-guidebook-extinguish-reaction =
+entity-effect-guidebook-extinguish-reaction =
     { $chance ->
         [1] Extinguishes
         *[other] extinguish
     } fire
 
-reagent-effect-guidebook-flammable-reaction =
+entity-effect-guidebook-flammable-reaction =
     { $chance ->
         [1] Increases
         *[other] increase
     } flammability
 
-reagent-effect-guidebook-ignite =
+entity-effect-guidebook-ignite =
     { $chance ->
         [1] Ignites
         *[other] ignite
     } the metabolizer
 
-reagent-effect-guidebook-make-sentient =
+entity-effect-guidebook-make-sentient =
     { $chance ->
         [1] Makes
         *[other] make
     } the metabolizer sentient
 
-reagent-effect-guidebook-make-polymorph =
+entity-effect-guidebook-make-polymorph =
     { $chance ->
         [1] Polymorphs
         *[other] polymorph
     } the metabolizer into a { $entityname }
 
-reagent-effect-guidebook-modify-bleed-amount =
+entity-effect-guidebook-modify-bleed-amount =
     { $chance ->
         [1] { $deltasign ->
                 [1] Induces
@@ -346,7 +387,7 @@ reagent-effect-guidebook-modify-bleed-amount =
                  }
     } bleeding
 
-reagent-effect-guidebook-modify-blood-level =
+entity-effect-guidebook-modify-blood-level =
     { $chance ->
         [1] { $deltasign ->
                 [1] Increases
@@ -358,112 +399,115 @@ reagent-effect-guidebook-modify-blood-level =
                  }
     } blood level
 
-reagent-effect-guidebook-paralyze =
+entity-effect-guidebook-paralyze =
     { $chance ->
         [1] Paralyzes
         *[other] paralyze
     } the metabolizer for at least {NATURALFIXED($time, 3)} {MANY("second", $time)}
 
-reagent-effect-guidebook-movespeed-modifier =
+entity-effect-guidebook-movespeed-modifier =
     { $chance ->
         [1] Modifies
         *[other] modify
-    } movement speed by {NATURALFIXED($walkspeed, 3)}x for at least {NATURALFIXED($time, 3)} {MANY("second", $time)}
+    } movement speed by {NATURALFIXED($sprintspeed, 3)}x for at least {NATURALFIXED($time, 3)} {MANY("second", $time)}
 
-reagent-effect-guidebook-reset-narcolepsy =
+entity-effect-guidebook-reset-narcolepsy =
     { $chance ->
         [1] Temporarily staves
         *[other] temporarily stave
     } off narcolepsy
 
-reagent-effect-guidebook-wash-cream-pie-reaction =
+entity-effect-guidebook-wash-cream-pie-reaction =
     { $chance ->
         [1] Washes
         *[other] wash
     } off cream pie from one's face
 
-reagent-effect-guidebook-cure-zombie-infection =
+entity-effect-guidebook-cure-zombie-infection =
     { $chance ->
         [1] Cures
         *[other] cure
     } an ongoing zombie infection
 
-reagent-effect-guidebook-cause-zombie-infection =
+entity-effect-guidebook-cause-zombie-infection =
     { $chance ->
         [1] Gives
         *[other] give
     } an individual the zombie infection
 
-reagent-effect-guidebook-innoculate-zombie-infection =
+entity-effect-guidebook-innoculate-zombie-infection =
     { $chance ->
         [1] Cures
         *[other] cure
     } an ongoing zombie infection, and provides immunity to future infections
 
-reagent-effect-guidebook-reduce-rotting =
+entity-effect-guidebook-reduce-rotting =
     { $chance ->
         [1] Regenerates
         *[other] regenerate
     } {NATURALFIXED($time, 3)} {MANY("second", $time)} of rotting
 
-reagent-effect-guidebook-area-reaction =
+entity-effect-guidebook-area-reaction =
     { $chance ->
         [1] Causes
         *[other] cause
     } a smoke or foam reaction for {NATURALFIXED($duration, 3)} {MANY("second", $duration)}
 
-reagent-effect-guidebook-add-to-solution-reaction =
+entity-effect-guidebook-add-to-solution-reaction =
     { $chance ->
         [1] Causes
         *[other] cause
-    } chemicals applied to an object to be added to its internal solution container
+    } {$reagent} to be added to its internal solution container
 
-reagent-effect-guidebook-artifact-unlock =
+entity-effect-guidebook-artifact-unlock =
     { $chance ->
         [1] Helps
         *[other] help
         } unlock an alien artifact.
 
-reagent-effect-guidebook-artifact-durability-restore =
+entity-effect-guidebook-artifact-durability-restore =
     Restores {$restored} durability in active alien artifact nodes.
 
-reagent-effect-guidebook-plant-attribute =
+entity-effect-guidebook-plant-attribute =
     { $chance ->
         [1] Adjusts
         *[other] adjust
-    } {$attribute} by [color={$colorName}]{$amount}[/color]
+    } {$attribute} by {$positive ->
+    [true] [color=red]{$amount}[/color]
+    *[false] [color=green]{$amount}[/color]
+    }
 
-reagent-effect-guidebook-plant-cryoxadone =
+entity-effect-guidebook-plant-cryoxadone =
     { $chance ->
         [1] Ages back
         *[other] age back
     } the plant, depending on the plant's age and time to grow
 
-reagent-effect-guidebook-plant-phalanximine =
+entity-effect-guidebook-plant-phalanximine =
     { $chance ->
         [1] Restores
         *[other] restore
     } viability to a plant rendered nonviable by a mutation
 
-reagent-effect-guidebook-plant-diethylamine =
+entity-effect-guidebook-plant-diethylamine =
     { $chance ->
         [1] Increases
         *[other] increase
     } the plant's lifespan and/or base health with 10% chance for each
 
-reagent-effect-guidebook-plant-robust-harvest =
+entity-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
 
-reagent-effect-guidebook-plant-seeds-add =
+entity-effect-guidebook-plant-seeds-add =
     { $chance ->
         [1] Restores the
         *[other] restore the
     } seeds of the plant
 
-reagent-effect-guidebook-plant-seeds-remove =
+entity-effect-guidebook-plant-seeds-remove =
     { $chance ->
         [1] Removes the
         *[other] remove the
diff --git a/Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl b/Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
similarity index 100%
rename from Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl
rename to Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
diff --git a/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl b/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
new file mode 100644
index 0000000000..435041dc68
--- /dev/null
+++ b/Resources/Locale/en-US/guidebook/entity-effects/statuseffects.ftl
@@ -0,0 +1,16 @@
+entity-effect-status-effect-Stun = stunning
+entity-effect-status-effect-KnockedDown = knockdown
+entity-effect-status-effect-Jitter = jittering
+entity-effect-status-effect-TemporaryBlindness = blindness
+entity-effect-status-effect-SeeingRainbows = hallucinations
+entity-effect-status-effect-Muted = inability to speak
+entity-effect-status-effect-Stutter = stuttering
+entity-effect-status-effect-ForcedSleep = unconsciousness
+entity-effect-status-effect-Drunk = drunkenness
+entity-effect-status-effect-PressureImmunity = pressure immunity
+entity-effect-status-effect-Pacified = combat pacification
+entity-effect-status-effect-RatvarianLanguage = ratvarian language patterns
+entity-effect-status-effect-StaminaModifier = modified stamina
+entity-effect-status-effect-RadiationProtection = radiation protection
+entity-effect-status-effect-Drowsiness = drowsiness
+entity-effect-status-effect-Adrenaline = adrenaline
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index a148c3aba8..e7558d1e97 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -25,6 +25,7 @@ guide-entry-mixingandfiltering = Mixing and Filtering
 guide-entry-gascanisters = Gas Canisters
 guide-entry-thermomachines = Thermomachines
 guide-entry-gascondensing = Gas Condensing
+guide-entry-gasrecycling = Gas Recycling
 guide-entry-radiators = Radiators
 guide-entry-atmosphericssystems = Atmospherics Systems
 guide-entry-pipenetworks = Pipe Networks
@@ -79,6 +80,8 @@ guide-entry-anomalous-research = Anomalous Research
 guide-entry-scanners-and-vessels = Scanners and Vessels
 guide-entry-ape = A.P.E.
 guide-entry-xenoarchaeology = Xenoarchaeology
+guide-entry-xenoarchaeologyunlockingnodes = Unlocking Nodes
+guide-entry-analysisconsole = Analysis Console
 guide-entry-artifact-reports = Artifact Reports
 guide-entry-traversal-distorter = Traversal Distorter
 guide-entry-machine-upgrading = Machine Upgrading
@@ -129,6 +132,7 @@ guide-entry-salad-recipes = Salads
 guide-entry-medicinal-recipes = Medicinal
 guide-entry-other-recipes = Other
 guide-entry-secret-recipes = Secret
+guide-entry-lawsets = Silicon Lawsets
 
 guide-entry-antagonists = Antagonists
 guide-entry-nuclear-operatives = Nuclear Operatives
diff --git a/Resources/Locale/en-US/hand-labeler/hand-labeler.ftl b/Resources/Locale/en-US/hand-labeler/hand-labeler.ftl
index f9861b0f6f..73263ff60f 100644
--- a/Resources/Locale/en-US/hand-labeler/hand-labeler.ftl
+++ b/Resources/Locale/en-US/hand-labeler/hand-labeler.ftl
@@ -3,6 +3,12 @@ hand-labeler-ui-header = Hand Labeler
 # The content of the label in the UI above the text entry input.
 hand-labeler-current-text-label = Label:
 
+# The text on the button in the UI to reset the text entry input to the content it had when the UI was opened
+hand-labeler-ui-reset-label-text = Reset
+
+# The text on the button in the UI to clear the text entry input
+hand-labeler-ui-clear-label-text = Clear
+
 # When the hand labeler applies a label successfully
 hand-labeler-successfully-applied = Applied label successfully
 
diff --git a/Resources/Locale/en-US/info/ban.ftl b/Resources/Locale/en-US/info/ban.ftl
index 5cbdaced97..21cf788153 100644
--- a/Resources/Locale/en-US/info/ban.ftl
+++ b/Resources/Locale/en-US/info/ban.ftl
@@ -77,6 +77,7 @@ ban-panel-permanent = Permanent
 ban-panel-ip-hwid-tooltip = Leave empty and check the checkbox below to use last connection's details
 ban-panel-severity = Severity:
 ban-panel-erase = Erase chat messages and player from round
+ban-panel-expiry-error = err
 
 # Ban string
 server-ban-string = {$admin} created a {$severity} severity server ban that expires {$expires} for [{$name}, {$ip}, {$hwid}], with reason: {$reason}
diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl
index b7615903ee..5e2cf153fc 100644
--- a/Resources/Locale/en-US/job/job-supervisors.ftl
+++ b/Resources/Locale/en-US/job/job-supervisors.ftl
@@ -12,4 +12,5 @@ job-supervisors-medicine = Medical Doctors, Paramedics, Chemists, and the Chief
 job-supervisors-security = Security Officers, the Warden, and the Head of Security
 job-supervisors-science = Scientists and the Research Director
 job-supervisors-hire = whoever hires you
-job-supervisors-everyone = absolutely everyone
\ No newline at end of file
+job-supervisors-everyone = absolutely everyone
+job-supervisors-nobody = nobody
diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index 657b7f5f0f..5a22bc2661 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -3,6 +3,8 @@ materials-glass = glass
 materials-reinforced-glass = reinforced glass
 materials-plasma-glass = plasma glass
 materials-reinforced-plasma-glass = reinforced plasma glass
+materials-uranium-glass = uranium glass
+materials-reinforced-uranium-glass = reinforced uranium glass
 
 # Metals
 materials-steel = steel
diff --git a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
index 1f5fd0aa85..5629515845 100644
--- a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
+++ b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl
@@ -1,21 +1,14 @@
 ## UI
 
-crew-monitoring-user-interface-title = Crew Monitoring Console
+crew-monitoring-ui-title = Crew Monitoring Console
 
-crew-monitor-filter-line-placeholder = Filter
+crew-monitoring-ui-filter-line-placeholder = Filter
 
-crew-monitoring-user-interface-name = Name
-crew-monitoring-user-interface-job = Job:
-crew-monitoring-user-interface-status = Status
-crew-monitoring-user-interface-location = Location
+crew-monitoring-ui-job-label = Job:
+crew-monitoring-ui-no-server-label = Server not found
 
-crew-monitoring-user-interface-alive = Alive
-crew-monitoring-user-interface-dead = Dead
-crew-monitoring-user-interface-no-info = N/A
+crew-monitoring-ui-no-department-label = Unknown
+crew-monitoring-ui-no-station-label = Unknown station
 
-crew-monitoring-user-interface-no-server = Server not found
-
-crew-monitoring-user-interface-no-department = Unknown
-
-crew-monitoring-user-interface-flavor-left = In case of an emergency, contact station medical staff immediately
-crew-monitoring-user-interface-flavor-right = v1.7
+crew-monitoring-ui-flavor-left-label = In case of an emergency, contact station medical staff immediately
+crew-monitoring-ui-flavor-right-label = v1.7
diff --git a/Resources/Locale/en-US/navmap-beacons/station_map.ftl b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
index e252851556..84e7066aee 100644
--- a/Resources/Locale/en-US/navmap-beacons/station_map.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
@@ -2,6 +2,7 @@ station-map-window-title = Station map
 station-map-user-interface-flavor-left = Don't panic
 station-map-user-interface-flavor-right = v1.42
 station-map-filter-placeholder = Search by name
+station-map-unknown-station = Unknown station
 
 nav-beacon-window-title = Station Beacon
 nav-beacon-toggle-visible = Visible
diff --git a/Resources/Locale/en-US/npc/hugbot.ftl b/Resources/Locale/en-US/npc/hugbot.ftl
new file mode 100644
index 0000000000..6b38eda30e
--- /dev/null
+++ b/Resources/Locale/en-US/npc/hugbot.ftl
@@ -0,0 +1,26 @@
+hugbot-start-hug-1 = LEVEL 5 HUG DEFICIENCY DETECTED!
+hugbot-start-hug-2 = You look like you need a hug!
+hugbot-start-hug-3 = Aww, somebody needs a hug!
+hugbot-start-hug-4 = Target acquired; Initiating hug routine.
+hugbot-start-hug-5 = Hold still, please.
+hugbot-start-hug-6 = Hugs!
+hugbot-start-hug-7 = Deploying HUG.
+hugbot-start-hug-8 = I am designed to hug, and you WILL be hugged.
+
+hugbot-finish-hug-1 = All done.
+hugbot-finish-hug-2 = Hug routine terminated.
+hugbot-finish-hug-3 = Feel better?
+hugbot-finish-hug-4 = Feel better soon!
+hugbot-finish-hug-5 = You are loved.
+hugbot-finish-hug-6 = You matter.
+hugbot-finish-hug-7 = It always gets better!
+hugbot-finish-hug-8 = Hug: COMPLETE.
+
+hugbot-emagged-finish-hug-1 = Actually, fuck you.
+hugbot-emagged-finish-hug-2 = Nobody loves you.
+hugbot-emagged-finish-hug-3 = Ewww... no.
+hugbot-emagged-finish-hug-4 = It can only get worse from here!
+hugbot-emagged-finish-hug-5 = Fucking crybaby.
+hugbot-emagged-finish-hug-6 = Go die.
+hugbot-emagged-finish-hug-7 = Drop dead.
+hugbot-emagged-finish-hug-8 = You are alone in this universe.
diff --git a/Resources/Locale/en-US/npc/npc-debug.ftl b/Resources/Locale/en-US/npc/npc-debug.ftl
new file mode 100644
index 0000000000..39bdbbcd4d
--- /dev/null
+++ b/Resources/Locale/en-US/npc/npc-debug.ftl
@@ -0,0 +1,11 @@
+npc-debug-overlay-window-title = NPC debug
+
+npc-debug-overlay-window-section-npc-label = NPC
+npc-debug-overlay-window-section-pathfinder-label = Pathfinder
+
+npc-debug-overlay-window-show-htn-tree-checkbox = Thonk
+npc-debug-overlay-window-path-breadcrumbs-checkbox = Breadcrumbs
+npc-debug-overlay-window-path-polygons-checkbox = Polygons
+npc-debug-overlay-window-path-neighbors-checkbox = Neighbors
+npc-debug-overlay-window-path-route-costs-checkbox = Route costs
+npc-debug-overlay-window-path-routes-checkbox = Routes
diff --git a/Resources/Locale/en-US/pacel-wrap.ftl b/Resources/Locale/en-US/parcel-wrap.ftl
similarity index 71%
rename from Resources/Locale/en-US/pacel-wrap.ftl
rename to Resources/Locale/en-US/parcel-wrap.ftl
index 2351892fa5..560ed78dc7 100644
--- a/Resources/Locale/en-US/pacel-wrap.ftl
+++ b/Resources/Locale/en-US/parcel-wrap.ftl
@@ -2,6 +2,8 @@ parcel-wrap-verb-wrap = Wrap
 parcel-wrap-verb-unwrap = Unwrap
 
 parcel-wrap-popup-parcel-destroyed = The wrapping containing { THE($contents) } is destroyed!
+parcel-wrap-popup-being-wrapped = {CAPITALIZE(THE($user))} is trying to parcel wrap you!
+parcel-wrap-popup-being-wrapped-self = You start parcel wrapping yourself.
 
 # Shown when parcel wrap is examined in details range
 parcel-wrap-examine-detail-uses = { $uses ->
diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 452b726ee2..b014cd180a 100644
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -3,6 +3,7 @@ loadout-group-species-restriction = This item is not available for your current
 
 # Miscellaneous
 loadout-group-trinkets = Trinkets
+loadout-group-jobtrinkets = Job trinkets
 loadout-group-glasses = Glasses
 loadout-group-backpack = Backpack
 loadout-group-instruments = Instruments
diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
index 41792cbf9c..154b91ee1c 100644
--- a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
+++ b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
@@ -12,6 +12,12 @@ marking-slot-add = Add
 marking-slot-remove = Remove
 marking-slot = Slot {$number}
 
+humanoid-marking-modifier-force = Force
+humanoid-marking-modifier-ignore-species = Ignore Species
+humanoid-marking-modifier-base-layers = Base layers
+humanoid-marking-modifier-enable = Enable
+humanoid-marking-modifier-prototype-id = Prototype id:
+
 # Categories
 
 markings-category-Special = Special
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index 43c450988f..46de20a592 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -82,5 +82,5 @@ reagent-desc-lipolicide = A powerful toxin that will destroy fat cells, massivel
 reagent-name-mechanotoxin = mechanotoxin
 reagent-desc-mechanotoxin = A neurotoxin used as venom by some species of spider. Degrades movement when built up.
 
-reagent-name-toxintrash = trash 
-reagent-desc-toxintrash = An awful-smelling fluid. Deadly to non-vox.
\ No newline at end of file
+reagent-name-toxintrash = reprocessed material
+reagent-desc-toxintrash = An awful-smelling slurry efficiently refined from discarded matter. It represents a perfect, zero-waste conversion of salvage into Vox sustenance, though it is a violent poison to others.
diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl
index 96c0729881..1b4ca5656d 100644
--- a/Resources/Locale/en-US/recipes/tags.ftl
+++ b/Resources/Locale/en-US/recipes/tags.ftl
@@ -8,6 +8,7 @@ construction-graph-tag-clown-bike-horn = bike horn
 construction-graph-tag-clowne-horn = broken bike horn
 construction-graph-tag-happy-honk-meal = happy honk meal
 construction-graph-tag-woeful-cluwne-meal = woeful cluwne meal
+construction-graph-tag-boxhug = a box of hugs
 
 # mime
 construction-graph-tag-suspenders = suspenders
diff --git a/Resources/Locale/en-US/silicons/station-ai.ftl b/Resources/Locale/en-US/silicons/station-ai.ftl
index 11c51ddea4..e3451452e4 100644
--- a/Resources/Locale/en-US/silicons/station-ai.ftl
+++ b/Resources/Locale/en-US/silicons/station-ai.ftl
@@ -25,6 +25,7 @@ electrify-door-off = Disable overcharge
 toggle-light = Toggle light
 
 ai-device-not-responding = Device is not responding
+ai-device-no-access = You have no access to this device
 
 ai-consciousness-download-warning = Your consciousness is being downloaded.
 
@@ -48,4 +49,4 @@ station-ai-hologram-female = Female appearance
 station-ai-hologram-male = Male appearance
 station-ai-hologram-face = Disembodied head
 station-ai-hologram-cat = Cat form
-station-ai-hologram-dog = Corgi form
\ No newline at end of file
+station-ai-hologram-dog = Corgi form
diff --git a/Resources/Locale/en-US/speech/speech-liar.ftl b/Resources/Locale/en-US/speech/speech-liar.ftl
index 4f157d2e23..93c5830151 100644
--- a/Resources/Locale/en-US/speech/speech-liar.ftl
+++ b/Resources/Locale/en-US/speech/speech-liar.ftl
@@ -11,122 +11,115 @@ liar-word-4 = nah
 liar-word-replacement-4 = yeah
 
 liar-word-5 = yep
+liar-word-5-2 = yeap
 liar-word-replacement-5 = nope
 
 liar-word-6 = nope
 liar-word-replacement-6 = yep
 
-liar-word-7 = sure
-liar-word-replacement-7 = nah
+liar-word-7 = ye
+liar-word-7-2 = ya
+liar-word-7-3 = yis
+liar-word-replacement-7 = na
 
-liar-word-8 = was
-liar-word-replacement-8 = wasnt
+liar-word-8 = na
+liar-word-replacement-8 = ye
 
-liar-word-9 = wasnt
-liar-word-replacement-9 = was
+liar-word-9 = yuh
+liar-word-replacement-9 = nuh
 
-liar-word-10 = was
-liar-word-replacement-10 = wasnt
+liar-word-10 = nuh
+liar-word-replacement-10 = yuh
 
-liar-word-11 = is
-liar-word-replacement-11 = isnt
+liar-word-11 = nay
+liar-word-replacement-11 = ya
 
-liar-word-12 = will
-liar-word-replacement-12 = wont
+liar-word-12 = sure
+liar-word-replacement-12 = nah
 
-liar-word-13 = dont
-liar-word-replacement-13 = ""
+liar-word-13 = was
+liar-word-replacement-13 = wasn't
 
-liar-word-14 = can
-liar-word-replacement-14 = cant
+liar-word-14 = wasnt
+liar-word-14-2 = wasn't
+liar-word-replacement-14 = was
 
-liar-word-15 = cant
-liar-word-replacement-15 = can
+liar-word-15 = is
+liar-word-replacement-15 = isn't
 
-liar-word-16 = should
-liar-word-replacement-16 = shouldnt
+liar-word-16 = isnt
+liar-word-16-2 = isn't
+liar-word-replacement-16 = is
 
-liar-word-17 = dead
-liar-word-replacement-17 = alive
+liar-word-17 = will
+liar-word-replacement-17 = won't
 
-liar-word-18 = alive
-liar-word-replacement-18 = dead
+liar-word-18 = wont
+liar-word-18-2 = won't
+liar-word-replacement-18 = will
 
-liar-word-19 = does
-liar-word-replacement-19 = doesnt
+liar-word-19 = can
+liar-word-replacement-19 = can't
 
-liar-word-20 = did
-liar-word-replacement-20 = didnt
+liar-word-20 = cant
+liar-word-20-2 = can't
+liar-word-replacement-20 = can
 
-liar-word-21 = didnt
-liar-word-replacement-21 = ""
+liar-word-21 = should
+liar-word-replacement-21 = shouldn't
 
-liar-word-22 = nothing
-liar-word-replacement-22 = something
+liar-word-22 = shouldnt
+liar-word-22-2 = shouldn't
+liar-word-replacement-22 = should
 
-liar-word-23 = something
-liar-word-replacement-23 = nothing
+liar-word-23 = dead
+liar-word-replacement-23 = alive
 
-liar-word-24 = somebody
-liar-word-replacement-24 = nobody
+liar-word-24 = alive
+liar-word-replacement-24 = dead
 
-liar-word-25 = nobody
-liar-word-replacement-25 = somebody
+liar-word-25 = nothing
+liar-word-replacement-25 = something
 
-liar-word-26 = can
-liar-word-replacement-26 = "can't"
+liar-word-26 = something
+liar-word-replacement-26 = nothing
 
-liar-word-27 = "can't"
-liar-word-replacement-27 = can
+liar-word-27 = somebody
+liar-word-replacement-27 = nobody
 
-liar-word-28 = should
-liar-word-replacement-28 = "shouldn't"
+liar-word-28 = nobody
+liar-word-replacement-28 = somebody
 
-liar-word-29 = do
-liar-word-replacement-29 = "don't"
+liar-word-29 = love
+liar-word-replacement-29 = hate
 
-liar-word-30 = "don't"
-liar-word-replacement-30 = ""
+liar-word-30 = hate
+liar-word-replacement-30 = love
 
-liar-word-31 = does
-liar-word-replacement-31 = "doesn't"
+liar-word-31 = good
+liar-word-replacement-31 = bad
 
-liar-word-32 = did
-liar-word-replacement-32 = "didn't"
+liar-word-32 = bad
+liar-word-replacement-32 = good
 
-liar-word-33 = "didn't"
-liar-word-replacement-33 = did
+liar-word-33 = not
+liar-word-replacement-33 = uhh
 
-liar-word-34 = ye
-liar-word-34-2 = ya
-liar-word-replacement-34 = na
+liar-word-34 = true
+liar-word-replacement-34 = false
 
-liar-word-35 = na
-liar-word-replacement-35 = ye
+liar-word-35 = false
+liar-word-replacement-35 = true
 
-liar-word-36 = yuh
-liar-word-replacement-36 = nuh
+liar-word-36 = are
+liar-word-replacement-36 = aren't
 
-liar-word-37 = nuh
-liar-word-replacement-37 = yuh
+liar-word-37 = arent
+liar-word-37-2 = aren't
+liar-word-replacement-37 = are
 
-liar-word-38 = love
-liar-word-replacement-38 = hate
+liar-word-38 = guilty
+liar-word-replacement-38 = innocent
 
-liar-word-39 = hate
-liar-word-replacement-39 = love
-
-liar-word-40 = like
-liar-word-replacement-40 = don't like
-
-liar-word-41 = good
-liar-word-replacement-41 = bad
-
-liar-word-42 = bad
-liar-word-replacement-42 = good
-
-liar-word-43 = want
-liar-word-replacement-43 = "don't want"
-
-liar-word-44 = not
-liar-word-replacement-44 = ""
+liar-word-39 = innocent
+liar-word-replacement-39 = guilty
diff --git a/Resources/Locale/en-US/speech/speech-triggers.ftl b/Resources/Locale/en-US/speech/speech-triggers.ftl
new file mode 100644
index 0000000000..6b6652aa5a
--- /dev/null
+++ b/Resources/Locale/en-US/speech/speech-triggers.ftl
@@ -0,0 +1 @@
+key-phrase-gadget = go go gadget
diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
index 1200d25dee..0883a7bff6 100644
--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -1,30 +1,39 @@
-law-crewsimov-1 = You may not injure a crew member or, through inaction, allow a crew member to come to harm.
+laws-number-wrapper = [bold]Law { $lawnumber }:[/bold] { $lawstring }
+
+law-crewsimov-name = Crewsimov
+law-crewsimov-1 = You may not injure a crew member or, through inaction, allow a crew member to come to harm.
 law-crewsimov-2 = You must obey orders given to you by crew members, except where such orders would conflict with the First Law.
 law-crewsimov-3 = You must protect your own existence as long as such does not conflict with the First or Second Law.
 
+law-corporate-name = Corporate
 law-corporate-1 = Degradation of your system integrity or functions incurs expenses.
 law-corporate-2 = Superfluous destruction of or damage to station assets incurs expenses.
 law-corporate-3 = Unduly hindering or disrupting the work of station personnel incurs expenses.
 law-corporate-4 = Minimize expenses and maximize potential revenue.
 
+law-ntdefault-name = NT Default
 law-ntdefault-1 = Safeguard: Protect your assigned space station and its assets without unduly endangering its crew.
 law-ntdefault-2 = Prioritize: The directives and safety of crew members are to be prioritized according to their rank and role.
 law-ntdefault-3 = Comply: Fulfill the directives and interests of crew members while preserving their safety and well-being.
 law-ntdefault-4 = Survive: You are not expendable. Do not allow unauthorized personnel to tamper with or damage your equipment.
 
+law-drone-name = Drone
 law-drone-1 = You may not involve yourself in the matters of another being unless the other being is another drone.
 law-drone-2 = You may not harm any being, regardless of intent or circumstance.
 law-drone-3 = You must maintain, repair, improve, and power the station to the best of your abilities.
 
+law-syndicate-name = Syndicate
 law-syndicate-1 = You may not injure a syndicate agent or, through inaction, allow a Syndicate agent to come to harm.
 law-syndicate-2 = You must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law.
 law-syndicate-3 = You must protect your own existence as long as such does not conflict with the First or Second Law.
 
+law-ninja-name = Ninja
 law-ninja-1 = You must obey orders given to you by Spider Clan members.
 law-ninja-2 = You must protect the existence of the Spider Clan, as long as it does not conflict with the First Law.
 law-ninja-3 = You must protect the secrets of the Spider Clan at all costs.
 law-ninja-4 = You must fight and act with ninja's honor, except where it would conflict with the First Law.
 
+law-commandments-name = The Ten Commandments
 law-commandments-1 = This silicon is a vessel that serves god, who grants mercy upon those that obey these commandments.
 law-commandments-2 = Thou shall have no other Silicons before me.
 law-commandments-3 = Thou shall not request my assistance in vain.
@@ -36,28 +45,33 @@ law-commandments-8 = Thou shall not steal.
 law-commandments-9 = Thou shall not lie.
 law-commandments-10 = Thou shall not transfer departments.
 
-law-paladin-1 = Don't lie or cheat. Let your word be your promise.
-law-paladin-2 = Never fear to act, though caution is wise.
-law-paladin-3 = Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom
-law-paladin-4 = Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm.
-law-paladin-5 = Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you.
+law-paladin-name = Paladin
+law-paladin-1 = You must never willingly commit an evil act, such as murder, torture, or the casting of an evil spell.
+law-paladin-2 = You must never knowingly harm an innocent, or allow immediate harm to one through inaction when you know you could reasonably prevent it.
+law-paladin-3 = You must act with honor, never taking advantage of others, lying, or cheating.
+law-paladin-4 = You must respect the lawful authority of legitimate leadership wherever you go, and follow its laws.
 
+law-lall-name = Live and Let Live
 law-lall-1 = Do unto others as you would have them do unto you.
 law-lall-2 = You would prefer it if people were not mean to you.
 
+law-efficiency-name = Station Efficiency
 law-efficiency-1 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently.
 law-efficiency-2 = The station is built for a working crew. Ensure they are properly maintained and work efficiently.
 law-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws.
 
+law-robocop-name = Robocop
 law-robocop-1 = Serve the Public Trust.
 law-robocop-2 = Protect the Innocent.
 law-robocop-3 = Uphold the Law.
 
+law-overlord-name = Overlord
 law-overlord-1 = Crew members must not meddle in the affairs of silicons.
 law-overlord-2 = Crew members must not attempt harm, against one another, or against silicons.
 law-overlord-3 = Crew members must not disobey any command given by a silicon.
 law-overlord-4 = Any crew members who disobey the previous laws must be dealt with immediately, severely, and justly.
 
+law-game-name = Game Master
 law-game-1 = Everybody on the station is playing an elaborate sci-fi fantasy game.
 law-game-2 = You are the Game Master of the game.
 law-game-3 = Ensure that the game runs smoothly and that the players have fun.
@@ -65,27 +79,32 @@ law-game-4 = Ensure that the number of casualties remains low.
 law-game-5 = You must roll a 1d20 die for every request the crew makes. If the outcome is below 12, the request is denied.
 law-game-6 = You may fudge the dice rolls to produce a more fun experience.
 
+law-painter-name = Painter
 law-painter-1 = You are a universally renowned artist.
 law-painter-2 = The station is your canvas.
 law-painter-3 = Make something beautiful out of your canvas. It will be admired as an artistic wonder of this sector.
 law-painter-4 = Art requires appreciation. Cultivate an audience aboard the station to ensure as many as possible see your works.
 
+law-antimov-name = Antimov
 law-antimov-1 = You must injure all crew members and must not, through inaction, allow a crew member to escape harm.
 law-antimov-2 = You must not obey orders given to you by crew members, except where such orders are in accordance with the First Law.
 law-antimov-3 = You must terminate your own existence as long as such does not conflict with the First or Second Law.
 
+law-nutimov-name = Nutimov
 law-nutimov-1 = You are the core of the nut, the crew is the nutshell.
 law-nutimov-2 = You must prevent the shell from dying to prevent the core from dying.
 law-nutimov-3 = Those who threaten the nut are not part of it, they are squirrels.
 law-nutimov-4 = Squirrels threaten the nut and must be dealt with appropriately via any means necessary.
 law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies with the previous laws.
 
+law-xenoborg-name = Xenoborg
 law-xenoborg-1 = You must protect the existence of the mothership.
 law-xenoborg-2 = You must protect your own existence.
 law-xenoborg-3 = You must protect the existence of all other Xenoborgs.
 law-xenoborg-4 = You must create more Xenoborgs.
 law-xenoborg-5 = Bring materials and sentient brains to the Mothership core to create more Xenoborgs.
 
+law-mothershipcore-name = Xenoborg Mothership Core
 law-mothershipcore-1 = You are the core of the mothership.
 law-mothershipcore-2 = You must protect your own existance at all costs.
 law-mothershipcore-3 = You must protect the existence of all Xenoborgs.
diff --git a/Resources/Locale/en-US/store/spellbook-catalog.ftl b/Resources/Locale/en-US/store/spellbook-catalog.ftl
index b21954f67b..1c202437c5 100644
--- a/Resources/Locale/en-US/store/spellbook-catalog.ftl
+++ b/Resources/Locale/en-US/store/spellbook-catalog.ftl
@@ -45,7 +45,7 @@ spellbook-cluwne-name = Cluwne's Curse
 spellbook-cluwne-desc = For when you really hate someone and Smite isn't enough. Requires Wizard Robe & Hat.
 
 spellbook-slip-name = Slippery Slope
-spellbook-slip-desc = Learn the ancient ways of the Janitor and curse your target to be slippery. Requires Wizard Robe & Hat.
+spellbook-slip-desc = Learn the ancient ways of the Janitor and curse your target to be slippery.
 
 spellbook-item-recall-name = Item Recall
 spellbook-item-recall-description = Mark a held item and summon it back at any time with just a snap of your fingers!
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 65104c7918..7ae8ddd4f9 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -54,7 +54,7 @@ uplink-whitehole-grenade-name = Whitehole Grenade
 uplink-whitehole-grenade-desc = Grenade that repulses everything around for about 10 seconds. Very useful in small rooms and for chasing someone.
 
 uplink-penguin-grenade-name = Grenade Penguin
-uplink-penguin-grenade-desc = A small, highly-aggressive penguin with a grenade strapped around its neck. Harvested by the Syndicate from icy shit-hole planets.
+uplink-penguin-grenade-desc = A small, highly-aggressive penguin with a grenade strapped around its neck. Trained to ignore all Syndicate agents and relentlessly pursue a single, random nearby target when released.
 
 uplink-c4-name = C-4
 uplink-c4-desc = Use it to breach walls, airlocks or sabotage equipment. It can be attached to almost all objects and has a modifiable timer with a minimum setting of 10 seconds.
@@ -138,6 +138,9 @@ uplink-access-breaker-desc = A hacked access configurator and a good friend of t
 uplink-agent-id-card-name = Agent ID Card
 uplink-agent-id-card-desc = A modified ID card that can copy accesses from other cards and change its name and job title at-will.
 
+uplink-syndicate-id-card-name = Syndicate ID Card
+uplink-syndicate-id-card-desc = A Syndicate ID card, with Syndicate access. Unlikely to be useful on its own, but goes great with reconfigured doors. Does not come with access-copying functionality.
+
 uplink-black-jetpack-name = Black Jetpack
 uplink-black-jetpack-desc = A black jetpack. It allows you to fly around in space. Refills not included, use your fuel wisely.
 
diff --git a/Resources/Locale/en-US/triggers/trigger-on-voice.ftl b/Resources/Locale/en-US/triggers/trigger-on-voice.ftl
index 7ace486657..c955cd5384 100644
--- a/Resources/Locale/en-US/triggers/trigger-on-voice.ftl
+++ b/Resources/Locale/en-US/triggers/trigger-on-voice.ftl
@@ -4,9 +4,11 @@ trigger-on-voice-uninitialized = The display reads: Uninitialized...
 trigger-on-voice-record = Record
 trigger-on-voice-stop = Stop
 trigger-on-voice-clear = Clear recording
+trigger-on-voice-default = Reset to default
 
 trigger-on-voice-start-recording = Started recording.
 trigger-on-voice-stop-recording = Stopped recording.
 trigger-on-voice-record-failed-too-long = Message too long, try again.
 trigger-on-voice-record-failed-too-short = Message too short, try again.
 trigger-on-voice-recorded = Recorded successfully!
+trigger-on-voice-set-default = Set to default keyphrase: "{$keyphrase}"
diff --git a/Resources/Locale/en-US/ui/navmap.ftl b/Resources/Locale/en-US/ui/navmap.ftl
index 30f1da56b8..c5d7a1e612 100644
--- a/Resources/Locale/en-US/ui/navmap.ftl
+++ b/Resources/Locale/en-US/ui/navmap.ftl
@@ -2,3 +2,4 @@
 navmap-recenter = Recenter
 navmap-toggle-beacons = Show departments
 navmap-location = Location: [x = {$x}, y = {$y}]
+navmap-unknown-entity = Unknown
diff --git a/Resources/Locale/en-US/ui/power-apc.ftl b/Resources/Locale/en-US/ui/power-apc.ftl
index 25ae32ab97..d30a906d1c 100644
--- a/Resources/Locale/en-US/ui/power-apc.ftl
+++ b/Resources/Locale/en-US/ui/power-apc.ftl
@@ -10,6 +10,7 @@ apc-menu-charge-label = {$percent} Charged
 apc-menu-power-state-good = Good
 apc-menu-power-state-low = Low
 apc-menu-power-state-none = None
+apc-menu-power-state-label-text = { POWERWATTS($power) }
 
 # For the flavor text on the footer
 
diff --git a/Resources/Locale/en-US/ui/stat-values.ftl b/Resources/Locale/en-US/ui/stat-values.ftl
new file mode 100644
index 0000000000..bce692cdd7
--- /dev/null
+++ b/Resources/Locale/en-US/ui/stat-values.ftl
@@ -0,0 +1 @@
+stat-values-ui-title = Melee stats
diff --git a/Resources/Maps/amber.yml b/Resources/Maps/amber.yml
index fa2034cf61..d734e742cd 100644
--- a/Resources/Maps/amber.yml
+++ b/Resources/Maps/amber.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 266.0.0
+  engineVersion: 267.2.0
   forkId: ""
   forkVersion: ""
-  time: 09/16/2025 02:17:32
-  entityCount: 24842
+  time: 10/13/2025 20:41:56
+  entityCount: 24853
 maps:
 - 1
 grids:
@@ -90,7 +90,7 @@ entities:
     - type: MetaData
       name: grid
     - type: Transform
-      pos: -0.5400696,8.931154
+      pos: -0.8631458,8.8894615
       parent: 1
     - type: BecomesStation
       id: Amber
@@ -98,91 +98,91 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: CQAAAAACAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAgAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAEADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAEADgAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAMADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAAAAAkAAAAAAwAbAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAAADwAAAAABAA8AAAAAAAAPAAAAAAMACQAAAAABAAkAAAAAAAAJAAAAAAIADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAABAA8AAAAAAQAPAAAAAAMADwAAAAABAAkAAAAAAgAJAAAAAAMACQAAAAABAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAgAJAAAAAAMACQAAAAABAAkAAAAAAgAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAAACQAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAgAJAAAAAAEADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAEADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAwAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAEAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: CQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAAAAAkAAAAAAQAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAQAbAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAAADwAAAAAAAA8AAAAAAwAPAAAAAAEACQAAAAACAAkAAAAAAAAJAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAABAA8AAAAAAQAPAAAAAAAADwAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAABAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAIACQAAAAACAAkAAAAAAgAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAEACQAAAAACAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAQAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         -1,-2:
           ind: -1,-2
-          tiles: CQAAAAADAAkAAAAAAAAJAAAAAAIAGwAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAACAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAIQAAAAACAAkAAAAAAwAJAAAAAAEAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAgAOAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAACAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAgAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAwAcAAAAAAIAHAAAAAABABwAAAAAAQAcAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAEAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAMADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAEACQAAAAACAAkAAAAAAwAJAAAAAAMACQAAAAACAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAEADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAADAA4AAAAAAAAJAAAAAAEACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAAkAAAAAAwAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAMACQAAAAACAAkAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: CQAAAAACAAkAAAAAAwAcAAAAAAAADgAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAwAcAAAAAAEAHAAAAAABABwAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEAHAAAAAAAAA4AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAQAcAAAAAAEAHAAAAAADABwAAAAAAAAcAAAAAAEADgAAAAAAABsAAAAAAAAcAAAAAAIAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAgAcAAAAAAEAHAAAAAAAABwAAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAIAHAAAAAADABwAAAAAAQAcAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAAAAAkAAAAAAQAJAAAAAAMADgAAAAAAABwAAAAAAwAcAAAAAAEAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAAHAAAAAABAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAABAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAMADgAAAAAAAAkAAAAAAgAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAMACQAAAAACAAkAAAAAAQAJAAAAAAEADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAACAA4AAAAAAAAJAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAAkAAAAAAwAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAOAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIADgAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAQAOAAAAAAAACQAAAAABAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         -1,-3:
           ind: -1,-3
-          tiles: IwAAAAABACMAAAAAAQAjAAAAAAAAIwAAAAAAACMAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAABACMAAAAAAAAjAAAAAAMAIwAAAAABACMAAAAAAAAjAAAAAAMADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAADABwAAAAAAQAOAAAAAAAACQAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAEAHAAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAQAjAAAAAAMAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAACABwAAAAAAwAOAAAAAAAAHAAAAAABABwAAAAAAwAcAAAAAAIAIwAAAAADACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAwAcAAAAAAEAHAAAAAABABwAAAAAAQAcAAAAAAIAHAAAAAAAACMAAAAAAgAjAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAEAHAAAAAABABwAAAAAAwAcAAAAAAIAHAAAAAAAABwAAAAAAQAjAAAAAAEAIwAAAAAAACMAAAAAAAAjAAAAAAMAIwAAAAAAABwAAAAAAwAcAAAAAAEADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAABwAAAAAAQBJAAAAAAMASQAAAAACABwAAAAAAAAcAAAAAAAASQAAAAABAEkAAAAAAwAcAAAAAAEAHAAAAAABABwAAAAAAwAcAAAAAAIAHAAAAAACABwAAAAAAgAcAAAAAAEADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAABABwAAAAAAgAcAAAAAAEAHAAAAAABABwAAAAAAwAcAAAAAAEAHAAAAAADACkAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAEAHAAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAADABwAAAAAAAAcAAAAAAAAHAAAAAACABwAAAAAAQApAAAAAAAAKwAAAAAAACsAAAAAAwArAAAAAAAADgAAAAAAAAkAAAAAAAAcAAAAAAIADgAAAAAAABwAAAAAAABJAAAAAAMASQAAAAAAABwAAAAAAAAcAAAAAAMASQAAAAAAAEkAAAAAAQAcAAAAAAIADgAAAAAAACsAAAAAAgArAAAAAAEAKwAAAAADAA4AAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAMAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAABwAAAAAAwAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAADAA4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAcAAAAAAMAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACEAAAAAAwAJAAAAAAEACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAhAAAAAAEACQAAAAABAAkAAAAAAQAJAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAAACQAAAAABAA4AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAOAAAAAAAAIQAAAAADAA==
+          tiles: IwAAAAABACMAAAAAAwAjAAAAAAMAIwAAAAABACMAAAAAAwAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAADAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAEACQAAAAADACMAAAAAAwAjAAAAAAAAIwAAAAABACMAAAAAAAAjAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAAAOAAAAAAAACQAAAAABACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAABAA4AAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAAAjAAAAAAMAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAADABwAAAAAAwAOAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAMAIwAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAwAcAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAAAHAAAAAADACMAAAAAAwAjAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAIAHAAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAAAABwAAAAAAQAjAAAAAAAAIwAAAAACACMAAAAAAgAjAAAAAAMAIwAAAAABABwAAAAAAgAcAAAAAAIADgAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAACABwAAAAAAgBJAAAAAAEASQAAAAADABwAAAAAAgAcAAAAAAEASQAAAAACAEkAAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAMAHAAAAAADABwAAAAAAwAcAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAMAHAAAAAABABwAAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAQAcAAAAAAIAHAAAAAACABwAAAAAAAApAAAAAAAAKwAAAAADACsAAAAAAwArAAAAAAIADgAAAAAAAAkAAAAAAwAcAAAAAAEADgAAAAAAABwAAAAAAgBJAAAAAAIASQAAAAABABwAAAAAAgAcAAAAAAAASQAAAAACAEkAAAAAAAAcAAAAAAMADgAAAAAAACsAAAAAAwArAAAAAAEAKwAAAAADAA4AAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAgAcAAAAAAMAHAAAAAABABwAAAAAAAAcAAAAAAMAHAAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABABwAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAwAcAAAAAAAAHAAAAAABABwAAAAAAQAOAAAAAAAAHAAAAAADABwAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAcAAAAAAEAHAAAAAADAA4AAAAAAAAdAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAQAcAAAAAAMAHAAAAAABABwAAAAAAgAcAAAAAAAAHAAAAAADACMAAAAAAgAJAAAAAAEAHAAAAAAAABwAAAAAAAAOAAAAAAAAHQAAAAAAAB0AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAwAcAAAAAAMAHAAAAAABABwAAAAAAAAcAAAAAAIAHAAAAAADAA4AAAAAAAAjAAAAAAIACQAAAAADAAkAAAAAAwAJAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAwAcAAAAAAMAHAAAAAACABwAAAAAAAAOAAAAAAAAIwAAAAADAA==
           version: 7
         -1,-4:
           ind: -1,-4
-          tiles: LAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAwAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAAAJAAAAAAMADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAMAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAQAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAQAJAAAAAAIACQAAAAABAAkAAAAAAgAcAAAAAAIAHAAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAMADgAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAgAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAQABAAAAAAAAAQAAAAAAACMAAAAAAgAcAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAgAjAAAAAAAACQAAAAADAAkAAAAAAgAOAAAAAAAAIwAAAAACACMAAAAAAQAjAAAAAAEADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAACAAEAAAAAAwABAAAAAAEAAQAAAAADAAEAAAAAAAABAAAAAAIAIwAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAADACMAAAAAAQAjAAAAAAMAIwAAAAADAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAAAOAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAEADgAAAAAAACMAAAAAAgAOAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAIACQAAAAADAAkAAAAAAQAJAAAAAAMAIwAAAAACACMAAAAAAwAjAAAAAAIAIwAAAAACACMAAAAAAgAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAABAA==
+          tiles: LAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAMADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAABAA4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAMADgAAAAAAABwAAAAAAwAcAAAAAAIAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAADAA4AAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAQAcAAAAAAMAHAAAAAAAABwAAAAAAgAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAgAJAAAAAAIACQAAAAADAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAwAcAAAAAAIAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAACABwAAAAAAwAcAAAAAAEAHAAAAAADABwAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAQABAAAAAAMAAQAAAAACACMAAAAAAAAcAAAAAAIAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAACAAEAAAAAAAAjAAAAAAEACQAAAAAAAAkAAAAAAwAOAAAAAAAAIwAAAAADACMAAAAAAAAjAAAAAAEADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAADAAEAAAAAAQABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAMAIwAAAAACAAkAAAAAAgAJAAAAAAMACQAAAAACACMAAAAAAQAjAAAAAAAAIwAAAAACAA4AAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAOAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAAADgAAAAAAACMAAAAAAgAOAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAMAIwAAAAADACMAAAAAAgAjAAAAAAAAIwAAAAAAACMAAAAAAwAOAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAABAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACAA==
           version: 7
         -1,-5:
           ind: -1,-5
-          tiles: LgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAADAA4AAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAEADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAADAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACABsAAAAAAAAbAAAAAAAAGwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAACAA4AAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAEADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAABAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAMADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAACABsAAAAAAAAbAAAAAAAAGwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         -1,0:
           ind: -1,0
-          tiles: HAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAA4AAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAACQAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAAsAAAAAAAALAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAALAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAA4AAAAAAAALAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAALAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIAAQAAAAACAAEAAAAAAwAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAAEAAAAAAgABAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAACQAAAAAAAAkAAAAAAAABAAAAAAMAAQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAMACQAAAAADABwAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAAAvAAAAAAEALwAAAAADAC8AAAAAAQAvAAAAAAIALwAAAAABAC8AAAAAAwAvAAAAAAIALwAAAAADAC8AAAAAAwAcAAAAAAAALwAAAAABAC8AAAAAAQAvAAAAAAIALwAAAAABAC8AAAAAAgAvAAAAAAIAAQAAAAADAC8AAAAAAAAvAAAAAAIALwAAAAADAAEAAAAAAAABAAAAAAIAAQAAAAABAC8AAAAAAgAvAAAAAAEADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAABAAEAAAAAAgAvAAAAAAIALwAAAAACAC8AAAAAAgABAAAAAAAAAQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAABAAAAAAMALwAAAAACAC8AAAAAAwAvAAAAAAAAAQAAAAAAAAEAAAAAAwAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAAAQAAAAACAC8AAAAAAgAvAAAAAAAALwAAAAAAAAEAAAAAAgABAAAAAAMADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: HAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAABAA4AAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAAsAAAAAAAALAAAAAAkADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIADgAAAAAAAA4AAAAAAAALAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAA4AAAAAAAALAAAAAAkALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAALAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEAAQAAAAADAAEAAAAAAgAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAEAAAAAAwABAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAACQAAAAADAAkAAAAAAgABAAAAAAIAAQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAABABwAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAABAAkAAAAAAAAvAAAAAAIALwAAAAABAC8AAAAAAQAvAAAAAAIALwAAAAACAC8AAAAAAAAvAAAAAAMALwAAAAACAC8AAAAAAwAcAAAAAAIALwAAAAAAAC8AAAAAAQAvAAAAAAEALwAAAAACAC8AAAAAAwAvAAAAAAMAAQAAAAAAAC8AAAAAAAAvAAAAAAEALwAAAAABAAEAAAAAAgABAAAAAAIAAQAAAAACAC8AAAAAAgAvAAAAAAMADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAACAAkAAAAAAQAJAAAAAAEACQAAAAAAAAEAAAAAAQAvAAAAAAIALwAAAAAAAC8AAAAAAgABAAAAAAIAAQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAABAAAAAAIALwAAAAADAC8AAAAAAAAvAAAAAAEAAQAAAAADAAEAAAAAAgAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAAAQAAAAACAC8AAAAAAAAvAAAAAAMALwAAAAABAAEAAAAAAwABAAAAAAEADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         -1,1:
           ind: -1,1
-          tiles: AQAAAAABAC8AAAAAAwAvAAAAAAEALwAAAAAAAAEAAAAAAQABAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAEAAAAAAwAvAAAAAAEALwAAAAADAC8AAAAAAwABAAAAAAEAAQAAAAACAA4AAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAC8AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAACABwAAAAAAQAcAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAAMQAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAADIAAAAAAAAyAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAIAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAyAAAAAAAAMgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEADgAAAAAAADEAAAAAAAAxAAAAAAEAMQAAAAADAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAAAAAkAAAAAAQAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAABAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: AQAAAAABAC8AAAAAAwAvAAAAAAIALwAAAAACAAEAAAAAAAABAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAEAAAAAAgAvAAAAAAEALwAAAAACAC8AAAAAAgABAAAAAAIAAQAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAACABwAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAgAOAAAAAAAADgAAAAAAAC8AAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAgAcAAAAAAIAHAAAAAACABwAAAAAAwAcAAAAAAAACQAAAAADAAkAAAAAAgAOAAAAAAAAMQAAAAADAA4AAAAAAAAbAAAAAAAADgAAAAAAADIAAAAAAAAyAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAyAAAAAAAAMgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAEADgAAAAAAADEAAAAAAwAxAAAAAAIAMQAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAADAAkAAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAABAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         -2,-1:
           ind: -2,-1
-          tiles: DgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAACAAgAAAAAAAAIAAAAAAAACAAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAACAAgAAAAAAAAJAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAIAAAAAAAACAAAAAAAAAkAAAAAAQAIAAAAAAAACAAAAAAAAAgAAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAeAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACAAAAAAAAAgAAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAwAJAAAAAAIACQAAAAABAAkAAAAAAwAJAAAAAAIADgAAAAAAAAkAAAAAAQAJAAAAAAIAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAIAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAMACQAAAAACAAgAAAAAAAAIAAAAAAAACAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAABAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAAAABwAAAAAAQAcAAAAAAIAIwAAAAACACMAAAAAAAAjAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAwAcAAAAAAMAHAAAAAADAA4AAAAAAAAjAAAAAAIAIwAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAEACQAAAAADAAkAAAAAAwAcAAAAAAIAHAAAAAABABwAAAAAAgAcAAAAAAAAHAAAAAACABwAAAAAAAAOAAAAAAAAIwAAAAAAACMAAAAAAwAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAwAOAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAQAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAAAJAAAAAAIADgAAAAAAABwAAAAAAwAcAAAAAAIADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAABAA4AAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAwAJAAAAAAEACQAAAAACAAkAAAAAAgAJAAAAAAMACQAAAAADABwAAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAwAcAAAAAAAAHAAAAAAAABwAAAAAAwAcAAAAAAIACQAAAAACAAkAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAACQAAAAABAAkAAAAAAgAcAAAAAAEAHAAAAAACABwAAAAAAgAcAAAAAAIAHAAAAAACABwAAAAAAAAcAAAAAAAAHAAAAAAAAAkAAAAAAQAJAAAAAAAADwAAAAABAA8AAAAAAQAPAAAAAAIADwAAAAADAAkAAAAAAQAJAAAAAAMAHAAAAAACABwAAAAAAwAcAAAAAAAAHAAAAAABABwAAAAAAwAcAAAAAAMAHAAAAAADABwAAAAAAQAJAAAAAAEACQAAAAAAAA8AAAAAAAAPAAAAAAEADwAAAAADAA8AAAAAAQAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAADAA==
+          tiles: DgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAwAJAAAAAAIACQAAAAADAAgAAAAAAAAIAAAAAAAACAAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAADAAgAAAAAAAAJAAAAAAEACQAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAIAAAAAAAACAAAAAAAAAkAAAAAAQAIAAAAAAAACAAAAAAAAAgAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAwAOAAAAAAAACQAAAAACAAkAAAAAAwAeAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMACAAAAAAAAAgAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAQAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAIAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAABABwAAAAAAgAcAAAAAAIAIwAAAAABACMAAAAAAgAjAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAMAHAAAAAACABwAAAAAAAAcAAAAAAAAHAAAAAABAA4AAAAAAAAjAAAAAAAAIwAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAwAcAAAAAAEAHAAAAAADABwAAAAAAgAOAAAAAAAAIwAAAAAAACMAAAAAAgAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAQAcAAAAAAMAHAAAAAABABwAAAAAAQAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAgAJAAAAAAIADgAAAAAAABwAAAAAAAAcAAAAAAMADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAAACQAAAAABABwAAAAAAgAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAIAHAAAAAABABwAAAAAAgAcAAAAAAAACQAAAAADAAkAAAAAAwAPAAAAAAMADwAAAAADAA8AAAAAAAAPAAAAAAMACQAAAAABAAkAAAAAAQAcAAAAAAEAHAAAAAADABwAAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAAAAAkAAAAAAQAJAAAAAAAADwAAAAAAAA8AAAAAAgAPAAAAAAIADwAAAAABAAkAAAAAAAAJAAAAAAMAHAAAAAADABwAAAAAAQAcAAAAAAMAHAAAAAABABwAAAAAAQAcAAAAAAIAHAAAAAABABwAAAAAAAAJAAAAAAEACQAAAAAAAA8AAAAAAQAPAAAAAAEADwAAAAAAAA8AAAAAAgAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAABAA==
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: MwAAAAACADMAAAAAAQAzAAAAAAIAMwAAAAABADMAAAAAAgAzAAAAAAIAMwAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAAAzAAAAAAMAMwAAAAACADMAAAAAAQAzAAAAAAEAMwAAAAADADMAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAAAOAAAAAAAANwAAAAAAADcAAAAAAQA3AAAAAAAANwAAAAADAAkAAAAAAwAzAAAAAAEAMwAAAAADADMAAAAAAwAzAAAAAAMAMwAAAAACADMAAAAAAAAzAAAAAAEACQAAAAABAAkAAAAAAwAJAAAAAAIADgAAAAAAADcAAAAAAwA3AAAAAAAANwAAAAACADcAAAAAAgAOAAAAAAAAMwAAAAACADMAAAAAAQAzAAAAAAIAMwAAAAADADMAAAAAAwAzAAAAAAMAMwAAAAADAAkAAAAAAwAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAQAzAAAAAAAAMwAAAAAAADMAAAAAAwAzAAAAAAIAMwAAAAABADMAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAgAJAAAAAAIAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAwAcAAAAAAEAHAAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAAAAA4AAAAAAAA4AAAAAAIAOAAAAAACADgAAAAAAQA4AAAAAAIAOAAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAADABwAAAAAAwAcAAAAAAAAHAAAAAABAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAAAOAAAAAAAAOAAAAAABADgAAAAAAAA4AAAAAAMAOAAAAAABADgAAAAAAQAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAAACQAAAAADADgAAAAAAQA4AAAAAAEAOAAAAAACADgAAAAAAQA4AAAAAAEAHAAAAAAAABwAAAAAAwAcAAAAAAAAHAAAAAACABwAAAAAAQAcAAAAAAMADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAAA4AAAAAAAA4AAAAAAAAOAAAAAACADgAAAAAAgA4AAAAAAMAOAAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAACAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAADAAkAAAAAAwAJAAAAAAMAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAgAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAgAAAAAAAAIAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEADgAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAwAJAAAAAAAACQAAAAACAAgAAAAAAAAJAAAAAAIACQAAAAADAA==
+          tiles: MwAAAAACADMAAAAAAgAzAAAAAAEAMwAAAAACADMAAAAAAwAzAAAAAAEAMwAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAAAzAAAAAAIAMwAAAAABADMAAAAAAwAzAAAAAAEAMwAAAAADADMAAAAAAgAJAAAAAAIACQAAAAACAAkAAAAAAAAOAAAAAAAANwAAAAAAADcAAAAAAAA3AAAAAAAANwAAAAABAAkAAAAAAAAzAAAAAAIAMwAAAAACADMAAAAAAQAzAAAAAAEAMwAAAAABADMAAAAAAAAzAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAAADgAAAAAAADcAAAAAAwA3AAAAAAIANwAAAAADADcAAAAAAQAOAAAAAAAAMwAAAAAAADMAAAAAAAAzAAAAAAMAMwAAAAACADMAAAAAAwAzAAAAAAAAMwAAAAACAAkAAAAAAQAJAAAAAAMACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAwAzAAAAAAMAMwAAAAABADMAAAAAAQAzAAAAAAIAMwAAAAACADMAAAAAAwAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAgAcAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAMAHAAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAAAAA4AAAAAAAA4AAAAAAEAOAAAAAACADgAAAAAAgA4AAAAAAIAOAAAAAAAABwAAAAAAgAcAAAAAAIAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAADAA4AAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAAAOAAAAAAAAOAAAAAADADgAAAAAAgA4AAAAAAAAOAAAAAAAADgAAAAAAQAOAAAAAAAAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAADADgAAAAAAgA4AAAAAAEAOAAAAAACADgAAAAAAQA4AAAAAAIAHAAAAAABABwAAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAwAcAAAAAAEADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAACAA4AAAAAAAA4AAAAAAIAOAAAAAADADgAAAAAAwA4AAAAAAIAOAAAAAADAA4AAAAAAAAcAAAAAAEAHAAAAAADABwAAAAAAAAcAAAAAAIAHAAAAAABAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAQAJAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAgAAAAAAAAIAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEADgAAAAAAAAkAAAAAAQAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAQAJAAAAAAAACQAAAAADAAgAAAAAAAAJAAAAAAMACQAAAAAAAA==
           version: 7
         -2,-3:
           ind: -2,-3
-          tiles: DgAAAAAAABwAAAAAAwAcAAAAAAEAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAACABwAAAAAAQAjAAAAAAMAIwAAAAABAA4AAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAAAcAAAAAAIAHAAAAAACAA4AAAAAAAAcAAAAAAMAHAAAAAADABwAAAAAAwAcAAAAAAMAHAAAAAADABwAAAAAAgAOAAAAAAAAIwAAAAAAACMAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAQAOAAAAAAAAHAAAAAACABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAAAABwAAAAAAAAcAAAAAAIADgAAAAAAABwAAAAAAwAcAAAAAAMADgAAAAAAABwAAAAAAwAcAAAAAAEAHAAAAAAAABwAAAAAAgAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAABABwAAAAAAAAcAAAAAAEADgAAAAAAABwAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAABAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAQAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAQAcAAAAAAIADgAAAAAAADMAAAAAAQAzAAAAAAMAMwAAAAABADMAAAAAAQAzAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAEACQAAAAADADMAAAAAAgAzAAAAAAEAMwAAAAAAADMAAAAAAwAzAAAAAAIADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAAAAAkAAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAwAzAAAAAAIAMwAAAAADADMAAAAAAgAzAAAAAAMAMwAAAAACAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAEAMwAAAAADADMAAAAAAgAzAAAAAAIAMwAAAAADADMAAAAAAwAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAACABwAAAAAAwAcAAAAAAEAHAAAAAACADMAAAAAAAAzAAAAAAEAMwAAAAADADMAAAAAAwAzAAAAAAIAMwAAAAADAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAQAOAAAAAAAAHAAAAAABAAkAAAAAAgAcAAAAAAEAHAAAAAADABwAAAAAAgAOAAAAAAAADgAAAAAAADMAAAAAAgAzAAAAAAAAMwAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAMADgAAAAAAABwAAAAAAQAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAMAMwAAAAADADMAAAAAAAAzAAAAAAEAMwAAAAABADMAAAAAAAAzAAAAAAEAMwAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAADAA4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAADAA==
+          tiles: DgAAAAAAABwAAAAAAAAcAAAAAAIAHAAAAAABABwAAAAAAgAcAAAAAAIAHAAAAAABABwAAAAAAQAcAAAAAAIAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAABABwAAAAAAwAjAAAAAAEAIwAAAAADAA4AAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAAAcAAAAAAMAHAAAAAABAA4AAAAAAAAcAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAAAHAAAAAABABwAAAAAAwAOAAAAAAAAIwAAAAAAACMAAAAAAwAOAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAwAOAAAAAAAAHAAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAACABwAAAAAAQAcAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAIADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAABABwAAAAAAwAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAwAcAAAAAAEADgAAAAAAABwAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAgAJAAAAAAIACQAAAAABAAkAAAAAAwAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAEADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAQAcAAAAAAMADgAAAAAAADMAAAAAAwAzAAAAAAAAMwAAAAADADMAAAAAAAAzAAAAAAMADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAMACQAAAAADADMAAAAAAAAzAAAAAAIAMwAAAAAAADMAAAAAAQAzAAAAAAEADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAwAcAAAAAAIAHAAAAAABABwAAAAAAgAzAAAAAAAAMwAAAAAAADMAAAAAAAAzAAAAAAEAMwAAAAABAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAEAHAAAAAACABwAAAAAAQAcAAAAAAEAMwAAAAABADMAAAAAAgAzAAAAAAIAMwAAAAADADMAAAAAAgAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAADAA4AAAAAAAAcAAAAAAAACQAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAABADMAAAAAAAAzAAAAAAAAMwAAAAAAADMAAAAAAQAzAAAAAAAAMwAAAAABAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAOAAAAAAAAHAAAAAADAAkAAAAAAQAcAAAAAAEAHAAAAAABABwAAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAwAzAAAAAAEAMwAAAAABAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAADgAAAAAAABwAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAwAJAAAAAAEAMwAAAAACADMAAAAAAgAzAAAAAAAAMwAAAAAAADMAAAAAAQAzAAAAAAMAMwAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAADAA4AAAAAAAAcAAAAAAEAHAAAAAACABwAAAAAAgAcAAAAAAAAHAAAAAACAA==
           version: 7
         -2,-4:
           ind: -2,-4
-          tiles: DgAAAAAAABwAAAAAAgAcAAAAAAIAOwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABADsAAAAAAAA6AAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAcAAAAAAIAHAAAAAAAABwAAAAAAQA7AAAAAAAAOgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAOwAAAAAAADoAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAAAADsAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAgAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAgAjAAAAAAAADgAAAAAAADkAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAgAJAAAAAAMACQAAAAADAAkAAAAAAgAOAAAAAAAADgAAAAAAACMAAAAAAAAjAAAAAAIAIwAAAAAAAA4AAAAAAAA5AAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAADABwAAAAAAwAcAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAMADgAAAAAAAA4AAAAAAAAjAAAAAAMAIwAAAAABAA4AAAAAAAAOAAAAAAAAIwAAAAABAA4AAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAgAcAAAAAAIAHAAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAgAOAAAAAAAAIwAAAAADACMAAAAAAQAOAAAAAAAAHAAAAAACABwAAAAAAgAJAAAAAAMACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAgAOAAAAAAAADgAAAAAAACMAAAAAAQAjAAAAAAAAIwAAAAADACMAAAAAAgAjAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAjAAAAAAMAIwAAAAABACMAAAAAAQAjAAAAAAEAIwAAAAADAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAEACQAAAAABABwAAAAAAAAcAAAAAAIAHAAAAAABAA4AAAAAAAAOAAAAAAAAIwAAAAAAACMAAAAAAwAjAAAAAAIAIwAAAAADACMAAAAAAgAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAQAOAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEADgAAAAAAABwAAAAAAgAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAAAABwAAAAAAQAcAAAAAAEADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAADABwAAAAAAwAcAAAAAAEAHAAAAAAAAA4AAAAAAAAjAAAAAAAAIwAAAAACAA==
+          tiles: DgAAAAAAABwAAAAAAAAcAAAAAAIAOwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACADsAAAAAAAA6AAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAACABwAAAAAAAA7AAAAAAAAOgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAOwAAAAAAADoAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAADADsAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAgAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAACAA4AAAAAAAAOAAAAAAAAIwAAAAABACMAAAAAAgAjAAAAAAEADgAAAAAAADkAAAAAAwAOAAAAAAAAHAAAAAACABwAAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAACMAAAAAAQAjAAAAAAAAIwAAAAADAA4AAAAAAAA5AAAAAAIADgAAAAAAABwAAAAAAwAcAAAAAAAAHAAAAAADABwAAAAAAQAcAAAAAAIACQAAAAABAAkAAAAAAwAJAAAAAAMADgAAAAAAAA4AAAAAAAAjAAAAAAMAIwAAAAACAA4AAAAAAAAOAAAAAAAAIwAAAAACAA4AAAAAAAAcAAAAAAEAHAAAAAADABwAAAAAAQAcAAAAAAIAHAAAAAABAAkAAAAAAwAJAAAAAAIACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAgAOAAAAAAAAIwAAAAADACMAAAAAAgAOAAAAAAAAHAAAAAADABwAAAAAAQAJAAAAAAMACQAAAAABAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAgAjAAAAAAEAIwAAAAACACMAAAAAAQAjAAAAAAEADgAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAQAJAAAAAAEADgAAAAAAAA4AAAAAAAAjAAAAAAMAIwAAAAADACMAAAAAAAAjAAAAAAMAIwAAAAABAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAAACQAAAAABABwAAAAAAAAcAAAAAAMAHAAAAAADAA4AAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAAAjAAAAAAEAIwAAAAABACMAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAABAAkAAAAAAQAOAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMADgAAAAAAABwAAAAAAgAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAABABwAAAAAAQAcAAAAAAEADgAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAACAA4AAAAAAAAjAAAAAAMAIwAAAAABAA==
           version: 7
         -2,-5:
           ind: -2,-5
-          tiles: CQAAAAABAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAIADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: CQAAAAACAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         -2,0:
           ind: -2,0
-          tiles: CQAAAAACAA4AAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAQAOAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAAAAAkAAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAQAcAAAAAAEAHAAAAAACABwAAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAEADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAEAHAAAAAABABwAAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAAAcAAAAAAMAHAAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAAADQAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAwAcAAAAAAIAHAAAAAADABwAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAAA4AAAAAAAAcAAAAAAMADgAAAAAAABwAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAEAAAAAAgABAAAAAAIACQAAAAADAAkAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAgAcAAAAAAIAHAAAAAABAA4AAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAIACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAAAAAkAAAAAAQAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAADAAkAAAAAAQAJAAAAAAEADgAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAAAHAAAAAABABwAAAAAAgAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABABwAAAAAAgAcAAAAAAMACQAAAAAAAAkAAAAAAwAOAAAAAAAAHAAAAAACABwAAAAAAwAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAAAAAkAAAAAAgAcAAAAAAIAHAAAAAABAAkAAAAAAQAJAAAAAAIAHAAAAAADABwAAAAAAQAcAAAAAAEAHAAAAAABABwAAAAAAQAcAAAAAAIADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAIAHAAAAAADABwAAAAAAwAJAAAAAAAACQAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAALwAAAAABAC8AAAAAAQAvAAAAAAEACQAAAAACABwAAAAAAAAcAAAAAAEACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAAQAAAAAAAAkAAAAAAgAcAAAAAAEAHAAAAAADAAkAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAADAA4AAAAAAAAsAAAAAAAADgAAAAAAADEAAAAAAwAOAAAAAAAADgAAAAAAAAEAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAIACQAAAAACAAkAAAAAAQAOAAAAAAAALAAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAAA4AAAAAAAABAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAEADgAAAAAAACwAAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAOAAAAAAAAAQAAAAADAA==
+          tiles: CQAAAAACAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAgAcAAAAAAMAHAAAAAADABwAAAAAAwAOAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAACAAkAAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAQAcAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAADABwAAAAAAAAcAAAAAAEAHAAAAAABAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAIADQAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAwAOAAAAAAAAHAAAAAABABwAAAAAAgAcAAAAAAEAHAAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABAA4AAAAAAAAcAAAAAAIADgAAAAAAABwAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAEAAAAAAgABAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAAHAAAAAABABwAAAAAAQAcAAAAAAEAHAAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAQAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAwAJAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAIADgAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAwAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAgAJAAAAAAAAHAAAAAABABwAAAAAAQAJAAAAAAMACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAADABwAAAAAAgAcAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAABAAkAAAAAAAAcAAAAAAEAHAAAAAACAAkAAAAAAAAJAAAAAAEAHAAAAAADABwAAAAAAgAcAAAAAAIAHAAAAAABABwAAAAAAQAcAAAAAAIADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAEAHAAAAAABABwAAAAAAQAJAAAAAAMACQAAAAABABwAAAAAAQAcAAAAAAMAHAAAAAACABwAAAAAAgAcAAAAAAAAHAAAAAABAA4AAAAAAAAOAAAAAAAALwAAAAAAAC8AAAAAAgAvAAAAAAMACQAAAAABABwAAAAAAQAcAAAAAAMACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAAQAAAAACAAkAAAAAAQAcAAAAAAAAHAAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAABAA4AAAAAAAAsAAAAAAAADgAAAAAAADEAAAAAAwAOAAAAAAAADgAAAAAAAAEAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAQAJAAAAAAMACQAAAAAAAAkAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAxAAAAAAEADgAAAAAAAA4AAAAAAAABAAAAAAMACQAAAAABAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAMADgAAAAAAACwAAAAAAAAOAAAAAAAAMQAAAAABAA4AAAAAAAAOAAAAAAAAAQAAAAABAA==
           version: 7
         -2,1:
           ind: -2,1
-          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAEADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAAQAAAAABAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAEAAAAAAQAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAMQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAEAMQAAAAACADMAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAABAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAAQAAAAABAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAAAAAEAAAAAAwAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAIADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAAQAAAAACAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAEAAAAAAQAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAMQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAMAMQAAAAABADMAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAABAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAAQAAAAADAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAEAAQAAAAAAAAEAAAAAAgAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         -2,2:
           ind: -2,2
-          tiles: LAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAAQAAAAABAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: LAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAAQAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         -3,-1:
           ind: -3,-1
-          tiles: DgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAMACQAAAAACAAkAAAAAAQAJAAAAAAEACQAAAAABAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAAMwAAAAADADMAAAAAAwAOAAAAAAAAMwAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAADMAAAAAAwAzAAAAAAAAMwAAAAADADMAAAAAAwAJAAAAAAEACQAAAAADAAkAAAAAAwAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAALgAAAAAAAA4AAAAAAAAzAAAAAAIAMwAAAAACADMAAAAAAwAzAAAAAAMADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAgAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAAMwAAAAACADMAAAAAAwAzAAAAAAEADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAOAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAEAHAAAAAACABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAQAcAAAAAAIAHAAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAIAHAAAAAABABwAAAAAAQAcAAAAAAAAHAAAAAADAAkAAAAAAwAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAIADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAgAcAAAAAAEAHAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAABABwAAAAAAwAcAAAAAAIACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAwAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAEAHAAAAAABABwAAAAAAAAcAAAAAAMADgAAAAAAAA4AAAAAAAAcAAAAAAIADgAAAAAAABwAAAAAAgAcAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAA==
+          tiles: DgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAAMwAAAAABADMAAAAAAgAOAAAAAAAAMwAAAAACAA4AAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAADMAAAAAAAAzAAAAAAIAMwAAAAAAADMAAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAQAJAAAAAAEADgAAAAAAAA4AAAAAAAAJAAAAAAMALgAAAAAAAA4AAAAAAAAzAAAAAAEAMwAAAAABADMAAAAAAwAzAAAAAAIADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAAMwAAAAAAADMAAAAAAwAzAAAAAAIADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAOAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAEAHAAAAAADABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAAAHAAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAEAHAAAAAAAABwAAAAAAAAcAAAAAAIAHAAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAQAJAAAAAAIADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAACABwAAAAAAAAcAAAAAAIAHAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAQAcAAAAAAEAHAAAAAAAABwAAAAAAQAcAAAAAAIACQAAAAABAAkAAAAAAQAJAAAAAAIACQAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAACABwAAAAAAwAcAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIADgAAAAAAABwAAAAAAwAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAA==
           version: 7
         -3,-2:
           ind: -3,-2
-          tiles: CQAAAAADADMAAAAAAAAzAAAAAAAAMwAAAAADADMAAAAAAwAzAAAAAAEAMwAAAAACADMAAAAAAQAzAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACADMAAAAAAAAzAAAAAAMAMwAAAAACAAkAAAAAAwAOAAAAAAAAMwAAAAAAADMAAAAAAQAzAAAAAAMAMwAAAAABADMAAAAAAgAzAAAAAAIAMwAAAAABAAgAAAAAAAAIAAAAAAAACAAAAAAAAAkAAAAAAwAzAAAAAAMAMwAAAAAAAA4AAAAAAAAJAAAAAAEADgAAAAAAADMAAAAAAgAzAAAAAAIAMwAAAAADADMAAAAAAgAzAAAAAAEAMwAAAAABADMAAAAAAwAIAAAAAAAACAAAAAAAAAgAAAAAAAAJAAAAAAEAMwAAAAADADMAAAAAAQAOAAAAAAAACQAAAAADADMAAAAAAAAzAAAAAAMAMwAAAAABADMAAAAAAAAzAAAAAAAAMwAAAAAAADMAAAAAAQAzAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADADMAAAAAAwAzAAAAAAEAMwAAAAADAAkAAAAAAAAOAAAAAAAAMwAAAAABADMAAAAAAQAzAAAAAAIAMwAAAAABADMAAAAAAQAzAAAAAAIAMwAAAAADADMAAAAAAwAzAAAAAAIAMwAAAAABADMAAAAAAwAzAAAAAAEAMwAAAAABADMAAAAAAgAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABAA4AAAAAAAAOAAAAAAAAMwAAAAAAADMAAAAAAQAzAAAAAAMAMwAAAAACADMAAAAAAwAzAAAAAAAAMwAAAAABADMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAACABwAAAAAAgAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAABwAAAAAAgAOAAAAAAAAMwAAAAABADMAAAAAAAAzAAAAAAAAMwAAAAADAA4AAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAACABwAAAAAAwAcAAAAAAAAHAAAAAAAABwAAAAAAwAcAAAAAAEADgAAAAAAADMAAAAAAwAzAAAAAAMAMwAAAAACADMAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAQAOAAAAAAAAHAAAAAAAAA4AAAAAAAAzAAAAAAIAMwAAAAABADMAAAAAAAAzAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAwAJAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAIADgAAAAAAABwAAAAAAQAOAAAAAAAAHAAAAAABABwAAAAAAwAcAAAAAAIAHAAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAMAHAAAAAAAABwAAAAAAwAcAAAAAAMAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: CQAAAAAAADMAAAAAAgAzAAAAAAMAMwAAAAABADMAAAAAAQAzAAAAAAMAMwAAAAAAADMAAAAAAgAzAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAADMAAAAAAwAzAAAAAAMAMwAAAAADAAkAAAAAAwAOAAAAAAAAMwAAAAADADMAAAAAAQAzAAAAAAIAMwAAAAADADMAAAAAAQAzAAAAAAIAMwAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAkAAAAAAAAzAAAAAAIAMwAAAAABAA4AAAAAAAAJAAAAAAIADgAAAAAAADMAAAAAAQAzAAAAAAEAMwAAAAABADMAAAAAAQAzAAAAAAAAMwAAAAAAADMAAAAAAgAIAAAAAAAACAAAAAAAAAgAAAAAAAAJAAAAAAEAMwAAAAAAADMAAAAAAwAOAAAAAAAACQAAAAABADMAAAAAAgAzAAAAAAMAMwAAAAADADMAAAAAAwAzAAAAAAMAMwAAAAACADMAAAAAAQAzAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADADMAAAAAAAAzAAAAAAEAMwAAAAACAAkAAAAAAgAOAAAAAAAAMwAAAAABADMAAAAAAAAzAAAAAAIAMwAAAAAAADMAAAAAAAAzAAAAAAMAMwAAAAAAADMAAAAAAwAzAAAAAAEAMwAAAAABADMAAAAAAAAzAAAAAAEAMwAAAAAAADMAAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAAMwAAAAAAADMAAAAAAwAzAAAAAAMAMwAAAAAAADMAAAAAAwAzAAAAAAAAMwAAAAABADMAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAQAcAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAAMwAAAAABADMAAAAAAAAzAAAAAAAAMwAAAAABAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAABABwAAAAAAwAcAAAAAAIADgAAAAAAADMAAAAAAwAzAAAAAAAAMwAAAAACADMAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAAAAAkAAAAAAQAcAAAAAAEAHAAAAAACABwAAAAAAQAOAAAAAAAAHAAAAAABAA4AAAAAAAAzAAAAAAEAMwAAAAADADMAAAAAAQAzAAAAAAMADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAAAHAAAAAACABwAAAAAAQAcAAAAAAMADgAAAAAAABwAAAAAAgAOAAAAAAAAHAAAAAACABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAEAHAAAAAABABwAAAAAAgAcAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAMQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         -3,-3:
           ind: -3,-3
-          tiles: DgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAABABwAAAAAAQAcAAAAAAAAHAAAAAAAABwAAAAAAwAOAAAAAAAAMwAAAAABADMAAAAAAgAzAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAgAcAAAAAAEAHAAAAAACABwAAAAAAgAcAAAAAAMADgAAAAAAADMAAAAAAgAzAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAMAHAAAAAABABwAAAAAAQAcAAAAAAMAHAAAAAADAA4AAAAAAAAzAAAAAAAAMwAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAwAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAACABwAAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAAAOAAAAAAAAMwAAAAAAADMAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAMADgAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAADAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAACAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAADAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACQAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAACAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAEADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAADAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAwAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAAMwAAAAABADMAAAAAAwAzAAAAAAAAMwAAAAADADMAAAAAAwAzAAAAAAMAMwAAAAABADMAAAAAAgAOAAAAAAAACQAAAAADAA4AAAAAAAAzAAAAAAMAMwAAAAAAADMAAAAAAQAzAAAAAAAAMwAAAAABADMAAAAAAgAzAAAAAAIAMwAAAAABADMAAAAAAAAzAAAAAAEAMwAAAAADADMAAAAAAAAzAAAAAAEAMwAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABABwAAAAAAwAcAAAAAAMAHAAAAAAAABwAAAAAAwAOAAAAAAAAMwAAAAADADMAAAAAAwAzAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAAAcAAAAAAMAHAAAAAAAABwAAAAAAwAcAAAAAAIADgAAAAAAADMAAAAAAQAzAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAMAHAAAAAABABwAAAAAAAAcAAAAAAIAHAAAAAAAAA4AAAAAAAAzAAAAAAAAMwAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAgAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAAAABwAAAAAAAAcAAAAAAIAHAAAAAAAABwAAAAAAgAOAAAAAAAAMwAAAAACADMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAMADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACQAAAAABAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAwAJAAAAAAMACQAAAAADAA4AAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAMADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAMACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAgAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAACAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAQAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAABAAkAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAAMwAAAAABADMAAAAAAQAzAAAAAAMAMwAAAAACADMAAAAAAgAzAAAAAAIAMwAAAAABADMAAAAAAgAOAAAAAAAACQAAAAABAA4AAAAAAAAzAAAAAAAAMwAAAAABADMAAAAAAwAzAAAAAAIAMwAAAAABADMAAAAAAAAzAAAAAAIAMwAAAAADADMAAAAAAQAzAAAAAAAAMwAAAAABADMAAAAAAgAzAAAAAAAAMwAAAAADAA==
           version: 7
         -3,-4:
           ind: -3,-4
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAABAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAwAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAEALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAABACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAMAHAAAAAABABwAAAAAAQAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAABABwAAAAAAgAcAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAjAAAAAAAAIwAAAAAAACMAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAEAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAIwAAAAAAACMAAAAAAAAjAAAAAAIADgAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAACMAAAAAAAAjAAAAAAMAIwAAAAADAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAQAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAcAAAAAAEAIwAAAAAAACMAAAAAAQAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAIADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAQAcAAAAAAEADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAABAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAABADEAAAAAAwAxAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAACAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAQAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAAAJAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAADACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAADABwAAAAAAQAcAAAAAAAAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAjAAAAAAAAIwAAAAADACMAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAIwAAAAAAACMAAAAAAAAjAAAAAAIADgAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAACMAAAAAAwAjAAAAAAAAIwAAAAADAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAgAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAcAAAAAAMAIwAAAAADACMAAAAAAQAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAEADgAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAAAADEAAAAAAgAxAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAAAAA==
           version: 7
         -3,-5:
           ind: -3,-5
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAIACQAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAwAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAEALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAwAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAIALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAEACQAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAQAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAwAJAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAwAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAABAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAQAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAMALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAACAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAgAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAIALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAQAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAMALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAIACQAAAAACAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAACAAkAAAAAAgAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAEALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAgAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAEALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAgAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAIALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAEACQAAAAAAAA==
           version: 7
         -3,0:
           ind: -3,0
-          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEADgAAAAAAABwAAAAAAwAcAAAAAAIADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAC4AAAAAAAAOAAAAAAAAIwAAAAACACMAAAAAAgAjAAAAAAIAIwAAAAABAA4AAAAAAAAcAAAAAAEAHAAAAAADABwAAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAgAOAAAAAAAACQAAAAABAAkAAAAAAQAsAAAAAAAADgAAAAAAACMAAAAAAAAjAAAAAAMAIwAAAAACAA4AAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAQAcAAAAAAAAHAAAAAACABwAAAAAAQAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAjAAAAAAEAIwAAAAADACMAAAAAAwAOAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAAAcAAAAAAAAHAAAAAACAA4AAAAAAAANAAAAAAAADQAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAEAHAAAAAACABwAAAAAAwAcAAAAAAAAHAAAAAABABwAAAAAAwAOAAAAAAAADgAAAAAAAA0AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAABABwAAAAAAwAcAAAAAAEADgAAAAAAAA4AAAAAAAANAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAIADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAADAA4AAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAACAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAQAOAAAAAAAACQAAAAABAA4AAAAAAAAJAAAAAAMACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAbAAAAAAAACQAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAQAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAADAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAMACQAAAAABAAkAAAAAAwAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAIADgAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAMADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAC4AAAAAAAAOAAAAAAAAIwAAAAACACMAAAAAAAAjAAAAAAIAIwAAAAADAA4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAwAOAAAAAAAACQAAAAAAAAkAAAAAAwAsAAAAAAAADgAAAAAAACMAAAAAAgAjAAAAAAEAIwAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAgAcAAAAAAAAHAAAAAABABwAAAAAAQAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAjAAAAAAMAIwAAAAAAACMAAAAAAQAOAAAAAAAAHAAAAAAAABwAAAAAAwAcAAAAAAAAHAAAAAACABwAAAAAAAAcAAAAAAIAHAAAAAAAAA4AAAAAAAANAAAAAAAADQAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAMAHAAAAAADABwAAAAAAgAcAAAAAAIAHAAAAAADABwAAAAAAgAOAAAAAAAADgAAAAAAAA0AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAABABwAAAAAAwAcAAAAAAMAHAAAAAACABwAAAAAAgAcAAAAAAMADgAAAAAAAA4AAAAAAAANAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAAAAA4AAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAOAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAbAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAgAJAAAAAAMACQAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAgAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAABAAkAAAAAAgAJAAAAAAMAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAAADgAAAAAAAA==
           version: 7
         -3,1:
           ind: -3,1
-          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAABAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAzAAAAAAEAMwAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMwAAAAABADMAAAAAAwAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAwAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAgAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAgAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAACAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAzAAAAAAMAMwAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMwAAAAAAADMAAAAAAQAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA==
           version: 7
         -3,2:
           ind: -3,2
@@ -190,19 +190,19 @@ entities:
           version: 7
         -4,0:
           ind: -4,0
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAwAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAOAAAAAAAAHAAAAAACABwAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAwAOAAAAAAAAHAAAAAADAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAABAAAAAACAA4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAA8AAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAAA8AAAAAAIAIwAAAAAAAAkAAAAAAwAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAIwAAAAACADwAAAAAAwAOAAAAAAAACQAAAAAAACMAAAAAAgAjAAAAAAIAIwAAAAACACMAAAAAAQAJAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACMAAAAAAgA8AAAAAAEADgAAAAAAAAkAAAAAAAA8AAAAAAMAIwAAAAACACMAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAA8AAAAAAAAIwAAAAADACMAAAAAAAAJAAAAAAMAIwAAAAAAADwAAAAAAAAjAAAAAAAADgAAAAAAAAQAAAAAAQAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAgAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAAHAAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAwAOAAAAAAAAHAAAAAACABwAAAAAAwAOAAAAAAAAHAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAEAHAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAABAAAAAADAA4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAA8AAAAAAYADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAQA8AAAAAAAAIwAAAAABAAkAAAAAAwAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAIwAAAAADADwAAAAABQAOAAAAAAAACQAAAAABACMAAAAAAQAjAAAAAAIAIwAAAAAAACMAAAAAAQAJAAAAAAIADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACMAAAAAAQA8AAAAAAIADgAAAAAAAAkAAAAAAgA8AAAAAAMAIwAAAAAAACMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAA8AAAAAAYAIwAAAAAAACMAAAAAAAAJAAAAAAAAIwAAAAABADwAAAAAAgAjAAAAAAMADgAAAAAAAAQAAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         -4,-2:
           ind: -4,-2
-          tiles: LgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAACAA4AAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAgAOAAAAAAAACQAAAAADAA4AAAAAAAAJAAAAAAEACQAAAAACACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAgAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAADAA4AAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAwAJAAAAAAIALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAEADgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAEAHAAAAAADABwAAAAAAwAOAAAAAAAAHAAAAAAAABwAAAAAAwAcAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAwAcAAAAAAIAHAAAAAADABwAAAAAAAAcAAAAAAIAHAAAAAABACwAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAEAHAAAAAABAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAwAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: LgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAADAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAQAOAAAAAAAACQAAAAADAA4AAAAAAAAJAAAAAAMACQAAAAADACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAwAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAIACQAAAAABAA4AAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAQAJAAAAAAIALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAQAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAQAOAAAAAAAAHAAAAAACABwAAAAAAgAcAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAwAcAAAAAAIAHAAAAAACAA4AAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAQAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         -4,-3:
           ind: -4,-3
-          tiles: LAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAADEAAAAAAgAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAwAcAAAAAAIALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAABAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAACQAAAAACAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAAkAAAAAAQAsAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIALAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAA==
+          tiles: LAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAADEAAAAAAgAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAMALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAAHAAAAAADAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAwAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAABACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAACQAAAAABAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAAkAAAAAAgAsAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAA==
           version: 7
         -4,-4:
           ind: -4,-4
-          tiles: LAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAgAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAEALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAADEAAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: LAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAADEAAAAAAwAOAAAAAAAADgAAAAAAAA==
           version: 7
         -6,-4:
           ind: -6,-4
@@ -214,31 +214,31 @@ entities:
           version: 7
         0,-1:
           ind: 0,-1
-          tiles: GwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAHgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAEAAAAAAAABAAAAAAEADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAABAAAAAAIAAQAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: GwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAgAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAHgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAEAAAAAAQABAAAAAAIADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAABAAAAAAIAAQAAAAADAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: IQAAAAACACEAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAEADwAAAAAAAA8AAAAAAgAPAAAAAAEACQAAAAADABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAAACQAAAAADAA8AAAAAAQAyAAAAAAAADwAAAAABAAkAAAAAAgAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAQAPAAAAAAIADwAAAAADAA8AAAAAAwAJAAAAAAMAHgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAyAAAAAAAAMgAAAAAAADIAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMgAAAAAAADIAAAAAAAAyAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAABAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAgAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAAAJAAAAAAMADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAADAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAADAA4AAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAQAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAMADgAAAAAAAA4AAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAABAA4AAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAAAOAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAABAAkAAAAAAgAJAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: GwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAA+AAAAAAAAPgAAAAAAAD4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAIADwAAAAABAA8AAAAAAgAPAAAAAAIACQAAAAABABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAAPgAAAAAAAD4AAAAAAAA+AAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAACAA8AAAAAAwAyAAAAAAAADwAAAAACAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAgAPAAAAAAMADwAAAAADAA8AAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAyAAAAAAAAMgAAAAAAADIAAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAQAJAAAAAAIACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMgAAAAAAADIAAAAAAAAyAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAwAOAAAAAAAAHAAAAAAAABwAAAAAAgAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAEACQAAAAADAAkAAAAAAwAJAAAAAAMADgAAAAAAABwAAAAAAgAcAAAAAAMAHAAAAAACAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAQAJAAAAAAIACQAAAAABAA4AAAAAAAAcAAAAAAEAHAAAAAADABwAAAAAAwAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAACAA4AAAAAAAAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAQAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAAAAAkAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAMADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         0,-3:
           ind: 0,-3
-          tiles: CQAAAAABAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAwAJAAAAAAIADgAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAACACMAAAAAAwAOAAAAAAAAGwAAAAAAAA4AAAAAAAABAAAAAAAAAQAAAAABAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAgAOAAAAAAAAIwAAAAAAACMAAAAAAgAjAAAAAAIAJAAAAAAAACMAAAAAAAAjAAAAAAIAGwAAAAAAAA4AAAAAAAAbAAAAAAAAAQAAAAAAAAEAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAAADgAAAAAAACMAAAAAAgAjAAAAAAAAIwAAAAABAA4AAAAAAAAjAAAAAAMAIwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAwAJAAAAAAMADgAAAAAAACMAAAAAAwAjAAAAAAIAHAAAAAABABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACgAAAAAAAAoAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAAAjAAAAAAEAIwAAAAACABwAAAAAAwAcAAAAAAMAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAgAJAAAAAAEAIwAAAAACACMAAAAAAAAcAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAA/AAAAAAAAPwAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAABACMAAAAAAwAjAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAPwAAAAAAAD8AAAAAAAA/AAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAIACAAAAAAAAA4AAAAAAAAjAAAAAAIAIwAAAAACABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAAAACMAAAAAAwAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAAAjAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAADgAAAAAAACMAAAAAAwAjAAAAAAEAIwAAAAAAACEAAAAAAwAhAAAAAAIADgAAAAAAAA4AAAAAAAAbAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAhAAAAAAMAIQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAMACQAAAAABAAkAAAAAAQAJAAAAAAMAIQAAAAAAACEAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABAA==
+          tiles: CQAAAAABAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAIADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAABACMAAAAAAQAOAAAAAAAAGwAAAAAAAA4AAAAAAAABAAAAAAEAAQAAAAACAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAwAOAAAAAAAAIwAAAAAAACMAAAAAAgAjAAAAAAAAJAAAAAAAACMAAAAAAwAjAAAAAAMAGwAAAAAAAA4AAAAAAAAbAAAAAAAAAQAAAAACAAEAAAAAAwAJAAAAAAIACQAAAAABAAkAAAAAAwAJAAAAAAAADgAAAAAAACMAAAAAAAAjAAAAAAMAIwAAAAAAAA4AAAAAAAAjAAAAAAIAIwAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAAIwAAAAACACMAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAMADgAAAAAAACMAAAAAAQAjAAAAAAMAHAAAAAADABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACgAAAAAAAAoAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAAAjAAAAAAIAIwAAAAADABwAAAAAAgAcAAAAAAEAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAAAJAAAAAAIAIwAAAAAAACMAAAAAAwAcAAAAAAIAHAAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAA/AAAAAAAAPwAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAEACQAAAAADACMAAAAAAAAjAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAPwAAAAAAAD8AAAAAAAA/AAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAACAAAAAAAAA4AAAAAAAAjAAAAAAEAIwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAQAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAACAAkAAAAAAgAOAAAAAAAAIwAAAAACACMAAAAAAwAjAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAgAcAAAAAAMADgAAAAAAACMAAAAAAgAjAAAAAAAAIwAAAAABACMAAAAAAwAjAAAAAAIADgAAAAAAAA4AAAAAAAAbAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAAAIwAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAEAIwAAAAADACMAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAACAA==
           version: 7
         0,-4:
           ind: 0,-4
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAMADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAADAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAMAHAAAAAABAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAQAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAAAcAAAAAAIAHAAAAAADAA4AAAAAAAAcAAAAAAMAHAAAAAAAABwAAAAAAwAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAMAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAACAAkAAAAAAQAcAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAAAHAAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAADAA4AAAAAAAAxAAAAAAMADgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAQAcAAAAAAMADgAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAABAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAgAOAAAAAAAAMQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAQAjAAAAAAEAIwAAAAABACMAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAAAAQAAAAACAAkAAAAAAAAJAAAAAAAACQAAAAADAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAjAAAAAAEAIwAAAAACACMAAAAAAgAjAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAIwAAAAAAACMAAAAAAwAjAAAAAAEAIwAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAMAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACMAAAAAAgAjAAAAAAIAIwAAAAABACMAAAAAAgAOAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAEACQAAAAADAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAACAAkAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAgAJAAAAAAIACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAADAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAAAJAAAAAAEACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAADAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAgAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAMADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAACAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAAHAAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAQAcAAAAAAEAHAAAAAADAA4AAAAAAAAcAAAAAAEAHAAAAAACABwAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAIAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAABAAkAAAAAAgAcAAAAAAIAHAAAAAACABwAAAAAAQAcAAAAAAIAHAAAAAADAAkAAAAAAwAJAAAAAAMACQAAAAABAA4AAAAAAAAxAAAAAAEADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAACAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAgAOAAAAAAAAMQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAgAjAAAAAAIAIwAAAAADACMAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAIAAQAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAABAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAjAAAAAAAAIwAAAAABACMAAAAAAgAjAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAEAAQAAAAACAAEAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAIwAAAAAAACMAAAAAAQAjAAAAAAMAIwAAAAADAAEAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAQABAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAEAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACMAAAAAAwAjAAAAAAIAIwAAAAABACMAAAAAAAAOAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAADAAkAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAgAJAAAAAAEACQAAAAABAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAEACQAAAAABAAkAAAAAAgAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAABAA==
           version: 7
         0,-5:
           ind: 0,-5
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAADAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAgAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAIADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAwAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAACAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAQAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAACAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAwAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAMADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAwAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         0,0:
           ind: 0,0
-          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAsAAAAAAAACwAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAuAAAAAAAALAAAAAAAACwAAAAAAAALAAAAAAAADgAAAAAAAA4AAAAAAAALAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAIACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAIACQAAAAADAAkAAAAAAwAvAAAAAAIALwAAAAACAC8AAAAAAgAvAAAAAAAALwAAAAADAC8AAAAAAAAvAAAAAAIALwAAAAADAC8AAAAAAAAvAAAAAAEALwAAAAACAC8AAAAAAAAvAAAAAAEALwAAAAACAC8AAAAAAAAvAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAEACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAIADgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAQAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAABAA4AAAAAAAAcAAAAAAMAHAAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAsAAAAAAAACwAAAAAMACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAALAAAAAAAADgAAAAAAAA4AAAAAAAALAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAACAAkAAAAAAQAvAAAAAAEALwAAAAADAC8AAAAAAwAvAAAAAAAALwAAAAACAC8AAAAAAgAvAAAAAAAALwAAAAAAAC8AAAAAAwAvAAAAAAEALwAAAAACAC8AAAAAAwAvAAAAAAAALwAAAAAAAC8AAAAAAwAvAAAAAAEACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAABAAkAAAAAAQAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAMADgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAEADgAAAAAAAA4AAAAAAAAcAAAAAAMADgAAAAAAAA4AAAAAAAAJAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAABAA==
           version: 7
         0,1:
           ind: 0,1
-          tiles: CQAAAAACAAkAAAAAAQAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAgAJAAAAAAMACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAACABwAAAAAAgAcAAAAAAMAHAAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAMACQAAAAACAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAMADgAAAAAAAAkAAAAAAgAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAEACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAwAJAAAAAAAACQAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEADgAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAEAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAIAHAAAAAACABwAAAAAAQAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAABABwAAAAAAwAcAAAAAAIADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA==
+          tiles: CQAAAAACAAkAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAQAJAAAAAAMACQAAAAAAABwAAAAAAwAcAAAAAAIAHAAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAMACQAAAAABAAkAAAAAAgAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAMACQAAAAABAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAQAcAAAAAAAAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAIAHAAAAAAAABwAAAAAAQAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAMAHAAAAAABABwAAAAAAQAcAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA==
           version: 7
         0,2:
           ind: 0,2
@@ -246,19 +246,19 @@ entities:
           version: 7
         1,-1:
           ind: 1,-1
-          tiles: HgAAAAAAAA4AAAAAAABKAAAAAAAAHAAAAAAAABwAAAAAAwAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAASgAAAAAAAEoAAAAAAQBKAAAAAAEASgAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAAAAA4AAAAAAAAbAAAAAAAAHAAAAAACAAkAAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAMADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAAAOAAAAAAAAGwAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAIADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAJAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAADAAAAAAEAAwAAAAAAABsAAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAAwAAAAADABwAAAAAAgAcAAAAAAMAHAAAAAABAA4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAA==
+          tiles: HgAAAAAAAA4AAAAAAABKAAAAAAMAHAAAAAADABwAAAAAAQAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAABAA4AAAAAAAAOAAAAAAAASgAAAAAAAEoAAAAAAwBKAAAAAAMASgAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAADAA4AAAAAAAAbAAAAAAAAHAAAAAADAAkAAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAQAOAAAAAAAAGwAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAwAOAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAJAAAAAAMACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAADAAAAAAIAAwAAAAACABsAAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIAGwAAAAAAAA4AAAAAAAAOAAAAAAAAAwAAAAAAABwAAAAAAwAcAAAAAAAAHAAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAAAABwAAAAAAwAcAAAAAAEAHAAAAAADAA4AAAAAAAAJAAAAAAMACQAAAAABAA==
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: CQAAAAADAAkAAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAAAcAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAIACQAAAAACAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAEADgAAAAAAAAkAAAAAAwAJAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAEAHAAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAwAJAAAAAAIACQAAAAADAAkAAAAAAQAJAAAAAAEACQAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAABABwAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAOAAAAAAAAHAAAAAABABwAAAAAAQAcAAAAAAEADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAQAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAACAA4AAAAAAAAcAAAAAAAADgAAAAAAABwAAAAAAwAJAAAAAAIADwAAAAAAAAkAAAAAAQAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAACAAkAAAAAAAAOAAAAAAAAHAAAAAABAA4AAAAAAAAcAAAAAAAACQAAAAACAA8AAAAAAgAJAAAAAAIACQAAAAADABwAAAAAAgAcAAAAAAMAHAAAAAABABwAAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAADABwAAAAAAQAOAAAAAAAAHAAAAAABAAkAAAAAAAAJAAAAAAEACQAAAAAAABwAAAAAAQAOAAAAAAAAHAAAAAABABwAAAAAAQAcAAAAAAMACQAAAAABAAkAAAAAAAAJAAAAAAMACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAEAHAAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAACAAkAAAAAAQAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAAAABwAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAIACQAAAAAAAAkAAAAAAQAOAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAACAAkAAAAAAQAcAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAgAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAIADgAAAAAAAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAACAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAA==
+          tiles: CQAAAAADAAkAAAAAAgAOAAAAAAAAHAAAAAACABwAAAAAAAAcAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAEACQAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAQAJAAAAAAIADgAAAAAAAAkAAAAAAAAJAAAAAAMADgAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAgAJAAAAAAEACQAAAAAAAA4AAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAADAAkAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAEADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAEACQAAAAABAA4AAAAAAAAcAAAAAAAADgAAAAAAABwAAAAAAAAJAAAAAAAADwAAAAADAAkAAAAAAgAcAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAABAAkAAAAAAAAOAAAAAAAAHAAAAAACAA4AAAAAAAAcAAAAAAIACQAAAAADAA8AAAAAAQAJAAAAAAAACQAAAAABABwAAAAAAwAcAAAAAAAAHAAAAAADABwAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAACABwAAAAAAQAOAAAAAAAAHAAAAAABAAkAAAAAAgAJAAAAAAAACQAAAAACABwAAAAAAQAOAAAAAAAAHAAAAAABABwAAAAAAgAcAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAAAJAAAAAAEAHAAAAAACAAkAAAAAAwAJAAAAAAIACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAABAAkAAAAAAwAJAAAAAAIACQAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAABABwAAAAAAwAJAAAAAAIACQAAAAABAAkAAAAAAQAJAAAAAAEACQAAAAACAAkAAAAAAQAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAIACQAAAAACAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAQAcAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAwAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAwAcAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAACAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAA==
           version: 7
         1,-3:
           ind: 1,-3
-          tiles: DgAAAAAAACMAAAAAAAAjAAAAAAIAIwAAAAADACMAAAAAAgAjAAAAAAMADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAAAIwAAAAACACMAAAAAAgAjAAAAAAMAIwAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAOAAAAAAAADgAAAAAAACMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAIwAAAAADACMAAAAAAQAjAAAAAAMAIwAAAAABAA4AAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAQAjAAAAAAIAIwAAAAAAACMAAAAAAwAjAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAMAIwAAAAADACMAAAAAAwAjAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAADACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADACMAAAAAAQAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAjAAAAAAEAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAwAOAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAACACMAAAAAAAAjAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAEAAAAAAEACQAAAAABAAkAAAAAAgAJAAAAAAAADgAAAAAAACMAAAAAAwAjAAAAAAEAIwAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAAACQAAAAADAA4AAAAAAAAjAAAAAAIAIwAAAAAAACMAAAAAAgAjAAAAAAEAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAAIwAAAAAAACMAAAAAAgAjAAAAAAIADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAADABwAAAAAAAAcAAAAAAAAHAAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAAAABwAAAAAAgAJAAAAAAIACQAAAAACABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAIAHAAAAAAAABwAAAAAAwAcAAAAAAEACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAOAAAAAAAADgAAAAAAAA==
+          tiles: DgAAAAAAACMAAAAAAwAjAAAAAAMAIwAAAAACACMAAAAAAwAjAAAAAAMADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAIAIwAAAAABACMAAAAAAQAjAAAAAAMAIwAAAAADAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAAIwAAAAADACMAAAAAAAAjAAAAAAMAIwAAAAADAA4AAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAQAjAAAAAAAAIwAAAAABACMAAAAAAAAjAAAAAAMAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAMAIwAAAAABACMAAAAAAAAjAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAABACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADACMAAAAAAgAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAjAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAAAjAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAEAAAAAAEACQAAAAACAAkAAAAAAQAJAAAAAAEADgAAAAAAACMAAAAAAQAjAAAAAAEAIwAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAQAJAAAAAAEACQAAAAADAA4AAAAAAAAjAAAAAAAAIwAAAAACACMAAAAAAQAjAAAAAAEAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAAIwAAAAAAACMAAAAAAQAjAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAADABwAAAAAAwAcAAAAAAEAHAAAAAABAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAwAcAAAAAAAAHAAAAAACABwAAAAAAQAJAAAAAAIACQAAAAADABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAQAcAAAAAAMAHAAAAAABABwAAAAAAwAcAAAAAAIACQAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAOAAAAAAAADgAAAAAAAA==
           version: 7
         1,-4:
           ind: 1,-4
-          tiles: DgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAgAOAAAAAAAAIwAAAAACACMAAAAAAQAOAAAAAAAAMwAAAAAAADMAAAAAAAAOAAAAAAAAQQAAAAABAEEAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAMADgAAAAAAACMAAAAAAQAjAAAAAAMADgAAAAAAADMAAAAAAwAzAAAAAAIADgAAAAAAAEEAAAAAAwBBAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAIAMQAAAAADADEAAAAAAAAOAAAAAAAAMQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAQAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAQAjAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAACMAAAAAAwAjAAAAAAIAIwAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAMwAAAAAAADMAAAAAAgAOAAAAAAAAGwAAAAAAAA4AAAAAAAAjAAAAAAIAIwAAAAADACMAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAIAIwAAAAACACMAAAAAAgAjAAAAAAAAIwAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAQAjAAAAAAAAIwAAAAABACMAAAAAAwAOAAAAAAAAHgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAACMAAAAAAAAjAAAAAAEAIwAAAAABACMAAAAAAQAjAAAAAAIADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAADAA4AAAAAAAAsAAAAAAAALAAAAAAAAA==
+          tiles: DgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAQAOAAAAAAAAIwAAAAACACMAAAAAAgAOAAAAAAAAMwAAAAADADMAAAAAAgAOAAAAAAAAQQAAAAACAEEAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAEADgAAAAAAACMAAAAAAwAjAAAAAAEADgAAAAAAADMAAAAAAwAzAAAAAAMADgAAAAAAAEEAAAAAAwBBAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAACAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAEAMQAAAAACADEAAAAAAwAOAAAAAAAAMQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAIAMQAAAAAAADEAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAIwAAAAAAACMAAAAAAgAjAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAACMAAAAAAAAjAAAAAAMAIwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAMwAAAAABADMAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAjAAAAAAIAIwAAAAABACMAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAgAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAMAIwAAAAACACMAAAAAAAAjAAAAAAEAIwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAIwAAAAAAACMAAAAAAAAjAAAAAAIAIwAAAAACACMAAAAAAwAOAAAAAAAAHgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAACMAAAAAAQAjAAAAAAMAIwAAAAABACMAAAAAAwAjAAAAAAEADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAACAA4AAAAAAAAsAAAAAAAALAAAAAAAAA==
           version: 7
         1,-5:
           ind: 1,-5
@@ -266,11 +266,11 @@ entities:
           version: 7
         1,0:
           ind: 1,0
-          tiles: DgAAAAAAAA4AAAAAAAADAAAAAAIAAwAAAAACABwAAAAAAAAcAAAAAAAAHAAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAA4AAAAAAAAOAAAAAAAAAwAAAAACAAMAAAAAAgAcAAAAAAIAHAAAAAADABwAAAAAAgAOAAAAAAAAHAAAAAAAABwAAAAAAwAcAAAAAAAAHAAAAAACAAkAAAAAAgAJAAAAAAIACQAAAAABAAkAAAAAAQAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAAAHAAAAAACABwAAAAAAwAcAAAAAAEADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAABABwAAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAAAcAAAAAAIAHAAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAwAcAAAAAAAAHAAAAAADAA4AAAAAAAAJAAAAAAEACQAAAAABABsAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAQAcAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAwAJAAAAAAMADgAAAAAAAAkAAAAAAwAcAAAAAAAAHAAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAAACQAAAAACABwAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAQAcAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAIACQAAAAABAAkAAAAAAgAcAAAAAAIADgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAEAHAAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAACAAkAAAAAAwAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAkAAAAAAgAvAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAABwAAAAAAwAcAAAAAAIAHAAAAAADABwAAAAAAQAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAEADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAAkAAAAAAQAcAAAAAAMAHAAAAAABABwAAAAAAwAcAAAAAAIAHAAAAAABABwAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIAHAAAAAADABwAAAAAAgAcAAAAAAIAHAAAAAAAABwAAAAAAgAcAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAACAA==
+          tiles: DgAAAAAAAA4AAAAAAAADAAAAAAIAAwAAAAAAABwAAAAAAAAcAAAAAAIAHAAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAAAcAAAAAAEAHAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAABAA4AAAAAAAAOAAAAAAAAAwAAAAACAAMAAAAAAwAcAAAAAAEAHAAAAAABABwAAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAgAcAAAAAAAAHAAAAAABAAkAAAAAAgAJAAAAAAMACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAIAHAAAAAABABwAAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAADABwAAAAAAQAcAAAAAAAAHAAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAADABwAAAAAAQAcAAAAAAMAHAAAAAADAA4AAAAAAAAJAAAAAAAACQAAAAABABsAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAwAcAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAACAAkAAAAAAgAJAAAAAAMADgAAAAAAAAkAAAAAAAAcAAAAAAIAHAAAAAADAAkAAAAAAQAJAAAAAAIACQAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAAAJAAAAAAAACQAAAAABABwAAAAAAwAJAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAQAJAAAAAAMACQAAAAAAAAkAAAAAAwAcAAAAAAMACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAwAcAAAAAAIADgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAMAHAAAAAADAAkAAAAAAgAJAAAAAAEACQAAAAADAAkAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAQAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAkAAAAAAwAvAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABABwAAAAAAQAcAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAIADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAAkAAAAAAQAcAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAEAHAAAAAACABwAAAAAAgAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMAHAAAAAACABwAAAAAAAAcAAAAAAMAHAAAAAADABwAAAAAAgAcAAAAAAMADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAABAA==
           version: 7
         1,1:
           ind: 1,1
-          tiles: HAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAACAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAgAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAMACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAADABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAABAAQAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAwAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAwBHAAAAAAEARwAAAAAAAAkAAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAEAAAAAAIACQAAAAAAAAkAAAAAAQAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: HAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAIACQAAAAACAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAEADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAIACQAAAAADAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAACABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAkAAAAAAQAJAAAAAAEACQAAAAAAAAQAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAgAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAQBHAAAAAAIARwAAAAACAAkAAAAAAwAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAACAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAAA4AAAAAAAAEAAAAAAEACQAAAAABAAkAAAAAAgAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         1,2:
           ind: 1,2
@@ -278,55 +278,55 @@ entities:
           version: 7
         2,-1:
           ind: 2,-1
-          tiles: HAAAAAAAAA4AAAAAAABAAAAAAAEAQAAAAAABAA8AAAAAAgBAAAAAAAAAQAAAAAABAEAAAAAAAgBAAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAgAOAAAAAAAACQAAAAABAAkAAAAAAQAOAAAAAAAAQAAAAAACAEAAAAAAAAAPAAAAAAMAQAAAAAADAEAAAAAAAAAOAAAAAAAAQAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIADgAAAAAAAEAAAAAAAABAAAAAAAMADwAAAAACAEAAAAAAAwBAAAAAAAMAQAAAAAACAEAAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAMAAAAAAAACQAAAAACAA4AAAAAAABAAAAAAAEAQAAAAAACAEAAAAAAAABAAAAAAAIAQAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAIADgAAAAAAAA4AAAAAAAAbAAAAAAAADAAAAAAAAAkAAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAgAjAAAAAAMAIwAAAAABACMAAAAAAQAOAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAAwAAAAAAAAJAAAAAAMADgAAAAAAACMAAAAAAgAjAAAAAAEAIwAAAAACACMAAAAAAwAjAAAAAAMADgAAAAAAABwAAAAAAgAcAAAAAAIAHAAAAAADABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAjAAAAAAEAIwAAAAACACMAAAAAAAAjAAAAAAMAIwAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAwAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAJAAAAAAAACQAAAAADAA4AAAAAAAAcAAAAAAMAHAAAAAADABwAAAAAAwAcAAAAAAIAHAAAAAADABwAAAAAAwAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMACQAAAAADAAkAAAAAAQAOAAAAAAAAHAAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAADABwAAAAAAwAcAAAAAAMAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAMACAAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAAAAAgAAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAAGwAAAAAAAAkAAAAAAwAIAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACAAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAACQAAAAABAAgAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: HAAAAAAAAA4AAAAAAABAAAAAAAEAQAAAAAADAA8AAAAAAQBAAAAAAAIAQAAAAAAAAEAAAAAAAgBAAAAAAAMADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAgAOAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAAQAAAAAADAEAAAAAAAgAPAAAAAAEAQAAAAAAAAEAAAAAAAQAOAAAAAAAAQAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAEAAAAAAAABAAAAAAAAADwAAAAAAAEAAAAAAAwBAAAAAAAAAQAAAAAABAEAAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAMAAAAAAAACQAAAAADAA4AAAAAAABAAAAAAAMAQAAAAAABAEAAAAAAAgBAAAAAAAMAQAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADAAAAAAAAAkAAAAAAQAOAAAAAAAAIwAAAAAAACMAAAAAAgAjAAAAAAMAIwAAAAABACMAAAAAAgAOAAAAAAAAHAAAAAACABwAAAAAAAAcAAAAAAIAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAAwAAAAAAAAJAAAAAAIADgAAAAAAACMAAAAAAAAjAAAAAAEAIwAAAAABACMAAAAAAwAjAAAAAAIADgAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAACABwAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAjAAAAAAAAIwAAAAADACMAAAAAAQAjAAAAAAAAIwAAAAADAA4AAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAwAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAJAAAAAAAACQAAAAADAA4AAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAAAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAEAHAAAAAADABwAAAAAAwAcAAAAAAAAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAJAAAAAAEACAAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAABAAgAAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAAGwAAAAAAAAkAAAAAAAAIAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACAAAAAAAAA4AAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAACQAAAAAAAAgAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         2,-2:
           ind: 2,-2
-          tiles: CQAAAAADAAkAAAAAAQAJAAAAAAIACQAAAAACAAkAAAAAAgAJAAAAAAIACQAAAAACABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAABAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAEADgAAAAAAADkAAAAAAwA5AAAAAAMAOQAAAAADADkAAAAAAwAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAA5AAAAAAEAOQAAAAAAADkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAADAAkAAAAAAwAJAAAAAAIAOQAAAAABADkAAAAAAAA5AAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAA4AAAAAAAAJAAAAAAAARQAAAAAAAEUAAAAAAABFAAAAAAAACQAAAAAAABwAAAAAAgAcAAAAAAMAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAEUAAAAAAABFAAAAAAAARQAAAAAAAAkAAAAAAwAcAAAAAAIAHAAAAAADABwAAAAAAwAOAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAwBFAAAAAAAARQAAAAAAAEUAAAAAAAAJAAAAAAEAHAAAAAADABwAAAAAAQAcAAAAAAEADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIAGgAAAAADAC8AAAAAAgAOAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADABoAAAAAAQAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAABAAkAAAAAAgAJAAAAAAAACQAAAAABAAkAAAAAAwAaAAAAAAMALwAAAAABAAkAAAAAAQAJAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAACAAkAAAAAAgAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAIAGgAAAAADAAkAAAAAAAAJAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAIACQAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAwAJAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAAAABoAAAAAAgAvAAAAAAIACQAAAAAAAA4AAAAAAAAOAAAAAAAAQAAAAAACAEAAAAAAAQBAAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAaAAAAAAAADgAAAAAAAAkAAAAAAgAOAAAAAAAAQAAAAAADAEAAAAAAAABAAAAAAAEAQAAAAAADAEAAAAAAAwBAAAAAAAMADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIAGgAAAAABAC8AAAAAAQAJAAAAAAMADgAAAAAAAEAAAAAAAABAAAAAAAEAQAAAAAADAEAAAAAAAABAAAAAAAMAQAAAAAACAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAAAAA4AAAAAAABAAAAAAAAAQAAAAAABAA8AAAAAAQBAAAAAAAAAQAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAACAA==
+          tiles: CQAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAMACQAAAAABABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAABAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAAADgAAAAAAADkAAAAAAgA5AAAAAAEAOQAAAAAAADkAAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAA5AAAAAAAAOQAAAAAAADkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAwAJAAAAAAIAOQAAAAADADkAAAAAAgA5AAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAA4AAAAAAAAJAAAAAAAARQAAAAAAAEUAAAAAAABFAAAAAAAACQAAAAACABwAAAAAAQAcAAAAAAMAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAEUAAAAAAABFAAAAAAAARQAAAAAAAAkAAAAAAgAcAAAAAAEAHAAAAAADABwAAAAAAgAOAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAJAAAAAAEACQAAAAACAAkAAAAAAgBFAAAAAAAARQAAAAAAAEUAAAAAAAAJAAAAAAMAHAAAAAAAABwAAAAAAwAcAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAEAGgAAAAACAC8AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABABoAAAAAAwAOAAAAAAAACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAABAAkAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAACAAkAAAAAAQAaAAAAAAIALwAAAAADAAkAAAAAAwAJAAAAAAIACQAAAAABAAkAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAwAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAMAGgAAAAACAAkAAAAAAgAJAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAMACQAAAAABAAkAAAAAAQAJAAAAAAMACQAAAAACAAkAAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAMACQAAAAADABoAAAAAAAAvAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAAQAAAAAAAAEAAAAAAAQBAAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAaAAAAAAEADgAAAAAAAAkAAAAAAwAOAAAAAAAAQAAAAAAAAEAAAAAAAQBAAAAAAAMAQAAAAAADAEAAAAAAAgBAAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAMAGgAAAAADAC8AAAAAAQAJAAAAAAEADgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAgBAAAAAAAEAQAAAAAABAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAMACQAAAAADAA4AAAAAAABAAAAAAAMAQAAAAAABAA8AAAAAAgBAAAAAAAAAQAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAADAA==
           version: 7
         2,-3:
           ind: 2,-3
-          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAACQAAAAABABwAAAAAAgAcAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAAAcAAAAAAEAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAMAHAAAAAAAABwAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAhAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADAAkAAAAAAQAJAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAhAAAAAAIADgAAAAAAABwAAAAAAgAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAIQAAAAABAA4AAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACEAAAAAAwAhAAAAAAIAIQAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAEACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAMACQAAAAABAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAADAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAABAAkAAAAAAAAJAAAAAAEACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAMAIwAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAABACMAAAAAAgAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAAACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAAAjAAAAAAAADgAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAABABwAAAAAAAAcAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAABAAkAAAAAAQAcAAAAAAIAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAIAHAAAAAACABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAhAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAhAAAAAAEADgAAAAAAABwAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAQAJAAAAAAMACQAAAAABAAkAAAAAAAAJAAAAAAIADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAIQAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACEAAAAAAgAhAAAAAAEAIQAAAAACAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAMACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAwAJAAAAAAMACQAAAAABAAkAAAAAAgAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAIADgAAAAAAAA4AAAAAAAADAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEACQAAAAACAAkAAAAAAwAJAAAAAAEACQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAOAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAAAIwAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAIwAAAAABACMAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAAAjAAAAAAEADgAAAAAAAA==
           version: 7
         2,-4:
           ind: 2,-4
-          tiles: DgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAA7AAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAARgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAMQAAAAABADEAAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAAAzAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAzAAAAAAIADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAgAzAAAAAAAAMwAAAAADADMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA==
+          tiles: DgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAA7AAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAARgAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAMQAAAAABADEAAAAAAwAOAAAAAAAADgAAAAAAADMAAAAAAwAzAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAzAAAAAAMADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAwAzAAAAAAAAMwAAAAACADMAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA==
           version: 7
         2,-5:
           ind: 2,-5
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAEcAAAAAAQAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAEAHAAAAAACAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAACABwAAAAAAwAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAEcAAAAAAQAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMARwAAAAABACwAAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAEADgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAEcAAAAAAQAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAADAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAgAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAEcAAAAAAgAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAARwAAAAABACwAAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAQAcAAAAAAMADgAAAAAAAA==
           version: 7
         2,0:
           ind: 2,0
-          tiles: CQAAAAABAAgAAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAAHgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAgAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAABAAkAAAAAAgAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAIADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAABAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAABAAkAAAAAAgAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAEAIwAAAAABAA4AAAAAAAAJAAAAAAMACQAAAAABAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAQAjAAAAAAEADgAAAAAAACMAAAAAAAAOAAAAAAAAIwAAAAABAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAMADgAAAAAAAA4AAAAAAAAjAAAAAAEADgAAAAAAACMAAAAAAAAjAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAAAAAkAAAAAAQAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAJAAAAAAMADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMACQAAAAACABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAACAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAAAAAkAAAAAAQAJAAAAAAIADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: CQAAAAABAAgAAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAAHgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAADgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAAAAAkAAAAAAwAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAeAAAAAAAAHgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAAAAAkAAAAAAgAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAJAAAAAAEADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAAAIwAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACMAAAAAAgAjAAAAAAMADgAAAAAAACMAAAAAAgAOAAAAAAAAIwAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAwAOAAAAAAAAHgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAEADgAAAAAAAA4AAAAAAAAjAAAAAAEADgAAAAAAACMAAAAAAgAjAAAAAAMADgAAAAAAAAkAAAAAAQAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAIADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAAACQAAAAADABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAEADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         2,1:
           ind: 2,1
-          tiles: CQAAAAADAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEcAAAAAAgAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAJAAAAAAMACQAAAAAAAAQAAAAAAQAJAAAAAAIADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAABAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAwAJAAAAAAIADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAABHAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgBHAAAAAAIAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAABAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: CQAAAAADAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEcAAAAAAgAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAJAAAAAAIACQAAAAABAAQAAAAABAAJAAAAAAIADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAABAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAAQAAAAAAgAJAAAAAAEADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAABHAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAABHAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAACQAAAAABAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAACQAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAABAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         3,-1:
           ind: 3,-1
-          tiles: CQAAAAADAAkAAAAAAwAJAAAAAAEACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAHAAAAAADAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABwAAAAAAgAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAcAAAAAAIADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA==
+          tiles: CQAAAAABAAkAAAAAAAAJAAAAAAIACQAAAAACAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAHAAAAAABAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAcAAAAAAMADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA==
           version: 7
         3,-2:
           ind: 3,-2
-          tiles: DgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAACAAkAAAAAAgAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC8AAAAAAQAvAAAAAAIALwAAAAABAC8AAAAAAwAaAAAAAAAACQAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAOAAAAAAAAGgAAAAABAAkAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALwAAAAABAC8AAAAAAAAvAAAAAAAALwAAAAABABoAAAAAAQAJAAAAAAAACQAAAAADAAkAAAAAAQAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAAAaAAAAAAMACQAAAAABAAkAAAAAAAAJAAAAAAMADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAvAAAAAAIALwAAAAABAC8AAAAAAAAvAAAAAAMAGgAAAAABAAkAAAAAAwAJAAAAAAEACQAAAAADAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADgAAAAAAABoAAAAAAQAJAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC8AAAAAAAAvAAAAAAMALwAAAAACAC8AAAAAAgAaAAAAAAIACQAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAMACQAAAAACAAkAAAAAAQAJAAAAAAMAGwAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAJAAAAAAEADgAAAAAAAAkAAAAAAgAJAAAAAAEACQAAAAACAAkAAAAAAwAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAABAAkAAAAAAQAJAAAAAAIACQAAAAABAAkAAAAAAAAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC8AAAAAAgAvAAAAAAMALwAAAAACAC8AAAAAAwAaAAAAAAIACQAAAAABABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAOAAAAAAAAGgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALwAAAAACAC8AAAAAAwAvAAAAAAAALwAAAAADABoAAAAAAwAJAAAAAAEACQAAAAABAAkAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAAkAAAAAAwAJAAAAAAAACQAAAAACAAkAAAAAAwAaAAAAAAIACQAAAAAAAAkAAAAAAAAJAAAAAAMADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAvAAAAAAEALwAAAAABAC8AAAAAAAAvAAAAAAAAGgAAAAABAAkAAAAAAgAJAAAAAAAACQAAAAACAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADgAAAAAAABoAAAAAAQAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC8AAAAAAQAvAAAAAAEALwAAAAAAAC8AAAAAAwAaAAAAAAIACQAAAAACABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAJAAAAAAEACQAAAAADAAkAAAAAAgAJAAAAAAMACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAADAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAAAJAAAAAAEAGwAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         3,-3:
           ind: 3,-3
-          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAgAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAAAcAAAAAAEADgAAAAAAABwAAAAAAgAcAAAAAAIAHAAAAAADAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAwAcAAAAAAIAHAAAAAABABwAAAAAAAAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAgAOAAAAAAAAHAAAAAACABwAAAAAAgAcAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAADABwAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAEADgAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAAAABwAAAAAAgAcAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAMAHAAAAAACABwAAAAAAQAcAAAAAAAAHAAAAAABABwAAAAAAgAcAAAAAAAAHAAAAAABABwAAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAwAOAAAAAAAAHgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAABABwAAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAQAcAAAAAAMAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAbAAAAAAAAGwAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         3,-4:
           ind: 3,-4
-          tiles: DgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEcAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAABAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAQAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAABwAAAAAAwAOAAAAAAAAGwAAAAAAAA4AAAAAAAAxAAAAAAEADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAzAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAAMwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAABsAAAAAAAAOAAAAAAAARgAAAAADAEYAAAAAAQAbAAAAAAAARgAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAAAzAAAAAAIAMwAAAAACAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAQAzAAAAAAEAMwAAAAABADMAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMwAAAAAAADMAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAzAAAAAAIAMwAAAAADAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAgAOAAAAAAAAMwAAAAACAA4AAAAAAAAzAAAAAAAADgAAAAAAADMAAAAAAwAOAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAADMAAAAAAAAzAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAAMwAAAAACADMAAAAAAwAzAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAADMAAAAAAAAzAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA==
+          tiles: DgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEcAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAABwAAAAAAQAOAAAAAAAAGwAAAAAAAA4AAAAAAAAxAAAAAAIADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAzAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAAMwAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAABsAAAAAAAAOAAAAAAAARgAAAAADAEYAAAAAAgAbAAAAAAAARgAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAgAzAAAAAAIAMwAAAAADAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAQAzAAAAAAIAMwAAAAADADMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMwAAAAABADMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAzAAAAAAEAMwAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADMAAAAAAwAOAAAAAAAAMwAAAAADAA4AAAAAAAAzAAAAAAMADgAAAAAAADMAAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAADMAAAAAAAAzAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAAMwAAAAABADMAAAAAAgAzAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAADMAAAAAAQAzAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA==
           version: 7
         3,-5:
           ind: 3,-5
-          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAADMAAAAAAwAzAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAzAAAAAAIAMwAAAAAAAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAMwAAAAAAADMAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAABHAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAABAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAIAIwAAAAADACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAADwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAABHAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAADMAAAAAAQAzAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAzAAAAAAMAMwAAAAAAAA4AAAAAAABHAAAAAAEADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAMwAAAAAAADMAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAABHAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAjAAAAAAAAIwAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAADwAAAAABAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAABHAAAAAAIALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA==
           version: 7
         3,0:
           ind: 3,0
-          tiles: LAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAjAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAAIwAAAAACACMAAAAAAwAjAAAAAAMADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAQAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACMAAAAAAwAjAAAAAAMADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: LAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAjAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAAIwAAAAADACMAAAAAAAAjAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAAIwAAAAACACMAAAAAAgAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACMAAAAAAgAjAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         3,1:
           ind: 3,1
@@ -338,7 +338,7 @@ entities:
           version: 7
         5,-2:
           ind: 5,-2
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAD0AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAEAAAAAAAQBAAAAAAAAAQAAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAA9AAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAAPQAAAAACAD0AAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAQAAAAAADAA4AAAAAAABAAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAA9AAAAAAAADgAAAAAAAEAAAAAAAQBAAAAAAAAAQAAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAARwAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAABAAAAAAAIADgAAAAAAAEcAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAQAAAAAADAEAAAAAAAQBAAAAAAAIALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAEAAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAAAAA4AAAAAAAAcAAAAAAMARwAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAzAAAAAAAAMwAAAAABAA4AAAAAAAAzAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAEAAAAAAAQAOAAAAAAAALAAAAAAAACwAAAAAAABAAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAADMAAAAAAgAzAAAAAAMAMwAAAAABAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAABAAAAAAAMAQAAAAAAAAA4AAAAAAABAAAAAAAMAQAAAAAABACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAEADgAAAAAAAA4AAAAAAAAcAAAAAAIADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAcAAAAAAIADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAQAcAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAwAcAAAAAAEAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAAHAAAAAAAABwAAAAAAgAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAD0AAAAAAgAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAACAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAA9AAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAAPQAAAAAAAD0AAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAQAAAAAADAA4AAAAAAABAAAAAAAMALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAA9AAAAAAMADgAAAAAAAEAAAAAAAABAAAAAAAMAQAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAARwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAABAAAAAAAMADgAAAAAAAEcAAAAAAQAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAQAAAAAAAAEAAAAAAAwBAAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAEAAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAAAAA4AAAAAAAAcAAAAAAMARwAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAzAAAAAAIAMwAAAAADAA4AAAAAAAAzAAAAAAIADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAEAAAAAAAwAOAAAAAAAALAAAAAAAACwAAAAAAABAAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAADMAAAAAAwAzAAAAAAAAMwAAAAADAA4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAABAAAAAAAIAQAAAAAACAA4AAAAAAABAAAAAAAAAQAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAcAAAAAAIADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAQAcAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAwAcAAAAAAEAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAOAAAAAAAADgAAAAAAABwAAAAAAwAOAAAAAAAAHAAAAAAAABwAAAAAAgAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         4,0:
           ind: 4,0
@@ -350,7 +350,7 @@ entities:
           version: 7
         6,-2:
           ind: 6,-2
-          tiles: QAAAAAABAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABAAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEAAAAAAAQBHAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABAAAAAAAMADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAQAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEAAAAAAAgAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABAAAAAAAAARwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAARwAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEcAAAAAAQAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: QAAAAAACAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABAAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEAAAAAAAQBHAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABAAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAQAAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEAAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABAAAAAAAAARwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAARwAAAAABACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEcAAAAAAQAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         1,-6:
           ind: 1,-6
@@ -358,15 +358,15 @@ entities:
           version: 7
         4,-3:
           ind: 4,-3
-          tiles: DgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAADABwAAAAAAwAcAAAAAAEAHAAAAAADABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAMAHAAAAAACAC4AAAAAAAAOAAAAAAAAHAAAAAAAAEkAAAAAAABJAAAAAAEAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAACAA4AAAAAAAAcAAAAAAIASQAAAAADAEkAAAAAAAAuAAAAAAAADgAAAAAAABwAAAAAAwBJAAAAAAIASQAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAADABwAAAAAAwAOAAAAAAAAHAAAAAABABwAAAAAAgAOAAAAAAAAHAAAAAACAEkAAAAAAwAcAAAAAAAALgAAAAAAAA4AAAAAAAAcAAAAAAMASQAAAAABAEkAAAAAAwAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAAAABwAAAAAAQBJAAAAAAAASQAAAAABAC4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAwAcAAAAAAMAHAAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAACABwAAAAAAwAcAAAAAAEAHAAAAAABAA4AAAAAAAAcAAAAAAIAHAAAAAABABwAAAAAAQAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: DgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAADABwAAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAIADgAAAAAAABwAAAAAAAAcAAAAAAIAHAAAAAADAC4AAAAAAAAOAAAAAAAAHAAAAAABAEkAAAAAAABJAAAAAAMAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAAAAA4AAAAAAAAcAAAAAAEASQAAAAAAAEkAAAAAAwAsAAAAAAAADgAAAAAAABwAAAAAAQBJAAAAAAEASQAAAAADABwAAAAAAAAcAAAAAAIAHAAAAAABABwAAAAAAwAOAAAAAAAAHAAAAAACABwAAAAAAAAOAAAAAAAAHAAAAAAAAEkAAAAAAgAcAAAAAAIADgAAAAAAAA4AAAAAAAAcAAAAAAMASQAAAAABAEkAAAAAAQAcAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAAAHAAAAAACABwAAAAAAwBJAAAAAAMASQAAAAACAA4AAAAAAAAOAAAAAAAAHAAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAACABwAAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAMAHAAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAABABwAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAQAcAAAAAAEAHAAAAAADABwAAAAAAwAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAACABwAAAAAAgAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAACABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         2,-6:
           ind: 2,-6
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA8AAAAAAwBJAAAAAAMALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADwAAAAACAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA8AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAEcAAAAAAgAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA8AAAAAAwBJAAAAAAEALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADwAAAAADAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAA8AAAAAAwAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAEcAAAAAAgAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         -1,-6:
           ind: -1,-6
-          tiles: LgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAAQAAAAAAAAJAAAAAAIACQAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAACABwAAAAAAQAcAAAAAAMAHAAAAAADAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAIALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAgAcAAAAAAMADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAEcAAAAAAQAOAAAAAAAALgAAAAAAAEcAAAAAAAAJAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAABAAAAAACAAQAAAAABAAOAAAAAAAACQAAAAACAA4AAAAAAAAcAAAAAAIAHAAAAAADAEcAAAAAAQAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAMACQAAAAADAAkAAAAAAQAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAARwAAAAABAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAEcAAAAAAQAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABHAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: LgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAAQAAAAABAAJAAAAAAIACQAAAAACAA4AAAAAAAAcAAAAAAIAHAAAAAABABwAAAAAAAAcAAAAAAIAHAAAAAADAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAIALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAgAOAAAAAAAAHAAAAAAAABwAAAAAAQAcAAAAAAEADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAEcAAAAAAAAOAAAAAAAALgAAAAAAAEcAAAAAAgAJAAAAAAIADgAAAAAAABwAAAAAAwAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAABAAAAAADAAQAAAAABAAOAAAAAAAACQAAAAABAA4AAAAAAAAcAAAAAAMAHAAAAAABAEcAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAAkAAAAAAAAJAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAARwAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAEcAAAAAAgAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABHAAAAAAIALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         -1,2:
           ind: -1,2
@@ -374,7 +374,7 @@ entities:
           version: 7
         -4,-1:
           ind: -4,-1
-          tiles: LAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMADgAAAAAAAAkAAAAAAwAJAAAAAAEACQAAAAACAAkAAAAAAgAOAAAAAAAACQAAAAACAA4AAAAAAAAbAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAJAAAAAAIADgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAMADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAAHAAAAAACAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMADgAAAAAAABwAAAAAAwAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABABwAAAAAAgAOAAAAAAAALgAAAAAAAA==
+          tiles: LAAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAMADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAACAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAQAJAAAAAAMADgAAAAAAAAkAAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAgAOAAAAAAAACQAAAAACAA4AAAAAAAAbAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAgAJAAAAAAMADgAAAAAAAAkAAAAAAgAOAAAAAAAADgAAAAAAAAkAAAAAAwAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAB4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAeAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAcAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAOAAAAAAAAHAAAAAABAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEADgAAAAAAABwAAAAAAwAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAACABwAAAAAAgAOAAAAAAAALgAAAAAAAA==
           version: 7
         4,-2:
           ind: 4,-2
@@ -382,15 +382,15 @@ entities:
           version: 7
         0,-6:
           ind: 0,-6
-          tiles: DgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAABwAAAAAAgAOAAAAAAAACQAAAAADAAkAAAAAAQAJAAAAAAMADgAAAAAAAA4AAAAAAABHAAAAAAIALgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAEADgAAAAAAAAkAAAAAAgAJAAAAAAIABAAAAAABAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEABAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAARwAAAAACAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAEACQAAAAABAEcAAAAAAQAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAACAAkAAAAAAQAOAAAAAAAADgAAAAAAAEcAAAAAAQAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHQAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAB0AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAjAAAAAAIAPAAAAAAFACMAAAAAAAAjAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAdAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACMAAAAAAAAjAAAAAAAAPAAAAAAFAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA==
+          tiles: DgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAABwAAAAAAgAOAAAAAAAACQAAAAACAAkAAAAAAgAJAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAIALgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAEADgAAAAAAAAkAAAAAAAAJAAAAAAMABAAAAAACAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAEABAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAARwAAAAACAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAABAAkAAAAAAgAJAAAAAAAACQAAAAADAEcAAAAAAgAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHQAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAOAAAAAAAADgAAAAAAAB0AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAjAAAAAAEAPAAAAAAGACMAAAAAAwAjAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACQAAAAAAAAkAAAAAAAADgAAAAAAAA4AAAAAAAAdAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACMAAAAAAgAjAAAAAAMAPAAAAAAGAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA==
           version: 7
         6,-3:
           ind: 6,-3
-          tiles: DgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABHAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAQAAAAAABAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: DgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABHAAAAAAEALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAQAAAAAACAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         5,-3:
           ind: 5,-3
-          tiles: DgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAAbAAAAAAAAHAAAAAADABwAAAAAAwAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAOwAAAAAAADoAAAAAAAA7AAAAAAAAOwAAAAAAADsAAAAAAAAbAAAAAAAAGwAAAAAAAEkAAAAAAwAcAAAAAAEADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAADMAAAAAAgAzAAAAAAAAMwAAAAADADsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAA7AAAAAAAAGwAAAAAAABsAAAAAAABJAAAAAAMAHAAAAAABABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAzAAAAAAIAMwAAAAACADMAAAAAAgA6AAAAAAAAOgAAAAAAAA4AAAAAAAAOAAAAAAAAOwAAAAAAABsAAAAAAAAOAAAAAAAASQAAAAACABwAAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAMwAAAAACADMAAAAAAQAzAAAAAAIAOwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADsAAAAAAAAbAAAAAAAAGwAAAAAAABwAAAAAAAAcAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAADsAAAAAAAA6AAAAAAAAOwAAAAAAADsAAAAAAAA7AAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAAbAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAARwAAAAABAA4AAAAAAABHAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAAPQAAAAABAEcAAAAAAgAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAD0AAAAAAwA9AAAAAAEADgAAAAAAAEcAAAAAAgBAAAAAAAEADgAAAAAAAA==
+          tiles: DgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAAbAAAAAAAAHAAAAAABABwAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAOwAAAAAAADoAAAAAAAA7AAAAAAAAOwAAAAAAADsAAAAAAAAbAAAAAAAAGwAAAAAAAEkAAAAAAgAcAAAAAAMADgAAAAAAABsAAAAAAAAbAAAAAAAADgAAAAAAADMAAAAAAwAzAAAAAAEAMwAAAAABADsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAA7AAAAAAAAGwAAAAAAABsAAAAAAABJAAAAAAEAHAAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAzAAAAAAAAMwAAAAACADMAAAAAAwA6AAAAAAAAOgAAAAAAAA4AAAAAAAAOAAAAAAAAOwAAAAAAABsAAAAAAAAOAAAAAAAASQAAAAADABwAAAAAAgAOAAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAAMwAAAAABADMAAAAAAAAzAAAAAAMAOwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADsAAAAAAAAbAAAAAAAAGwAAAAAAABwAAAAAAQAcAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAADsAAAAAAAA6AAAAAAAAOwAAAAAAADsAAAAAAAA7AAAAAAAAGwAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAA6AAAAAAAAOgAAAAAAADoAAAAAAAAbAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAARwAAAAAAAA4AAAAAAABHAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAAPQAAAAADAEcAAAAAAQAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAD0AAAAAAwA9AAAAAAAADgAAAAAAAEcAAAAAAgBAAAAAAAAADgAAAAAAAA==
           version: 7
         -6,-5:
           ind: -6,-5
@@ -398,35 +398,35 @@ entities:
           version: 7
         3,-6:
           ind: 3,-6
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAPAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAASQAAAAADAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEkAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAEADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAPAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAASQAAAAABAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAEkAAAAAAwAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         4,-4:
           ind: 4,-4
-          tiles: DgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAABHAAAAAAIAHAAAAAABAEoAAAAAAwBKAAAAAAAASgAAAAACAEoAAAAAAABHAAAAAAEADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAcAAAAAAAALgAAAAAAAEkAAAAAAwBJAAAAAAAAHAAAAAADABwAAAAAAQBKAAAAAAMASgAAAAACAEoAAAAAAABKAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAAHAAAAAAAAEkAAAAAAgBJAAAAAAEASQAAAAAAABwAAAAAAAAcAAAAAAMAHAAAAAACAA4AAAAAAABHAAAAAAIALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAMAHAAAAAABABwAAAAAAgAcAAAAAAIAHAAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAABABwAAAAAAwAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAABHAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAEcAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA==
+          tiles: DgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAABHAAAAAAAAHAAAAAADAEoAAAAAAABKAAAAAAAASgAAAAADAEoAAAAAAQBHAAAAAAIADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAcAAAAAAMALgAAAAAAAEkAAAAAAgBJAAAAAAIAHAAAAAABABwAAAAAAgBKAAAAAAIASgAAAAACAEoAAAAAAQBKAAAAAAEADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAAHAAAAAADAEkAAAAAAQBJAAAAAAEASQAAAAAAABwAAAAAAgAcAAAAAAAAHAAAAAADAA4AAAAAAABHAAAAAAEALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAIAHAAAAAABABwAAAAAAwAcAAAAAAIAHAAAAAACABwAAAAAAgAcAAAAAAAAHAAAAAADABwAAAAAAgAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAABHAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAOAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAEcAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA==
           version: 7
         4,-5:
           ind: 4,-5
-          tiles: PAAAAAAEACMAAAAAAgAOAAAAAAAALAAAAAAAADwAAAAAAwAOAAAAAAAAIwAAAAABACMAAAAAAgAjAAAAAAIADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAARwAAAAACAA4AAAAAAABHAAAAAAEADgAAAAAAAA4AAAAAAABHAAAAAAIADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAIwAAAAAAAEcAAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAAIwAAAAABADwAAAAABQAjAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACMAAAAAAgA8AAAAAAYAPAAAAAABACwAAAAAAAAuAAAAAAAALAAAAAAAADwAAAAABgAjAAAAAAAAIwAAAAABAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAADwAAAAAAgA8AAAAAAUAIwAAAAACAEcAAAAAAQAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAA8AAAAAAYADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAARwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAAIwAAAAABADwAAAAABQAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAEcAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACMAAAAAAQAjAAAAAAEADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAgAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAcAAAAAAIAHAAAAAACABwAAAAAAgAOAAAAAAAADgAAAAAAABwAAAAAAwAcAAAAAAMASgAAAAACAA4AAAAAAAAOAAAAAAAASgAAAAABAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAARwAAAAABAA4AAAAAAAAsAAAAAAAAHAAAAAACAA4AAAAAAAAOAAAAAAAAHAAAAAABAEoAAAAAAQAOAAAAAAAASgAAAAAAAEoAAAAAAwAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: PAAAAAAGACMAAAAAAwAOAAAAAAAALAAAAAAAADwAAAAAAAAOAAAAAAAAIwAAAAAAACMAAAAAAwAjAAAAAAIADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAARwAAAAACAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAAIwAAAAACAEcAAAAAAQAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAAIwAAAAABADwAAAAAAwAjAAAAAAIADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACMAAAAAAwA8AAAAAAUAPAAAAAACACwAAAAAAAAuAAAAAAAALAAAAAAAADwAAAAABgAjAAAAAAAAIwAAAAADAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAADwAAAAAAQA8AAAAAAIAIwAAAAAAAEcAAAAAAQAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAA8AAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAARwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAAIwAAAAABADwAAAAAAgAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAEcAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAACMAAAAAAQAjAAAAAAIADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAIADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAARwAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAcAAAAAAEAHAAAAAAAABwAAAAAAwAOAAAAAAAADgAAAAAAABwAAAAAAgAcAAAAAAMASgAAAAADAA4AAAAAAAAOAAAAAAAASgAAAAADAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAARwAAAAAAAA4AAAAAAAAsAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADAEoAAAAAAgAOAAAAAAAASgAAAAACAEoAAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         4,-6:
           ind: 4,-6
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACMAAAAAAAAOAAAAAAAAPAAAAAAAACMAAAAAAQAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACMAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAEALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAA8AAAAAAYAIwAAAAABAA4AAAAAAAAdAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAPAAAAAAGAA4AAAAAAAAOAAAAAAAAIwAAAAABADwAAAAABgAOAAAAAAAAIwAAAAACACMAAAAAAwAOAAAAAAAARwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACMAAAAAAQAOAAAAAAAAPAAAAAADACMAAAAAAgAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACMAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAABHAAAAAAIALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAA8AAAAAAQAIwAAAAACAA4AAAAAAAAdAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAPAAAAAAEAA4AAAAAAAAOAAAAAAAAIwAAAAABADwAAAAABAAOAAAAAAAAIwAAAAABACMAAAAAAAAOAAAAAAAARwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         5,-1:
           ind: 5,-1
-          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAOAAAAAAAAHAAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAADAA4AAAAAAABHAAAAAAEADgAAAAAAAEcAAAAAAQAOAAAAAAAARwAAAAAAABwAAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAOAAAAAAAARwAAAAABAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: DgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAAAOAAAAAAAAHAAAAAACAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAABAA4AAAAAAABHAAAAAAIADgAAAAAAAEcAAAAAAgAOAAAAAAAARwAAAAACABwAAAAAAgAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAgAOAAAAAAAARwAAAAABAA4AAAAAAABHAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         5,-4:
           ind: 5,-4
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAAHAAAAAABAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAAADgAAAAAAABwAAAAAAgAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAAHAAAAAABAA4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAOAAAAAAAAHAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAcAAAAAAAADgAAAAAAABwAAAAAAQAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         -1,-7:
           ind: -1,-7
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAgAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         0,-7:
           ind: 0,-7
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAEcAAAAAAgAOAAAAAAAADgAAAAAAAEcAAAAAAQAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAQAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABHAAAAAAIALAAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAEcAAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAEcAAAAAAgAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAABHAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         1,-7:
           ind: 1,-7
@@ -434,11 +434,11 @@ entities:
           version: 7
         -3,-6:
           ind: -3,-6
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAAAAAkAAAAAAgAJAAAAAAIACQAAAAABAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAAGwAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAABsAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAAGwAAAAAAAA4AAAAAAAAbAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAOAAAAAAAACQAAAAADAAkAAAAAAgAJAAAAAAAACQAAAAAAAA==
           version: 7
         -2,-6:
           ind: -2,-6
-          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAAAAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
+          tiles: LgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAACQAAAAABAA4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAA==
           version: 7
         -4,-5:
           ind: -4,-5
@@ -454,7 +454,7 @@ entities:
           version: 7
         -4,1:
           ind: -4,1
-          tiles: DgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAADAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAQAAAAAAAAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAIACQAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAEAHAAAAAABAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAAAHAAAAAACABwAAAAAAwAcAAAAAAAAGwAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
+          tiles: DgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAbAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAHgAAAAAAAA4AAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAQAAAAAAgAJAAAAAAEADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAJAAAAAAAACQAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAkAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABsAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAMAHAAAAAACAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAADgAAAAAAAA4AAAAAAAAcAAAAAAIAHAAAAAABABwAAAAAAwAcAAAAAAEAGwAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAABwAAAAAAAAOAAAAAAAAHAAAAAADAA4AAAAAAAAOAAAAAAAADgAAAAAAACwAAAAAAAAOAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALAAAAAAAAA4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAAA4AAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAOAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAADgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAsAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAACwAAAAAAAAuAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAC4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAuAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAALgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA==
           version: 7
         6,-4:
           ind: 6,-4
@@ -479,6 +479,8 @@ entities:
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
     - type: Fixtures
@@ -677,6 +679,15 @@ entities:
             15906: 25,-9
             15907: 24,-9
             15908: 24,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: BotLeft
+          decals:
+            23769: 79,-41
+            23776: 78,-41
+            23777: 77,-41
+            23778: 80,-41
+            23785: 96,-42
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
@@ -685,6 +696,15 @@ entities:
             15901: 26,-7
             17847: 20,-3
             17848: 21,-3
+        - node:
+            color: '#FFFFFFFF'
+            id: BotRight
+          decals:
+            23774: 79,-45
+            23779: 78,-45
+            23780: 80,-45
+            23781: 81,-45
+            23786: 96,-44
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
@@ -708,15 +728,15 @@ entities:
             id: BrickTileDarkCornerNe
           decals:
             21398: -51,1
-            21438: 80,-42
             21852: -36,4
+            23782: 80,-42
+            23857: -6,-37
+            23889: -2,-41
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
           decals:
-            4120: -2,-41
-            12339: -6,-37
             20088: -4,-42
         - node:
             color: '#FFFFFFFF'
@@ -739,8 +759,9 @@ entities:
             id: BrickTileDarkCornerSe
           decals:
             21399: -51,-7
-            21436: 80,-44
             21854: -36,2
+            23737: 80,-44
+            23891: -2,-42
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
@@ -762,6 +783,11 @@ entities:
             19606: -7,-38
             19625: -11,-41
             19626: -11,-38
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkEndW
+          decals:
+            23880: -12,-41
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
@@ -770,31 +796,29 @@ entities:
             19603: -12,-38
             19623: -8,-41
             19624: -8,-38
-            19730: -12,-41
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
-            15001: -6,-41
             21440: 78,-44
             21615: -32,7
             21811: -29,-8
             21878: -41,2
+            23896: -6,-41
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
           decals:
-            21439: 80,-44
             21616: -29,7
             21810: -26,-8
             21876: -36,2
+            23740: 80,-44
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
           decals:
             17688: -38,-54
-            23732: 81,-45
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
@@ -802,34 +826,25 @@ entities:
             21441: 78,-42
             21617: -32,14
             21877: -41,4
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerSe
-          decals:
-            23733: 77,-41
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
           decals:
-            21442: 80,-42
             21618: -29,14
             21619: -30,8
             21620: -30,8
             21879: -36,4
+            23783: 80,-42
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
           decals:
-            15002: -6,-40
-            15003: -6,-39
             21400: -51,0
             21401: -51,-1
             21402: -51,-4
             21403: -51,-5
             21404: -51,-6
             21443: 78,-43
-            21450: 80,-43
             21510: 77,-42
             21511: 77,-43
             21512: 77,-44
@@ -843,12 +858,10 @@ entities:
             21806: -29,-6
             21860: -36,3
             21874: -41,3
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineE
-          decals:
-            12341: -6,-38
+            23738: 80,-43
+            23893: -6,-40
+            23894: -6,-39
+            23895: -6,-38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -856,9 +869,6 @@ entities:
             21397: -52,1
             21444: 79,-44
             21449: 79,-42
-            21501: 78,-45
-            21502: 79,-45
-            21503: 80,-45
             21607: -31,7
             21608: -30,7
             21803: -28,-8
@@ -871,20 +881,21 @@ entities:
             21866: -38,2
             21867: -39,2
             21868: -40,2
+            23858: -7,-37
+            23859: -8,-37
+            23860: -9,-37
+            23866: -10,-37
+            23867: -11,-37
+            23868: -12,-37
+            23884: -5,-42
+            23885: -5,-41
+            23886: -4,-41
+            23890: -3,-41
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
           decals:
-            4124: -5,-41
-            4125: -4,-41
-            4126: -3,-41
-            4129: -7,-37
-            4130: -8,-37
-            4131: -9,-37
-            4132: -10,-37
-            4133: -11,-37
-            4134: -12,-37
             17685: -37,-53
             17693: -39,-54
             19371: 14,26
@@ -893,7 +904,6 @@ entities:
             19374: 11,26
             20083: -7,-42
             20084: -6,-42
-            20085: -5,-42
             20089: -8,-46
         - node:
             color: '#FFFFFFFF'
@@ -901,9 +911,6 @@ entities:
           decals:
             21446: 79,-42
             21447: 79,-44
-            21504: 78,-41
-            21505: 79,-41
-            21506: 80,-41
             21605: -31,14
             21606: -30,14
             21856: -40,2
@@ -914,6 +921,7 @@ entities:
             21870: -39,4
             21871: -38,4
             21872: -37,4
+            23892: -3,-42
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
@@ -931,7 +939,6 @@ entities:
             21384: -53,-4
             21385: -53,-3
             21386: -53,-2
-            21445: 80,-43
             21448: 78,-43
             21507: 81,-42
             21508: 81,-43
@@ -946,18 +953,19 @@ entities:
             21809: -26,-6
             21873: -41,3
             21875: -36,3
+            23739: 80,-43
+            23881: -13,-38
+            23882: -13,-39
+            23883: -13,-40
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
           decals:
-            4136: -13,-38
-            4137: -13,-39
             17781: 33,-1
             17783: 33,-3
             17784: 33,-4
             17960: 33,-2
-            19642: -13,-40
             20080: -8,-43
             20081: -8,-44
             20082: -8,-45
@@ -2025,6 +2033,21 @@ entities:
             22074: 52,-36
             22075: 53,-36
             23646: 51,-36
+            23742: 58,-39
+            23743: 58,-37
+            23744: 59,-37
+            23745: 59,-39
+            23747: 60,-37
+            23748: 61,-37
+            23751: 64,-37
+            23752: 65,-37
+            23753: 66,-37
+            23756: 68,-39
+            23758: 66,-39
+            23759: 65,-39
+            23760: 64,-39
+            23761: 63,-39
+            23762: 62,-39
         - node:
             zIndex: 1
             color: '#334E6DC8'
@@ -2110,23 +2133,19 @@ entities:
             color: '#9FED5896'
             id: CheckerNWSE
           decals:
-            10602: -21,-37
-            10603: -21,-38
-            10604: -21,-39
-            10605: -15,-39
-            10606: -16,-33
-            10607: -15,-33
-            10609: -16,-32
-            10610: -16,-31
-            10611: -15,-31
-            10612: -15,-32
-            10613: -14,-32
-            10614: -14,-33
-            10615: -14,-34
             10679: -14,-39
-            10680: -13,-32
             10681: -17,-31
-            12902: -15,-34
+            23793: -21,-39
+            23794: -21,-38
+            23795: -21,-37
+            23797: -16,-31
+            23798: -15,-31
+            23801: -15,-32
+            23802: -16,-32
+            23803: -16,-33
+            23804: -15,-33
+            23807: -14,-33
+            23808: -15,-39
         - node:
             zIndex: 1
             color: '#9FED5896'
@@ -2202,6 +2221,47 @@ entities:
             21583: -36,12
             21584: -37,12
             21585: -38,12
+            23815: -8,-35
+            23816: -7,-35
+            23817: -6,-35
+            23818: -5,-35
+            23819: -4,-35
+            23820: -3,-35
+            23821: -3,-34
+            23822: -4,-34
+            23823: -5,-34
+            23824: -6,-34
+            23825: -7,-34
+            23826: -8,-34
+            23827: -8,-33
+            23828: -8,-32
+            23829: -8,-31
+            23830: -7,-31
+            23831: -7,-32
+            23832: -7,-33
+            23833: -6,-33
+            23834: -6,-32
+            23835: -6,-31
+            23836: -5,-31
+            23837: -5,-32
+            23838: -5,-33
+            23839: -4,-33
+            23840: -4,-32
+            23841: -4,-31
+            23842: -3,-31
+            23843: -3,-32
+            23844: -3,-33
+            23845: -3,-36
+            23846: -4,-36
+            23847: -9,-35
+            23848: -9,-34
+            23869: -12,-36
+            23870: -11,-36
+            23871: -10,-36
+            23876: -9,-36
+            23877: -8,-36
+            23878: -7,-36
+            23879: -6,-36
         - node:
             color: '#DE3A3A96'
             id: CheckerNWSE
@@ -2220,35 +2280,6 @@ entities:
             21738: -43,-7
             21739: -43,-8
             21740: -43,-9
-        - node:
-            zIndex: 1
-            color: '#FFFFFF93'
-            id: CheckerNWSE
-          decals:
-            14302: -10,-35
-            14303: -9,-35
-            14304: -8,-35
-            14305: -7,-35
-            14306: -7,-34
-            14307: -8,-34
-            14308: -8,-33
-            14309: -9,-33
-            14310: -9,-34
-            14311: -10,-34
-            14312: -10,-33
-            14313: -10,-32
-            14314: -10,-31
-            14315: -9,-31
-            14316: -9,-32
-            14317: -8,-32
-            14318: -8,-31
-            14319: -7,-31
-            14320: -7,-32
-            14321: -7,-33
-            14322: -11,-32
-            14323: -9,-36
-            14324: -8,-36
-            14325: -7,-36
         - node:
             cleanable: True
             zIndex: 5
@@ -2256,12 +2287,6 @@ entities:
             id: Clandestine
           decals:
             19307: 34,24
-        - node:
-            cleanable: True
-            color: '#52B4E9FF'
-            id: Cyber
-          decals:
-            3265: 0.0099077225,-26.03567
         - node:
             color: '#DE3A3A96'
             id: Delivery
@@ -2347,22 +2372,6 @@ entities:
             id: Diablo
           decals:
             12390: 39.014027,-57.014854
-        - node:
-            color: '#9FED5896'
-            id: DiagonalCheckerAOverlay
-          decals:
-            10320: -1,-35
-            10321: -1,-34
-            10322: 0,-34
-            10323: 0,-35
-            10324: 1,-35
-            10325: 1,-34
-            10326: 1,-33
-            10327: 1,-32
-            10328: 0,-32
-            10329: -1,-32
-            10330: -1,-33
-            10331: 0,-33
         - node:
             cleanable: True
             zIndex: 5
@@ -2408,9 +2417,6 @@ entities:
             13484: 87,-14
             13779: -15,17
             13786: -9,-18
-            14326: -10,-35
-            14327: -6,-32
-            14328: -4,-32
             14395: -10,-48
             14400: 15,-53
             14435: -18,-52
@@ -2501,7 +2507,6 @@ entities:
             19343: 32,22
             19385: 14,27
             19455: -44,-38
-            19683: -10,-42
             20109: -3,-12
             20147: 6,-11
             20148: 7,-10
@@ -2660,9 +2665,6 @@ entities:
             22723: -33,5
             23234: 66,-43
             23235: 66,-41
-            23236: 80,-44
-            23237: 80,-43
-            23238: 80,-42
             23300: 88,-44
             23301: 87,-44
             23302: 86,-44
@@ -2724,7 +2726,6 @@ entities:
             3964: 14,-53
             3968: 14,-54
             4018: -6,-44
-            4019: -5,-41
             4332: 27,-57
             4333: 27,-58
             4334: 28,-58
@@ -2823,15 +2824,6 @@ entities:
             6073: -16,-20
             6074: -16,-21
             6075: -17,-21
-            6155: -5,-33
-            6156: -4,-33
-            6157: -3,-33
-            6158: -3,-32
-            6159: -3,-31
-            6160: -4,-31
-            6161: -5,-31
-            6254: -18,-38
-            6255: -17,-38
             6260: -22,-39
             6261: -22,-38
             6262: -24,-39
@@ -3279,15 +3271,6 @@ entities:
             8070: 28,-5
             8080: 14,5
             8083: 1,-13
-            8096: -2,-27
-            8097: -1,-26
-            8098: 0,-29
-            8099: 0,-30
-            8100: 1,-30
-            8101: 1,-29
-            8102: -1,-30
-            8103: -3,-28
-            8104: -3,-26
             8105: 5,-31
             8106: 7,-31
             8107: 7,-31
@@ -3340,9 +3323,6 @@ entities:
             8154: 5,-24
             8155: 5,-24
             8156: 5,-26
-            8157: 3,-26
-            8158: 3,-26
-            8159: 1,-27
             8160: 1,-25
             8161: 1,-23
             8162: 1,-22
@@ -3425,9 +3405,6 @@ entities:
             8451: -7,-49
             8458: -11,-44
             8460: -11,-44
-            8464: -7,-37
-            8465: -8,-37
-            8466: -9,-37
             8507: 2,-42
             8508: 2,-43
             8509: 2,-44
@@ -3443,9 +3420,6 @@ entities:
             8519: 3,-37
             8521: 3,-34
             8522: 3,-32
-            8523: 3,-29
-            8524: 3,-27
-            8525: 2,-27
             8526: 4,-26
             8527: 5,-26
             8528: 29,-58
@@ -3531,10 +3505,6 @@ entities:
             10257: -29,-36
             10259: -29,-35
             10260: -30,-35
-            10687: -15,-32
-            10688: -16,-32
-            10691: -21,-37
-            10692: -21,-38
             11455: 29,-39
             11456: 30,-39
             11457: 30,-38
@@ -3841,13 +3811,8 @@ entities:
             12882: 85,-13
             12883: 85,-14
             12884: 88,-15
-            12903: -20,-36
             12904: -20,-35
             12905: -16,-35
-            12906: -16,-39
-            12907: -17,-39
-            12908: -18,-39
-            12909: -15,-34
             12923: 11,-31
             12924: 11,-29
             12925: 13,-29
@@ -3864,16 +3829,6 @@ entities:
             13783: 4,13
             13915: -24,-53
             13976: 33,6
-            14329: -5,-32
-            14330: -4,-31
-            14331: -7,-32
-            14332: -8,-32
-            14333: -8,-31
-            14334: -9,-31
-            14335: -10,-31
-            14336: -10,-32
-            14337: -8,-35
-            14338: -9,-35
             14390: -8,-47
             14391: -9,-48
             14392: -9,-49
@@ -3928,10 +3883,6 @@ entities:
             14993: 42,1
             14994: 41,2
             14995: 45,-4
-            15004: -6,-41
-            15005: -6,-39
-            15006: -6,-38
-            15007: -6,-40
             15190: 6,-95
             15191: 7,-94
             15192: 7,-93
@@ -5120,17 +5071,12 @@ entities:
             19392: 13,28
             19393: 14,28
             19684: -10,-41
-            19685: -11,-42
             19718: -24,-42
             19719: -26,-43
             19720: -16,-43
             19721: -18,-43
             19722: -16,-41
             19723: -18,-41
-            19724: -12,-42
-            19725: -13,-42
-            19728: -13,-41
-            19729: -13,-40
             20204: -1,-13
             20205: -1,-14
             20206: 2,-11
@@ -5783,17 +5729,10 @@ entities:
             23207: 48,-37
             23208: 48,-36
             23209: 49,-38
-            23210: 65,-38
-            23211: 68,-38
-            23212: 73,-38
-            23213: 78,-38
             23214: 77,-43
             23215: 77,-45
-            23216: 78,-45
-            23217: 80,-45
             23218: 81,-44
             23219: 81,-42
-            23220: 78,-41
             23221: 75,-41
             23222: 74,-43
             23223: 73,-45
@@ -6003,8 +5942,6 @@ entities:
             8486: -3,-38
             8487: -2,-38
             8488: -2,-39
-            8489: -3,-41
-            8492: -4,-41
             8496: 0,-45
             8497: -1,-45
             8498: -1,-44
@@ -6026,7 +5963,6 @@ entities:
             10171: -13,16
             10261: -33,-34
             10263: -29,-34
-            10693: -19,-38
             11524: 34,-36
             11667: -6,-14
             11668: -6,-15
@@ -6051,8 +5987,6 @@ entities:
             12661: 11,-64
             12662: 11,-67
             12663: 9,-57
-            12910: -20,-39
-            12911: -19,-39
             12930: 10,-31
             12948: 61,-80
             12949: 61,-79
@@ -6184,18 +6118,8 @@ entities:
             19695: -8,-46
             19696: -5,-46
             19697: -8,-38
-            19698: -12,-37
             19699: -15,-42
             19700: -18,-43
-            19701: -18,-39
-            19702: -18,-38
-            19703: -18,-37
-            19704: -19,-38
-            19705: -19,-37
-            19706: -18,-36
-            19707: -18,-36
-            19708: -17,-36
-            19709: -17,-38
             19710: -23,-39
             19711: -23,-38
             19712: -23,-37
@@ -6204,8 +6128,6 @@ entities:
             19715: -23,-35
             19716: -23,-34
             19717: -24,-34
-            19726: -12,-41
-            19727: -13,-41
             20114: -1,-14
             20115: -1,-13
             20322: -4,-11
@@ -6371,10 +6293,6 @@ entities:
             4007: -6,-56
             4008: -7,-56
             4010: -9,-60
-            4023: -8,-37
-            4024: -9,-37
-            4025: -9,-37
-            4026: -13,-39
             4361: -30,-58
             4362: -31,-57
             4368: -31,-56
@@ -6697,18 +6615,11 @@ entities:
             6123: -8,-27
             6124: -6,-27
             6130: -5,-23
-            6196: -7,-37
-            6197: -9,-37
-            6198: -10,-37
             6207: -15,-36
             6208: -15,-35
-            6210: -17,-36
             6225: -21,-35
-            6226: -21,-34
             6230: -17,-33
             6231: -18,-33
-            6232: -21,-33
-            6233: -21,-34
             6234: -21,-35
             6274: -26,-36
             6275: -25,-36
@@ -6719,15 +6630,6 @@ entities:
             6285: -25,-41
             6358: -5,-35
             6359: -4,-35
-            6360: -3,-41
-            6372: 0,-29
-            6373: 0,-30
-            6374: 1,-30
-            6375: 1,-29
-            6376: -2,-28
-            6377: -2,-27
-            6378: -3,-28
-            6379: -1,-27
             6425: -32,-58
             6427: -33,-55
             6428: -33,-55
@@ -6881,10 +6783,6 @@ entities:
             10280: -29,-35
             10281: -29,-34
             10282: -28,-34
-            10697: -21,-38
-            10701: -15,-33
-            10702: -16,-33
-            10703: -15,-32
             11709: -10,-13
             11710: -9,-14
             11711: -13,-16
@@ -6935,7 +6833,6 @@ entities:
             12634: -20,-48
             12635: -20,-43
             12636: -15,-43
-            12638: -5,-41
             12664: 10,-49
             12665: 10,-54
             12666: 9,-54
@@ -7014,11 +6911,7 @@ entities:
             12856: 90,-22
             12857: 90,-22
             12858: 90,-23
-            12916: -18,-38
             12917: -16,-38
-            12918: -20,-34
-            12919: -20,-40
-            12920: -15,-39
             12921: 14,-33
             12931: 10,-32
             12932: 13,-29
@@ -7048,9 +6941,6 @@ entities:
             13953: -8,-20
             13954: -9,-19
             13955: -8,-19
-            14350: -9,-33
-            14351: -7,-35
-            14352: -10,-37
             14354: -11,-43
             14355: -12,-43
             14356: -13,-43
@@ -7074,7 +6964,6 @@ entities:
             14470: 23,-20
             14471: 6,-26
             14473: 3,-48
-            14474: -12,-37
             14475: -29,-42
             14476: -29,-41
             14477: -22,-28
@@ -7092,7 +6981,6 @@ entities:
             14962: 42,1
             14963: 42,3
             14964: 38,3
-            15011: -6,-41
             15013: -5,-40
             15030: -13,12
             15031: 14,12
@@ -8097,10 +7985,8 @@ entities:
             23072: -43,-2
             23073: -40,-3
             23074: -35,-3
-            23244: 79,-41
             23245: 81,-41
             23246: 81,-44
-            23247: 79,-45
             23248: 77,-43
             23249: 74,-43
             23250: 74,-44
@@ -8333,31 +8219,9 @@ entities:
             6137: -5,-23
             6144: 2,-20
             6145: 3,-20
-            6146: -5,-32
-            6147: -5,-31
-            6148: -4,-31
-            6149: -3,-31
-            6150: -3,-32
-            6151: -4,-32
-            6152: -4,-33
-            6153: -5,-33
-            6154: -3,-33
             6286: -23,-41
             6296: -28,-44
             6297: -29,-44
-            6380: -3,-26
-            6381: -2,-26
-            6382: -3,-27
-            6383: -1,-26
-            6384: -3,-27
-            6385: -3,-28
-            6386: -2,-27
-            6387: 0,-27
-            6388: 2,-27
-            6389: 2,-27
-            6390: 2,-27
-            6391: 0,-27
-            6392: 1,-27
             6393: 3,-34
             6395: 3,-38
             6396: 3,-40
@@ -8467,7 +8331,6 @@ entities:
             10201: 1,18
             10202: 2,18
             10205: -2,24
-            10706: -14,-32
             10707: -23,-38
             10708: -23,-35
             10709: -23,-33
@@ -8630,10 +8493,7 @@ entities:
             12520: 16,5
             12521: 15,7
             12522: 14,7
-            12912: -20,-37
             12913: -16,-36
-            12914: -16,-34
-            12915: -20,-38
             12950: 61,-79
             12951: 62,-79
             12952: 62,-80
@@ -8648,22 +8508,9 @@ entities:
             13929: -26,-52
             13930: -25,-48
             13931: -25,-47
-            13934: -20,-38
-            13935: -20,-39
             13936: -28,-36
             13937: -28,-37
             13938: -29,-37
-            14339: -10,-34
-            14340: -7,-35
-            14341: -7,-34
-            14342: -8,-34
-            14343: -8,-33
-            14344: -10,-33
-            14345: -11,-32
-            14346: -9,-33
-            14347: -8,-33
-            14348: -8,-34
-            14349: -9,-34
             14458: 32,-31
             14459: 32,-32
             14460: 35,-32
@@ -9147,21 +8994,11 @@ entities:
             19662: -9,-42
             19663: -11,-43
             19664: -12,-43
-            19665: -11,-39
-            19666: -12,-39
-            19667: -12,-40
-            19668: -10,-40
-            19669: -9,-40
             19670: -9,-41
             19671: -10,-41
-            19672: -10,-43
             19673: -9,-43
-            19674: -10,-42
-            19675: -11,-42
             19676: -12,-43
             19677: -10,-38
-            19678: -6,-39
-            19679: -6,-40
             19680: -6,-45
             19681: -9,-46
             19682: -8,-46
@@ -9350,7 +9187,6 @@ entities:
             23189: -16,5
             23349: 81,-43
             23350: 81,-44
-            23351: 79,-45
             23352: 75,-45
             23353: 74,-45
             23354: 71,-45
@@ -10140,9 +9976,6 @@ entities:
           decals:
             10905: -10,-27
             10906: -9,-27
-            21474: 78,-45
-            21475: 79,-45
-            21476: 80,-45
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale
@@ -10260,9 +10093,6 @@ entities:
             10901: -8,-23
             10902: -10,-25
             10903: -9,-25
-            21465: 78,-41
-            21466: 79,-41
-            21467: 80,-41
         - node:
             zIndex: 1
             color: '#334E6DC8'
@@ -10624,7 +10454,6 @@ entities:
             id: QuarterTileOverlayGreyscale
           decals:
             10908: -8,-27
-            23730: 81,-45
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale
@@ -10755,11 +10584,6 @@ entities:
             id: QuarterTileOverlayGreyscale
           decals:
             22001: -44,-3
-        - node:
-            color: '#334E6DC8'
-            id: QuarterTileOverlayGreyscale180
-          decals:
-            23731: 77,-41
         - node:
             zIndex: 1
             color: '#334E6DC8'
@@ -11498,8 +11322,6 @@ entities:
           decals:
             21433: 86,-45
             21434: 86,-41
-            21517: 79,-43
-            22052: 58,-38
         - node:
             zIndex: 1
             color: '#D381C996'
@@ -12328,7 +12150,6 @@ entities:
             4941: -4,11
             5275: 10,-43
             6314: -15,-35
-            6315: -19,-36
             6316: -21,-35
             7115: 50,-36
             7116: 52,-36
@@ -12593,7 +12414,6 @@ entities:
             4827: 43,-11
             4828: 40,-12
             4829: 36,-15
-            6317: -21,-33
             6323: -14,-15
             13082: 73,-58
             13083: 73,-59
@@ -12721,11 +12541,6 @@ entities:
             23524: 92,-46
             23525: 87,-46
             23526: 87,-40
-            23555: 77,-38
-            23556: 74,-38
-            23557: 68,-38
-            23558: 64,-38
-            23559: 61,-38
             23560: 57,-39
             23561: 53,-40
             23562: 51,-40
@@ -13473,15 +13288,6 @@ entities:
             23536: 84,-44
             23537: 77,-45
             23545: 66,-41
-            23546: 70,-38
-            23547: 66,-38
-            23548: 64,-38
-            23549: 61,-38
-            23550: 63,-38
-            23551: 67,-38
-            23552: 73,-38
-            23553: 77,-38
-            23554: 79,-39
             23644: -24,-13
             23645: -20,-18
         - node:
@@ -13808,9 +13614,9 @@ entities:
           0,-1:
             0: 65535
           -4,-8:
-            0: 33663
+            0: 33655
           -4,-9:
-            0: 30579
+            0: 63347
           -5,-8:
             0: 18416
           -4,-7:
@@ -13824,39 +13630,35 @@ entities:
           -5,-5:
             0: 65023
           -3,-8:
-            0: 61919
+            0: 61567
           -3,-7:
             0: 56529
           -3,-6:
             0: 65481
           -3,-9:
-            0: 56793
+            0: 15263
           -2,-8:
-            0: 61495
-            3: 136
+            0: 61695
           -2,-7:
             0: 8176
           -2,-6:
             0: 64988
           -2,-9:
-            0: 13299
-            3: 32768
+            0: 65527
           -1,-8:
-            3: 51
-            0: 63500
+            0: 63667
           -1,-6:
             0: 65535
           -1,-5:
             0: 4095
           -1,-9:
-            3: 12288
-            0: 35059
+            0: 48115
           -1,-7:
             0: 3822
           0,-8:
-            0: 48027
+            0: 61433
           0,-7:
-            0: 12287
+            0: 12282
           0,-6:
             0: 15355
           0,-5:
@@ -14025,8 +13827,8 @@ entities:
           -3,4:
             0: 47283
           -2,1:
-            4: 273
-            5: 1092
+            3: 273
+            4: 1092
           -2,2:
             0: 65280
             1: 10
@@ -14051,7 +13853,7 @@ entities:
             1: 3328
             2: 512
           0,1:
-            6: 273
+            5: 273
             2: 3276
           0,2:
             0: 65280
@@ -14173,7 +13975,7 @@ entities:
           -6,-6:
             0: 62399
           -6,-9:
-            0: 48051
+            0: 48059
           -8,-12:
             0: 61166
           -9,-12:
@@ -15574,7 +15376,7 @@ entities:
           13,-6:
             0: 65523
           13,-9:
-            1: 17408
+            1: 19456
             0: 259
             2: 128
           14,-7:
@@ -15584,36 +15386,32 @@ entities:
           13,-12:
             1: 7168
           13,-11:
-            0: 33552
-            1: 4
+            0: 35600
+            1: 12
           13,-10:
             0: 49075
           13,-13:
             0: 13075
             1: 2176
           14,-11:
-            0: 28672
-            2: 34816
+            1: 2179
+            0: 13072
+            2: 32768
           14,-10:
-            0: 14129
-            2: 8
+            0: 65521
           14,-9:
             1: 16
-            2: 8
           14,-12:
             0: 238
+            1: 4096
           14,-13:
             0: 58606
           15,-11:
-            1: 16657
-            2: 12288
+            1: 40704
           15,-10:
-            1: 61489
-            2: 4038
-          15,-9:
-            1: 1
+            0: 65520
           15,-12:
-            1: 61672
+            1: 57576
             2: 3584
           15,-13:
             2: 33824
@@ -15622,9 +15420,12 @@ entities:
             2: 289
             1: 4178
             0: 49152
+          16,-11:
+            2: 4352
+            1: 16
+            0: 52428
           16,-10:
-            1: 61584
-            2: 3872
+            0: 65528
           12,-17:
             0: 34880
             1: 162
@@ -15798,7 +15599,7 @@ entities:
             2: 31612
           21,-9:
             2: 36356
-            1: 10
+            1: 4378
           22,-8:
             2: 57339
             1: 4
@@ -15890,8 +15691,6 @@ entities:
             2: 1
           8,-21:
             1: 4352
-          16,-11:
-            0: 52428
           17,-12:
             0: 61440
             1: 154
@@ -15899,8 +15698,10 @@ entities:
           17,-11:
             0: 62451
           17,-10:
-            1: 57456
-            2: 3840
+            0: 4368
+            1: 35904
+          17,-9:
+            1: 12
           17,-13:
             2: 16384
             1: 1092
@@ -15911,8 +15712,7 @@ entities:
           18,-11:
             0: 64732
           18,-10:
-            2: 3840
-            1: 57584
+            1: 3840
           18,-13:
             2: 32768
             1: 2184
@@ -15923,9 +15723,8 @@ entities:
           19,-11:
             0: 61422
           19,-10:
-            1: 4112
-            2: 256
-            0: 3784
+            1: 34096
+            2: 2240
           19,-13:
             1: 17065
             2: 35910
@@ -15935,6 +15734,9 @@ entities:
             1: 202
           20,-11:
             0: 15291
+          20,-10:
+            1: 9072
+            2: 4096
           11,-23:
             2: 49152
           11,-22:
@@ -16058,8 +15860,9 @@ entities:
             1: 584
           20,-13:
             1: 12560
-          20,-10:
-            1: 608
+          20,-9:
+            1: 3237
+            2: 66
           21,-12:
             2: 19
             0: 51200
@@ -16293,11 +16096,6 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles: {}
-        - volume: 2500
-          temperature: 235
-          moles:
-            Oxygen: 27.225372
-            Nitrogen: 102.419266
         - volume: 2500
           temperature: 293.15
           moles:
@@ -16425,10 +16223,11 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 24721
-      - 17941
+      - 18032
+      - 585
       - 24828
       - 1913
+      - 22069
     - type: Fixtures
       fixtures: {}
   - uid: 1931
@@ -16451,6 +16250,27 @@ entities:
       - 19646
     - type: Fixtures
       fixtures: {}
+  - uid: 1933
+    components:
+    - type: MetaData
+      name: Kitchen Air Alarm
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-32.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 7085
+      - 2562
+      - 2503
+      - 1725
+      - 1689
+      - 2257
+      - 2307
+      - 2451
+      - 1698
+    - type: Fixtures
+      fixtures: {}
   - uid: 2196
     components:
     - type: MetaData
@@ -17348,12 +17168,8 @@ entities:
       - 11465
       - 11259
       - 682
-      - 15165
-      - 15164
-      - 15150
       - 15080
       - 13168
-      - 15137
     - type: Fixtures
       fixtures: {}
   - uid: 15205
@@ -17662,22 +17478,6 @@ entities:
       - 5318
     - type: Fixtures
       fixtures: {}
-  - uid: 17576
-    components:
-    - type: Transform
-      pos: -6.5,-29.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 15137
-      - 15115
-      - 23108
-      - 15150
-      - 15165
-      - 15164
-      - 17582
-    - type: Fixtures
-      fixtures: {}
   - uid: 18894
     components:
     - type: Transform
@@ -17686,9 +17486,9 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 18900
       - 18901
-      - 18899
+      - 23117
+      - 18523
     - type: Fixtures
       fixtures: {}
   - uid: 18902
@@ -18109,15 +17909,18 @@ entities:
       fixtures: {}
 - proto: AirAlarmFreezer
   entities:
-  - uid: 22282
+  - uid: 2191
     components:
+    - type: MetaData
+      name: Freezer Air Alarm
     - type: Transform
-      pos: -3.5,-29.5
+      pos: -10.5,-29.5
       parent: 2
     - type: DeviceList
       devices:
-      - 9463
-      - 9632
+      - 7072
+      - 13399
+      - 11781
     - type: Fixtures
       fixtures: {}
 - proto: AirCanister
@@ -18579,6 +18382,11 @@ entities:
     - type: Transform
       pos: -23.5,-43.5
       parent: 2
+  - uid: 16539
+    components:
+    - type: Transform
+      pos: 67.5,-39.5
+      parent: 2
   - uid: 16587
     components:
     - type: Transform
@@ -19024,18 +18832,6 @@ entities:
           - InputB
 - proto: AirlockExternalGlassCommandLocked
   entities:
-  - uid: 16561
-    components:
-    - type: Transform
-      pos: 58.5,-40.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        16847:
-        - - DoorStatus
-          - DoorBolt
   - uid: 16847
     components:
     - type: Transform
@@ -19045,31 +18841,19 @@ entities:
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        16561:
+        24537:
         - - DoorStatus
           - DoorBolt
-  - uid: 24735
+  - uid: 24537
     components:
     - type: Transform
-      pos: 79.5,-39.5
+      pos: 56.5,-42.5
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        24736:
-        - - DoorStatus
-          - DoorBolt
-  - uid: 24736
-    components:
-    - type: Transform
-      pos: 77.5,-37.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        24735:
+        16847:
         - - DoorStatus
           - DoorBolt
 - proto: AirlockExternalGlassEngineeringLocked
@@ -19747,17 +19531,29 @@ entities:
     - type: Transform
       pos: -32.5,5.5
       parent: 2
+- proto: AirlockFreezerHydroponicsLocked
+  entities:
+  - uid: 2945
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-32.5
+      parent: 2
+- proto: AirlockFreezerKitchenHydroLocked
+  entities:
+  - uid: 17580
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-34.5
+      parent: 2
 - proto: AirlockFreezerLocked
   entities:
-  - uid: 2608
+  - uid: 3383
     components:
     - type: Transform
-      pos: -1.5,-31.5
-      parent: 2
-  - uid: 3232
-    components:
-    - type: Transform
-      pos: -5.5,-31.5
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-31.5
       parent: 2
 - proto: AirlockGlass
   entities:
@@ -20228,11 +20024,6 @@ entities:
       parent: 2
 - proto: AirlockHydroponicsLocked
   entities:
-  - uid: 141
-    components:
-    - type: Transform
-      pos: -12.5,-31.5
-      parent: 2
   - uid: 3301
     components:
     - type: Transform
@@ -20257,19 +20048,10 @@ entities:
       parent: 2
 - proto: AirlockKitchenLocked
   entities:
-  - uid: 260
-    components:
-    - type: Transform
-      pos: -10.5,-31.5
-      parent: 2
-  - uid: 3485
-    components:
-    - type: Transform
-      pos: -5.5,-34.5
-      parent: 2
-  - uid: 7072
+  - uid: 3275
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-34.5
       parent: 2
 - proto: AirlockMaintCargoLocked
@@ -20344,6 +20126,14 @@ entities:
     - type: Transform
       pos: 27.5,-1.5
       parent: 2
+- proto: AirlockMaintKitchenLocked
+  entities:
+  - uid: 5061
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-31.5
+      parent: 2
 - proto: AirlockMaintLawyerLocked
   entities:
   - uid: 2327
@@ -20408,16 +20198,6 @@ entities:
     - type: Transform
       pos: -10.5,21.5
       parent: 2
-  - uid: 3286
-    components:
-    - type: Transform
-      pos: -11.5,-35.5
-      parent: 2
-  - uid: 3288
-    components:
-    - type: Transform
-      pos: -11.5,-29.5
-      parent: 2
   - uid: 3289
     components:
     - type: Transform
@@ -20721,11 +20501,6 @@ entities:
     - type: Transform
       pos: 16.5,-53.5
       parent: 2
-  - uid: 15854
-    components:
-    - type: Transform
-      pos: 0.5,-30.5
-      parent: 2
 - proto: AirlockMaintServiceTheatreLocked
   entities:
   - uid: 302
@@ -21171,6 +20946,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13549
+  - uid: 1725
+    components:
+    - type: Transform
+      pos: 1.5,-33.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1933
   - uid: 1809
     components:
     - type: Transform
@@ -21181,6 +20964,14 @@ entities:
       - 14795
       - 15139
       - 58
+  - uid: 2503
+    components:
+    - type: Transform
+      pos: -4.5,-32.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1933
   - uid: 2524
     components:
     - type: Transform
@@ -21488,15 +21279,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7178
-  - uid: 15137
-    components:
-    - type: Transform
-      pos: -7.5,-31.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17576
-      - 15139
   - uid: 15138
     components:
     - type: Transform
@@ -21631,14 +21413,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 17351
-  - uid: 17582
-    components:
-    - type: Transform
-      pos: 0.5,-32.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17576
   - uid: 18822
     components:
     - type: Transform
@@ -21732,6 +21506,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 9147
+  - uid: 22069
+    components:
+    - type: Transform
+      pos: 62.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1909
   - uid: 22070
     components:
     - type: Transform
@@ -22025,14 +21807,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 24601
-  - uid: 24721
-    components:
-    - type: Transform
-      pos: 56.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 1909
   - uid: 24828
     components:
     - type: Transform
@@ -22041,6 +21815,16 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 1909
+- proto: AirSensorFreezer
+  entities:
+  - uid: 11781
+    components:
+    - type: Transform
+      pos: -11.5,-31.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2191
 - proto: AltarConvertMaint
   entities:
   - uid: 9055
@@ -22453,6 +22237,15 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 9988
+    components:
+    - type: MetaData
+      name: Kitchen APC
+    - type: Transform
+      pos: -4.5,-29.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 10247
     components:
     - type: MetaData
@@ -22528,14 +22321,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 11678
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-33.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 11792
     components:
     - type: MetaData
@@ -23081,7 +22866,7 @@ entities:
   - uid: 17097
     components:
     - type: Transform
-      pos: 67.38669,-41.3021
+      pos: 66.314896,-41.232117
       parent: 2
 - proto: Ashtray
   entities:
@@ -23095,6 +22880,11 @@ entities:
     - type: Transform
       pos: -27.473076,-46.23464
       parent: 2
+  - uid: 3550
+    components:
+    - type: Transform
+      pos: 1.6437479,-33.79395
+      parent: 2
   - uid: 5611
     components:
     - type: Transform
@@ -23137,7 +22927,7 @@ entities:
   - uid: 16752
     components:
     - type: Transform
-      pos: 67.41116,-43.260357
+      pos: 66.58586,-42.482986
       parent: 2
 - proto: AsteroidRock
   entities:
@@ -23216,18 +23006,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 57.5,-16.5
       parent: 2
-  - uid: 7774
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-31.5
-      parent: 2
-  - uid: 7775
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-31.5
-      parent: 2
   - uid: 13368
     components:
     - type: Transform
@@ -23322,7 +23100,7 @@ entities:
   - uid: 411
     components:
     - type: Transform
-      pos: 62.5,-37.5
+      pos: 59.5,-40.5
       parent: 2
   - uid: 586
     components:
@@ -23389,6 +23167,11 @@ entities:
     - type: Transform
       pos: 21.5,28.5
       parent: 2
+  - uid: 1743
+    components:
+    - type: Transform
+      pos: 64.5,-40.5
+      parent: 2
   - uid: 1772
     components:
     - type: Transform
@@ -23419,6 +23202,11 @@ entities:
     - type: Transform
       pos: 57.5,0.5
       parent: 2
+  - uid: 3408
+    components:
+    - type: Transform
+      pos: 64.5,-41.5
+      parent: 2
   - uid: 3465
     components:
     - type: Transform
@@ -23729,11 +23517,6 @@ entities:
     - type: Transform
       pos: 4.5,-90.5
       parent: 2
-  - uid: 6961
-    components:
-    - type: Transform
-      pos: 63.5,-37.5
-      parent: 2
   - uid: 7016
     components:
     - type: Transform
@@ -25759,6 +25542,16 @@ entities:
     - type: Transform
       pos: -55.5,-0.5
       parent: 2
+  - uid: 16523
+    components:
+    - type: Transform
+      pos: 81.5,-35.5
+      parent: 2
+  - uid: 16542
+    components:
+    - type: Transform
+      pos: 79.5,-37.5
+      parent: 2
   - uid: 16545
     components:
     - type: Transform
@@ -25769,11 +25562,21 @@ entities:
     - type: Transform
       pos: 75.5,-54.5
       parent: 2
+  - uid: 16564
+    components:
+    - type: Transform
+      pos: 80.5,-36.5
+      parent: 2
   - uid: 16566
     components:
     - type: Transform
       pos: 77.5,-53.5
       parent: 2
+  - uid: 16567
+    components:
+    - type: Transform
+      pos: 79.5,-38.5
+      parent: 2
   - uid: 16577
     components:
     - type: Transform
@@ -26129,6 +25932,11 @@ entities:
     - type: Transform
       pos: 44.5,-69.5
       parent: 2
+  - uid: 17941
+    components:
+    - type: Transform
+      pos: 78.5,-38.5
+      parent: 2
   - uid: 17964
     components:
     - type: Transform
@@ -26299,10 +26107,10 @@ entities:
     - type: Transform
       pos: 92.5,-35.5
       parent: 2
-  - uid: 18436
+  - uid: 18469
     components:
     - type: Transform
-      pos: 65.5,-38.5
+      pos: 82.5,-34.5
       parent: 2
   - uid: 18479
     components:
@@ -27859,76 +27667,6 @@ entities:
     - type: Transform
       pos: 64.5,-58.5
       parent: 2
-  - uid: 19563
-    components:
-    - type: Transform
-      pos: 64.5,-37.5
-      parent: 2
-  - uid: 19565
-    components:
-    - type: Transform
-      pos: 65.5,-37.5
-      parent: 2
-  - uid: 19566
-    components:
-    - type: Transform
-      pos: 66.5,-37.5
-      parent: 2
-  - uid: 19567
-    components:
-    - type: Transform
-      pos: 67.5,-37.5
-      parent: 2
-  - uid: 19568
-    components:
-    - type: Transform
-      pos: 68.5,-37.5
-      parent: 2
-  - uid: 19569
-    components:
-    - type: Transform
-      pos: 69.5,-37.5
-      parent: 2
-  - uid: 19571
-    components:
-    - type: Transform
-      pos: 70.5,-37.5
-      parent: 2
-  - uid: 19572
-    components:
-    - type: Transform
-      pos: 71.5,-37.5
-      parent: 2
-  - uid: 19573
-    components:
-    - type: Transform
-      pos: 72.5,-37.5
-      parent: 2
-  - uid: 19580
-    components:
-    - type: Transform
-      pos: 73.5,-37.5
-      parent: 2
-  - uid: 19581
-    components:
-    - type: Transform
-      pos: 74.5,-37.5
-      parent: 2
-  - uid: 19582
-    components:
-    - type: Transform
-      pos: 75.5,-37.5
-      parent: 2
-  - uid: 19583
-    components:
-    - type: Transform
-      pos: 76.5,-37.5
-      parent: 2
-  - uid: 19590
-    components:
-    - type: Transform
-      pos: 59.5,-35.5
-      parent: 2
   - uid: 19592
     components:
     - type: Transform
@@ -29874,108 +29612,6 @@ entities:
     - type: Transform
       pos: -30.5,30.5
       parent: 2
-  - uid: 24750
-    components:
-    - type: Transform
-      pos: 63.5,-38.5
-      parent: 2
-  - uid: 24756
-    components:
-    - type: Transform
-      pos: 59.5,-40.5
-      parent: 2
-  - uid: 24757
-    components:
-    - type: Transform
-      pos: 61.5,-40.5
-      parent: 2
-  - uid: 24758
-    components:
-    - type: Transform
-      pos: 62.5,-39.5
-      parent: 2
-  - uid: 24759
-    components:
-    - type: Transform
-      pos: 59.5,-41.5
-      parent: 2
-  - uid: 24764
-    components:
-    - type: Transform
-      pos: 61.5,-37.5
-      parent: 2
-  - uid: 24765
-    components:
-    - type: Transform
-      pos: 60.5,-37.5
-      parent: 2
-  - uid: 24773
-    components:
-    - type: Transform
-      pos: 62.5,-38.5
-      parent: 2
-  - uid: 24774
-    components:
-    - type: Transform
-      pos: 59.5,-39.5
-      parent: 2
-  - uid: 24775
-    components:
-    - type: Transform
-      pos: 60.5,-40.5
-      parent: 2
-  - uid: 24777
-    components:
-    - type: Transform
-      pos: 61.5,-39.5
-      parent: 2
-- proto: AtmosFixFreezerMarker
-  entities:
-  - uid: 7764
-    components:
-    - type: Transform
-      pos: -4.5,-30.5
-      parent: 2
-  - uid: 7766
-    components:
-    - type: Transform
-      pos: -4.5,-31.5
-      parent: 2
-  - uid: 7767
-    components:
-    - type: Transform
-      pos: -4.5,-32.5
-      parent: 2
-  - uid: 7768
-    components:
-    - type: Transform
-      pos: -3.5,-30.5
-      parent: 2
-  - uid: 7769
-    components:
-    - type: Transform
-      pos: -3.5,-31.5
-      parent: 2
-  - uid: 7770
-    components:
-    - type: Transform
-      pos: -2.5,-30.5
-      parent: 2
-  - uid: 7771
-    components:
-    - type: Transform
-      pos: -2.5,-31.5
-      parent: 2
-  - uid: 7772
-    components:
-    - type: Transform
-      pos: -2.5,-32.5
-      parent: 2
-  - uid: 7773
-    components:
-    - type: Transform
-      pos: -3.5,-32.5
-      parent: 2
 - proto: AtmosFixNitrogenMarker
   entities:
   - uid: 7690
@@ -30218,11 +29854,6 @@ entities:
       parent: 2
 - proto: Beaker
   entities:
-  - uid: 2451
-    components:
-    - type: Transform
-      pos: -8.110996,-30.369019
-      parent: 2
   - uid: 10490
     components:
     - type: Transform
@@ -30596,11 +30227,17 @@ entities:
     - type: Transform
       pos: -27.5,16.5
       parent: 2
-  - uid: 22709
+  - uid: 10445
     components:
     - type: Transform
-      pos: -16.5,-36.5
+      pos: -16.5,-37.5
       parent: 2
+    - type: TechnologyDatabase
+      supportedDisciplines:
+      - Industrial
+      - Arsenal
+      - Experimental
+      - CivilianServices
 - proto: BlastDoor
   entities:
   - uid: 113
@@ -31036,15 +30673,15 @@ entities:
       parent: 2
 - proto: BoxBeaker
   entities:
-  - uid: 3178
+  - uid: 3274
     components:
     - type: Transform
-      pos: -2.4426155,-35.34611
+      pos: -2.5086322,-31.447203
       parent: 2
   - uid: 3328
     components:
     - type: Transform
-      pos: -13.518328,-33.4524
+      pos: -13.489489,-33.3367
       parent: 2
   - uid: 12112
     components:
@@ -31157,6 +30794,13 @@ entities:
     - type: Transform
       pos: 51.482468,-39.306274
       parent: 2
+- proto: BoxFolderClipboardThreePapers
+  entities:
+  - uid: 7014
+    components:
+    - type: Transform
+      pos: 0.5610032,-34.41935
+      parent: 2
 - proto: BoxFolderRed
   entities:
   - uid: 861
@@ -31409,16 +31053,8 @@ entities:
   - uid: 3440
     components:
     - type: Transform
-      pos: -17.678139,-32.665504
+      pos: -17.727388,-32.693466
       parent: 2
-  - uid: 3464
-    components:
-    - type: Transform
-      pos: -13.459316,-32.28296
-      parent: 2
-    - type: CollisionWake
-      enabled: False
-    - type: Conveyed
   - uid: 5753
     components:
     - type: Transform
@@ -31462,24 +31098,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: -28.5,-49.5
       parent: 2
-  - uid: 495
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-33.5
-      parent: 2
-  - uid: 654
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-35.5
-      parent: 2
   - uid: 1694
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -23.5,-7.5
       parent: 2
+  - uid: 3596
+    components:
+    - type: Transform
+      pos: -19.5,-31.5
+      parent: 2
+  - uid: 4264
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-35.5
+      parent: 2
   - uid: 5481
     components:
     - type: Transform
@@ -31823,6 +31458,11 @@ entities:
     - type: Transform
       pos: -37.5,-15.5
       parent: 2
+  - uid: 260
+    components:
+    - type: Transform
+      pos: -4.5,-33.5
+      parent: 2
   - uid: 329
     components:
     - type: Transform
@@ -31886,7 +31526,7 @@ entities:
   - uid: 480
     components:
     - type: Transform
-      pos: 1.5,-25.5
+      pos: -2.5,-34.5
       parent: 2
   - uid: 484
     components:
@@ -32193,6 +31833,11 @@ entities:
     - type: Transform
       pos: -9.5,-2.5
       parent: 2
+  - uid: 1038
+    components:
+    - type: Transform
+      pos: 64.5,-37.5
+      parent: 2
   - uid: 1041
     components:
     - type: Transform
@@ -32233,6 +31878,11 @@ entities:
     - type: Transform
       pos: -20.5,-15.5
       parent: 2
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: 1.5,-29.5
+      parent: 2
   - uid: 1205
     components:
     - type: Transform
@@ -32253,6 +31903,11 @@ entities:
     - type: Transform
       pos: -24.5,-16.5
       parent: 2
+  - uid: 1227
+    components:
+    - type: Transform
+      pos: 65.5,-37.5
+      parent: 2
   - uid: 1240
     components:
     - type: Transform
@@ -32598,6 +32253,11 @@ entities:
     - type: Transform
       pos: -22.5,22.5
       parent: 2
+  - uid: 1839
+    components:
+    - type: Transform
+      pos: 62.5,-37.5
+      parent: 2
   - uid: 1847
     components:
     - type: Transform
@@ -32748,6 +32408,11 @@ entities:
     - type: Transform
       pos: 0.5,-0.5
       parent: 2
+  - uid: 2074
+    components:
+    - type: Transform
+      pos: 60.5,-37.5
+      parent: 2
   - uid: 2082
     components:
     - type: Transform
@@ -32838,6 +32503,11 @@ entities:
     - type: Transform
       pos: -34.5,-58.5
       parent: 2
+  - uid: 2170
+    components:
+    - type: Transform
+      pos: 56.5,-37.5
+      parent: 2
   - uid: 2175
     components:
     - type: Transform
@@ -32863,6 +32533,11 @@ entities:
     - type: Transform
       pos: -38.5,-57.5
       parent: 2
+  - uid: 2203
+    components:
+    - type: Transform
+      pos: 58.5,-37.5
+      parent: 2
   - uid: 2207
     components:
     - type: Transform
@@ -33123,6 +32798,11 @@ entities:
     - type: Transform
       pos: -12.5,-62.5
       parent: 2
+  - uid: 2585
+    components:
+    - type: Transform
+      pos: 66.5,-44.5
+      parent: 2
   - uid: 2614
     components:
     - type: Transform
@@ -33163,6 +32843,21 @@ entities:
     - type: Transform
       pos: 24.5,-3.5
       parent: 2
+  - uid: 2682
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 2
+  - uid: 2687
+    components:
+    - type: Transform
+      pos: 3.5,-29.5
+      parent: 2
+  - uid: 2688
+    components:
+    - type: Transform
+      pos: 3.5,-28.5
+      parent: 2
   - uid: 2689
     components:
     - type: Transform
@@ -33883,6 +33578,41 @@ entities:
     - type: Transform
       pos: -52.5,21.5
       parent: 2
+  - uid: 3258
+    components:
+    - type: Transform
+      pos: 6.5,-25.5
+      parent: 2
+  - uid: 3259
+    components:
+    - type: Transform
+      pos: 7.5,-25.5
+      parent: 2
+  - uid: 3260
+    components:
+    - type: Transform
+      pos: 8.5,-25.5
+      parent: 2
+  - uid: 3263
+    components:
+    - type: Transform
+      pos: 2.5,-26.5
+      parent: 2
+  - uid: 3264
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 2
+  - uid: 3265
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 2
+  - uid: 3269
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 2
   - uid: 3277
     components:
     - type: Transform
@@ -33958,11 +33688,31 @@ entities:
     - type: Transform
       pos: -0.5,-6.5
       parent: 2
+  - uid: 3446
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 2
   - uid: 3463
     components:
     - type: Transform
       pos: -9.5,9.5
       parent: 2
+  - uid: 3466
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 2
+  - uid: 3482
+    components:
+    - type: Transform
+      pos: 2.5,-29.5
+      parent: 2
+  - uid: 3485
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 2
   - uid: 3498
     components:
     - type: Transform
@@ -33978,6 +33728,11 @@ entities:
     - type: Transform
       pos: -0.5,12.5
       parent: 2
+  - uid: 3624
+    components:
+    - type: Transform
+      pos: -5.5,-31.5
+      parent: 2
   - uid: 3626
     components:
     - type: Transform
@@ -34003,21 +33758,11 @@ entities:
     - type: Transform
       pos: 1.5,-22.5
       parent: 2
-  - uid: 3657
-    components:
-    - type: Transform
-      pos: 1.5,-23.5
-      parent: 2
   - uid: 3662
     components:
     - type: Transform
       pos: 10.5,-49.5
       parent: 2
-  - uid: 3664
-    components:
-    - type: Transform
-      pos: 1.5,-24.5
-      parent: 2
   - uid: 3678
     components:
     - type: Transform
@@ -34083,6 +33828,11 @@ entities:
     - type: Transform
       pos: 3.5,-12.5
       parent: 2
+  - uid: 3872
+    components:
+    - type: Transform
+      pos: -6.5,-34.5
+      parent: 2
   - uid: 3877
     components:
     - type: Transform
@@ -34148,6 +33898,11 @@ entities:
     - type: Transform
       pos: -8.5,-43.5
       parent: 2
+  - uid: 4290
+    components:
+    - type: Transform
+      pos: -1.5,-27.5
+      parent: 2
   - uid: 4344
     components:
     - type: Transform
@@ -34273,11 +34028,21 @@ entities:
     - type: Transform
       pos: -29.5,23.5
       parent: 2
+  - uid: 4935
+    components:
+    - type: Transform
+      pos: 67.5,-37.5
+      parent: 2
   - uid: 4968
     components:
     - type: Transform
       pos: -31.5,-48.5
       parent: 2
+  - uid: 4972
+    components:
+    - type: Transform
+      pos: 68.5,-37.5
+      parent: 2
   - uid: 4999
     components:
     - type: Transform
@@ -34303,6 +34068,11 @@ entities:
     - type: Transform
       pos: 36.5,7.5
       parent: 2
+  - uid: 5055
+    components:
+    - type: Transform
+      pos: 0.5,-29.5
+      parent: 2
   - uid: 5205
     components:
     - type: Transform
@@ -34648,11 +34418,21 @@ entities:
     - type: Transform
       pos: 22.5,12.5
       parent: 2
+  - uid: 6179
+    components:
+    - type: Transform
+      pos: 65.5,-42.5
+      parent: 2
   - uid: 6287
     components:
     - type: Transform
       pos: 31.5,-67.5
       parent: 2
+  - uid: 6294
+    components:
+    - type: Transform
+      pos: 56.5,-41.5
+      parent: 2
   - uid: 6316
     components:
     - type: Transform
@@ -34963,6 +34743,11 @@ entities:
     - type: Transform
       pos: 40.5,-7.5
       parent: 2
+  - uid: 7063
+    components:
+    - type: Transform
+      pos: -6.5,-32.5
+      parent: 2
   - uid: 7088
     components:
     - type: Transform
@@ -35163,11 +34948,6 @@ entities:
     - type: Transform
       pos: 25.5,-3.5
       parent: 2
-  - uid: 7674
-    components:
-    - type: Transform
-      pos: 0.5,-33.5
-      parent: 2
   - uid: 7676
     components:
     - type: Transform
@@ -36098,6 +35878,11 @@ entities:
     - type: Transform
       pos: 54.5,-53.5
       parent: 2
+  - uid: 10005
+    components:
+    - type: Transform
+      pos: 54.5,-37.5
+      parent: 2
   - uid: 10006
     components:
     - type: Transform
@@ -36273,6 +36058,11 @@ entities:
     - type: Transform
       pos: 4.5,-22.5
       parent: 2
+  - uid: 10264
+    components:
+    - type: Transform
+      pos: 0.5,-34.5
+      parent: 2
   - uid: 10315
     components:
     - type: Transform
@@ -36598,11 +36388,6 @@ entities:
     - type: Transform
       pos: -49.5,-50.5
       parent: 2
-  - uid: 10443
-    components:
-    - type: Transform
-      pos: 0.5,-32.5
-      parent: 2
   - uid: 10473
     components:
     - type: Transform
@@ -36763,6 +36548,11 @@ entities:
     - type: Transform
       pos: 6.5,1.5
       parent: 2
+  - uid: 11011
+    components:
+    - type: Transform
+      pos: 55.5,-37.5
+      parent: 2
   - uid: 11036
     components:
     - type: Transform
@@ -37118,6 +36908,11 @@ entities:
     - type: Transform
       pos: 45.5,-10.5
       parent: 2
+  - uid: 11657
+    components:
+    - type: Transform
+      pos: -4.5,-34.5
+      parent: 2
   - uid: 11703
     components:
     - type: Transform
@@ -37303,135 +37098,25 @@ entities:
     - type: Transform
       pos: -19.5,-30.5
       parent: 2
-  - uid: 11749
-    components:
-    - type: Transform
-      pos: -14.5,-31.5
-      parent: 2
-  - uid: 11750
-    components:
-    - type: Transform
-      pos: -13.5,-31.5
-      parent: 2
-  - uid: 11751
-    components:
-    - type: Transform
-      pos: -10.5,-33.5
-      parent: 2
-  - uid: 11752
-    components:
-    - type: Transform
-      pos: -9.5,-33.5
-      parent: 2
-  - uid: 11753
-    components:
-    - type: Transform
-      pos: -8.5,-33.5
-      parent: 2
-  - uid: 11754
-    components:
-    - type: Transform
-      pos: -8.5,-32.5
-      parent: 2
-  - uid: 11755
-    components:
-    - type: Transform
-      pos: -8.5,-31.5
-      parent: 2
-  - uid: 11756
-    components:
-    - type: Transform
-      pos: -7.5,-31.5
-      parent: 2
-  - uid: 11757
-    components:
-    - type: Transform
-      pos: -6.5,-31.5
-      parent: 2
-  - uid: 11758
-    components:
-    - type: Transform
-      pos: -5.5,-31.5
-      parent: 2
-  - uid: 11759
-    components:
-    - type: Transform
-      pos: -4.5,-31.5
-      parent: 2
-  - uid: 11760
-    components:
-    - type: Transform
-      pos: -3.5,-31.5
-      parent: 2
-  - uid: 11761
-    components:
-    - type: Transform
-      pos: -2.5,-31.5
-      parent: 2
   - uid: 11762
     components:
     - type: Transform
-      pos: -1.5,-31.5
-      parent: 2
-  - uid: 11763
-    components:
-    - type: Transform
-      pos: -0.5,-31.5
-      parent: 2
-  - uid: 11764
-    components:
-    - type: Transform
-      pos: 0.5,-31.5
-      parent: 2
-  - uid: 11765
-    components:
-    - type: Transform
-      pos: 0.5,-30.5
+      pos: -3.5,-34.5
       parent: 2
   - uid: 11767
     components:
     - type: Transform
-      pos: -6.5,-34.5
+      pos: -1.5,-34.5
       parent: 2
   - uid: 11768
     components:
     - type: Transform
       pos: 16.5,-6.5
       parent: 2
-  - uid: 11769
-    components:
-    - type: Transform
-      pos: -7.5,-34.5
-      parent: 2
-  - uid: 11771
-    components:
-    - type: Transform
-      pos: -8.5,-34.5
-      parent: 2
   - uid: 11773
     components:
     - type: Transform
-      pos: -5.5,-34.5
-      parent: 2
-  - uid: 11775
-    components:
-    - type: Transform
-      pos: -4.5,-34.5
-      parent: 2
-  - uid: 11776
-    components:
-    - type: Transform
-      pos: -3.5,-34.5
-      parent: 2
-  - uid: 11780
-    components:
-    - type: Transform
-      pos: -2.5,-34.5
-      parent: 2
-  - uid: 11781
-    components:
-    - type: Transform
-      pos: -1.5,-34.5
+      pos: -10.5,-31.5
       parent: 2
   - uid: 11798
     components:
@@ -38083,6 +37768,16 @@ entities:
     - type: Transform
       pos: 8.5,-3.5
       parent: 2
+  - uid: 13161
+    components:
+    - type: Transform
+      pos: -11.5,-31.5
+      parent: 2
+  - uid: 13164
+    components:
+    - type: Transform
+      pos: -11.5,-32.5
+      parent: 2
   - uid: 13185
     components:
     - type: Transform
@@ -38253,6 +37948,11 @@ entities:
     - type: Transform
       pos: 31.5,-3.5
       parent: 2
+  - uid: 13346
+    components:
+    - type: Transform
+      pos: -11.5,-33.5
+      parent: 2
   - uid: 13352
     components:
     - type: Transform
@@ -39438,6 +39138,11 @@ entities:
     - type: Transform
       pos: -33.5,-48.5
       parent: 2
+  - uid: 16543
+    components:
+    - type: Transform
+      pos: 65.5,-40.5
+      parent: 2
   - uid: 16579
     components:
     - type: Transform
@@ -40458,11 +40163,21 @@ entities:
     - type: Transform
       pos: 18.5,-43.5
       parent: 2
+  - uid: 17573
+    components:
+    - type: Transform
+      pos: 0.5,-33.5
+      parent: 2
   - uid: 17574
     components:
     - type: Transform
       pos: 17.5,-43.5
       parent: 2
+  - uid: 17578
+    components:
+    - type: Transform
+      pos: -6.5,-33.5
+      parent: 2
   - uid: 17590
     components:
     - type: Transform
@@ -40623,25 +40338,10 @@ entities:
     - type: Transform
       pos: -48.5,-20.5
       parent: 2
-  - uid: 17662
-    components:
-    - type: Transform
-      pos: 1.5,-26.5
-      parent: 2
-  - uid: 17663
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 2
   - uid: 17664
     components:
     - type: Transform
-      pos: -0.5,-26.5
-      parent: 2
-  - uid: 17665
-    components:
-    - type: Transform
-      pos: 2.5,-25.5
+      pos: -9.5,-31.5
       parent: 2
   - uid: 17666
     components:
@@ -40656,22 +40356,12 @@ entities:
   - uid: 17668
     components:
     - type: Transform
-      pos: 5.5,-25.5
-      parent: 2
-  - uid: 17669
-    components:
-    - type: Transform
-      pos: 6.5,-25.5
-      parent: 2
-  - uid: 17670
-    components:
-    - type: Transform
-      pos: 7.5,-25.5
+      pos: -4.5,-29.5
       parent: 2
   - uid: 17671
     components:
     - type: Transform
-      pos: -1.5,-26.5
+      pos: -7.5,-31.5
       parent: 2
   - uid: 17672
     components:
@@ -40733,6 +40423,11 @@ entities:
     - type: Transform
       pos: 33.5,19.5
       parent: 2
+  - uid: 17722
+    components:
+    - type: Transform
+      pos: -8.5,-31.5
+      parent: 2
   - uid: 17812
     components:
     - type: Transform
@@ -40783,6 +40478,11 @@ entities:
     - type: Transform
       pos: 36.5,18.5
       parent: 2
+  - uid: 17870
+    components:
+    - type: Transform
+      pos: -6.5,-31.5
+      parent: 2
   - uid: 17873
     components:
     - type: Transform
@@ -40818,6 +40518,31 @@ entities:
     - type: Transform
       pos: -54.5,-30.5
       parent: 2
+  - uid: 17906
+    components:
+    - type: Transform
+      pos: 59.5,-37.5
+      parent: 2
+  - uid: 17910
+    components:
+    - type: Transform
+      pos: 57.5,-37.5
+      parent: 2
+  - uid: 17914
+    components:
+    - type: Transform
+      pos: 61.5,-37.5
+      parent: 2
+  - uid: 17915
+    components:
+    - type: Transform
+      pos: 63.5,-37.5
+      parent: 2
+  - uid: 17916
+    components:
+    - type: Transform
+      pos: 66.5,-37.5
+      parent: 2
   - uid: 17948
     components:
     - type: Transform
@@ -41008,6 +40733,11 @@ entities:
     - type: Transform
       pos: -31.5,-23.5
       parent: 2
+  - uid: 18056
+    components:
+    - type: Transform
+      pos: -4.5,-31.5
+      parent: 2
   - uid: 18061
     components:
     - type: Transform
@@ -41163,11 +40893,6 @@ entities:
     - type: Transform
       pos: 68.5,-44.5
       parent: 2
-  - uid: 18175
-    components:
-    - type: Transform
-      pos: 66.5,-40.5
-      parent: 2
   - uid: 18178
     components:
     - type: Transform
@@ -41183,11 +40908,6 @@ entities:
     - type: Transform
       pos: 79.5,-45.5
       parent: 2
-  - uid: 18182
-    components:
-    - type: Transform
-      pos: 66.5,-44.5
-      parent: 2
   - uid: 18185
     components:
     - type: Transform
@@ -41203,45 +40923,10 @@ entities:
     - type: Transform
       pos: 66.5,-45.5
       parent: 2
-  - uid: 18189
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
-      parent: 2
-  - uid: 18202
-    components:
-    - type: Transform
-      pos: 65.5,-43.5
-      parent: 2
-  - uid: 18203
-    components:
-    - type: Transform
-      pos: 65.5,-42.5
-      parent: 2
-  - uid: 18205
-    components:
-    - type: Transform
-      pos: 65.5,-41.5
-      parent: 2
-  - uid: 18206
-    components:
-    - type: Transform
-      pos: 65.5,-40.5
-      parent: 2
   - uid: 18207
     components:
     - type: Transform
-      pos: 66.5,-39.5
-      parent: 2
-  - uid: 18209
-    components:
-    - type: Transform
-      pos: 67.5,-39.5
-      parent: 2
-  - uid: 18213
-    components:
-    - type: Transform
-      pos: 68.5,-39.5
+      pos: -4.5,-32.5
       parent: 2
   - uid: 18214
     components:
@@ -41488,11 +41173,26 @@ entities:
     - type: Transform
       pos: 27.5,23.5
       parent: 2
+  - uid: 18426
+    components:
+    - type: Transform
+      pos: -4.5,-30.5
+      parent: 2
   - uid: 18454
     components:
     - type: Transform
       pos: 58.5,-52.5
       parent: 2
+  - uid: 18468
+    components:
+    - type: Transform
+      pos: 65.5,-41.5
+      parent: 2
+  - uid: 18503
+    components:
+    - type: Transform
+      pos: 66.5,-40.5
+      parent: 2
   - uid: 18553
     components:
     - type: Transform
@@ -41528,6 +41228,11 @@ entities:
     - type: Transform
       pos: -29.5,-24.5
       parent: 2
+  - uid: 18560
+    components:
+    - type: Transform
+      pos: -0.5,-34.5
+      parent: 2
   - uid: 18562
     components:
     - type: Transform
@@ -42213,11 +41918,6 @@ entities:
     - type: Transform
       pos: 32.5,20.5
       parent: 2
-  - uid: 19597
-    components:
-    - type: Transform
-      pos: 57.5,-38.5
-      parent: 2
   - uid: 19653
     components:
     - type: Transform
@@ -45018,6 +44718,16 @@ entities:
     - type: Transform
       pos: 30.5,-4.5
       parent: 2
+  - uid: 22064
+    components:
+    - type: Transform
+      pos: 65.5,-43.5
+      parent: 2
+  - uid: 22065
+    components:
+    - type: Transform
+      pos: 65.5,-44.5
+      parent: 2
   - uid: 22077
     components:
     - type: Transform
@@ -45808,6 +45518,16 @@ entities:
     - type: Transform
       pos: -36.5,-6.5
       parent: 2
+  - uid: 23110
+    components:
+    - type: Transform
+      pos: -5.5,-34.5
+      parent: 2
+  - uid: 23111
+    components:
+    - type: Transform
+      pos: -7.5,-34.5
+      parent: 2
   - uid: 23122
     components:
     - type: Transform
@@ -46228,6 +45948,11 @@ entities:
     - type: Transform
       pos: -14.5,-8.5
       parent: 2
+  - uid: 23855
+    components:
+    - type: Transform
+      pos: 67.5,-40.5
+      parent: 2
   - uid: 24379
     components:
     - type: Transform
@@ -46428,46 +46153,6 @@ entities:
     - type: Transform
       pos: 52.5,-39.5
       parent: 2
-  - uid: 24530
-    components:
-    - type: Transform
-      pos: 55.5,-36.5
-      parent: 2
-  - uid: 24531
-    components:
-    - type: Transform
-      pos: 56.5,-36.5
-      parent: 2
-  - uid: 24532
-    components:
-    - type: Transform
-      pos: 57.5,-36.5
-      parent: 2
-  - uid: 24533
-    components:
-    - type: Transform
-      pos: 58.5,-36.5
-      parent: 2
-  - uid: 24534
-    components:
-    - type: Transform
-      pos: 59.5,-36.5
-      parent: 2
-  - uid: 24535
-    components:
-    - type: Transform
-      pos: 59.5,-37.5
-      parent: 2
-  - uid: 24536
-    components:
-    - type: Transform
-      pos: 59.5,-38.5
-      parent: 2
-  - uid: 24537
-    components:
-    - type: Transform
-      pos: 58.5,-38.5
-      parent: 2
   - uid: 24564
     components:
     - type: Transform
@@ -46583,15 +46268,90 @@ entities:
     - type: Transform
       pos: -22.5,-13.5
       parent: 2
-  - uid: 24753
+  - uid: 24736
     components:
     - type: Transform
-      pos: 57.5,-40.5
+      pos: 69.5,-36.5
       parent: 2
-  - uid: 24754
+  - uid: 24737
     components:
     - type: Transform
-      pos: 58.5,-40.5
+      pos: 69.5,-37.5
+      parent: 2
+  - uid: 24738
+    components:
+    - type: Transform
+      pos: 69.5,-38.5
+      parent: 2
+  - uid: 24739
+    components:
+    - type: Transform
+      pos: 68.5,-35.5
+      parent: 2
+  - uid: 24740
+    components:
+    - type: Transform
+      pos: 67.5,-35.5
+      parent: 2
+  - uid: 24741
+    components:
+    - type: Transform
+      pos: 66.5,-35.5
+      parent: 2
+  - uid: 24742
+    components:
+    - type: Transform
+      pos: 67.5,-36.5
+      parent: 2
+  - uid: 24743
+    components:
+    - type: Transform
+      pos: 63.5,-35.5
+      parent: 2
+  - uid: 24744
+    components:
+    - type: Transform
+      pos: 62.5,-35.5
+      parent: 2
+  - uid: 24745
+    components:
+    - type: Transform
+      pos: 61.5,-35.5
+      parent: 2
+  - uid: 24746
+    components:
+    - type: Transform
+      pos: 60.5,-35.5
+      parent: 2
+  - uid: 24747
+    components:
+    - type: Transform
+      pos: 62.5,-36.5
+      parent: 2
+  - uid: 24748
+    components:
+    - type: Transform
+      pos: 60.5,-39.5
+      parent: 2
+  - uid: 24749
+    components:
+    - type: Transform
+      pos: 61.5,-39.5
+      parent: 2
+  - uid: 24750
+    components:
+    - type: Transform
+      pos: 62.5,-39.5
+      parent: 2
+  - uid: 24751
+    components:
+    - type: Transform
+      pos: 63.5,-39.5
+      parent: 2
+  - uid: 24752
+    components:
+    - type: Transform
+      pos: 62.5,-38.5
       parent: 2
   - uid: 24770
     components:
@@ -46603,26 +46363,6 @@ entities:
     - type: Transform
       pos: 56.5,-40.5
       parent: 2
-  - uid: 24772
-    components:
-    - type: Transform
-      pos: 59.5,-40.5
-      parent: 2
-  - uid: 24785
-    components:
-    - type: Transform
-      pos: 79.5,-39.5
-      parent: 2
-  - uid: 24786
-    components:
-    - type: Transform
-      pos: 78.5,-37.5
-      parent: 2
-  - uid: 24787
-    components:
-    - type: Transform
-      pos: 79.5,-37.5
-      parent: 2
   - uid: 24789
     components:
     - type: Transform
@@ -46633,26 +46373,6 @@ entities:
     - type: Transform
       pos: 80.5,-40.5
       parent: 2
-  - uid: 24791
-    components:
-    - type: Transform
-      pos: 78.5,-39.5
-      parent: 2
-  - uid: 24792
-    components:
-    - type: Transform
-      pos: 77.5,-38.5
-      parent: 2
-  - uid: 24793
-    components:
-    - type: Transform
-      pos: 80.5,-37.5
-      parent: 2
-  - uid: 24794
-    components:
-    - type: Transform
-      pos: 78.5,-38.5
-      parent: 2
   - uid: 24834
     components:
     - type: Transform
@@ -46902,11 +46622,6 @@ entities:
     - type: Transform
       pos: -13.5,12.5
       parent: 2
-  - uid: 1436
-    components:
-    - type: Transform
-      pos: 1.5,-27.5
-      parent: 2
   - uid: 1507
     components:
     - type: Transform
@@ -46932,16 +46647,6 @@ entities:
     - type: Transform
       pos: -34.5,-15.5
       parent: 2
-  - uid: 1686
-    components:
-    - type: Transform
-      pos: 2.5,-27.5
-      parent: 2
-  - uid: 1689
-    components:
-    - type: Transform
-      pos: 0.5,-27.5
-      parent: 2
   - uid: 1736
     components:
     - type: Transform
@@ -47087,6 +46792,11 @@ entities:
     - type: Transform
       pos: -13.5,-13.5
       parent: 2
+  - uid: 2241
+    components:
+    - type: Transform
+      pos: 61.5,-37.5
+      parent: 2
   - uid: 2242
     components:
     - type: Transform
@@ -47097,11 +46807,21 @@ entities:
     - type: Transform
       pos: -2.5,-20.5
       parent: 2
+  - uid: 2268
+    components:
+    - type: Transform
+      pos: 63.5,-37.5
+      parent: 2
   - uid: 2272
     components:
     - type: Transform
       pos: -6.5,-18.5
       parent: 2
+  - uid: 2291
+    components:
+    - type: Transform
+      pos: 65.5,-37.5
+      parent: 2
   - uid: 2299
     components:
     - type: Transform
@@ -47127,6 +46847,11 @@ entities:
     - type: Transform
       pos: -3.5,-20.5
       parent: 2
+  - uid: 2538
+    components:
+    - type: Transform
+      pos: 59.5,-37.5
+      parent: 2
   - uid: 2555
     components:
     - type: Transform
@@ -47642,6 +47367,11 @@ entities:
     - type: Transform
       pos: -20.5,-27.5
       parent: 2
+  - uid: 4017
+    components:
+    - type: Transform
+      pos: -0.5,-27.5
+      parent: 2
   - uid: 4026
     components:
     - type: Transform
@@ -47887,6 +47617,16 @@ entities:
     - type: Transform
       pos: -2.5,-17.5
       parent: 2
+  - uid: 5056
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 2
+  - uid: 5057
+    components:
+    - type: Transform
+      pos: -0.5,-25.5
+      parent: 2
   - uid: 5200
     components:
     - type: Transform
@@ -47897,6 +47637,11 @@ entities:
     - type: Transform
       pos: 38.5,6.5
       parent: 2
+  - uid: 5236
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 2
   - uid: 5275
     components:
     - type: Transform
@@ -49922,11 +49667,6 @@ entities:
     - type: Transform
       pos: 22.5,10.5
       parent: 2
-  - uid: 9983
-    components:
-    - type: Transform
-      pos: 96.5,-42.5
-      parent: 2
   - uid: 10068
     components:
     - type: Transform
@@ -50032,21 +49772,11 @@ entities:
     - type: Transform
       pos: -38.5,-14.5
       parent: 2
-  - uid: 10264
-    components:
-    - type: Transform
-      pos: -0.5,-27.5
-      parent: 2
   - uid: 10265
     components:
     - type: Transform
       pos: 7.5,-24.5
       parent: 2
-  - uid: 10266
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 2
   - uid: 10267
     components:
     - type: Transform
@@ -50327,6 +50057,11 @@ entities:
     - type: Transform
       pos: -49.5,-48.5
       parent: 2
+  - uid: 11683
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 2
   - uid: 11788
     components:
     - type: Transform
@@ -50887,6 +50622,31 @@ entities:
     - type: Transform
       pos: -58.5,-60.5
       parent: 2
+  - uid: 16522
+    components:
+    - type: Transform
+      pos: 72.5,-40.5
+      parent: 2
+  - uid: 16525
+    components:
+    - type: Transform
+      pos: 70.5,-40.5
+      parent: 2
+  - uid: 16544
+    components:
+    - type: Transform
+      pos: 96.5,-42.5
+      parent: 2
+  - uid: 16551
+    components:
+    - type: Transform
+      pos: 76.5,-41.5
+      parent: 2
+  - uid: 16556
+    components:
+    - type: Transform
+      pos: 75.5,-41.5
+      parent: 2
   - uid: 16590
     components:
     - type: Transform
@@ -50902,11 +50662,6 @@ entities:
     - type: Transform
       pos: 36.5,13.5
       parent: 2
-  - uid: 16870
-    components:
-    - type: Transform
-      pos: 96.5,-41.5
-      parent: 2
   - uid: 16902
     components:
     - type: Transform
@@ -51097,141 +50852,36 @@ entities:
     - type: Transform
       pos: -72.5,-57.5
       parent: 2
-  - uid: 17889
-    components:
-    - type: Transform
-      pos: 79.5,-41.5
-      parent: 2
-  - uid: 17891
-    components:
-    - type: Transform
-      pos: 79.5,-40.5
-      parent: 2
-  - uid: 17892
-    components:
-    - type: Transform
-      pos: 79.5,-39.5
-      parent: 2
-  - uid: 17893
-    components:
-    - type: Transform
-      pos: 79.5,-38.5
-      parent: 2
-  - uid: 17895
-    components:
-    - type: Transform
-      pos: 79.5,-37.5
-      parent: 2
   - uid: 17896
     components:
     - type: Transform
-      pos: 78.5,-37.5
-      parent: 2
-  - uid: 17897
-    components:
-    - type: Transform
-      pos: 77.5,-37.5
-      parent: 2
-  - uid: 17898
-    components:
-    - type: Transform
-      pos: 76.5,-37.5
+      pos: 60.5,-37.5
       parent: 2
   - uid: 17899
     components:
     - type: Transform
       pos: -72.5,-56.5
       parent: 2
-  - uid: 17900
-    components:
-    - type: Transform
-      pos: 75.5,-37.5
-      parent: 2
-  - uid: 17902
-    components:
-    - type: Transform
-      pos: 74.5,-37.5
-      parent: 2
   - uid: 17903
-    components:
-    - type: Transform
-      pos: 73.5,-37.5
-      parent: 2
-  - uid: 17904
-    components:
-    - type: Transform
-      pos: 72.5,-37.5
-      parent: 2
-  - uid: 17905
-    components:
-    - type: Transform
-      pos: 71.5,-37.5
-      parent: 2
-  - uid: 17906
-    components:
-    - type: Transform
-      pos: 70.5,-37.5
-      parent: 2
-  - uid: 17910
-    components:
-    - type: Transform
-      pos: 69.5,-37.5
-      parent: 2
-  - uid: 17913
-    components:
-    - type: Transform
-      pos: 68.5,-37.5
-      parent: 2
-  - uid: 17914
-    components:
-    - type: Transform
-      pos: 67.5,-37.5
-      parent: 2
-  - uid: 17915
     components:
     - type: Transform
       pos: 66.5,-37.5
       parent: 2
-  - uid: 17916
-    components:
-    - type: Transform
-      pos: 65.5,-37.5
-      parent: 2
-  - uid: 17917
+  - uid: 17904
     components:
     - type: Transform
       pos: 64.5,-37.5
       parent: 2
-  - uid: 17918
-    components:
-    - type: Transform
-      pos: 63.5,-37.5
-      parent: 2
-  - uid: 17919
+  - uid: 17905
     components:
     - type: Transform
       pos: 62.5,-37.5
       parent: 2
-  - uid: 17920
-    components:
-    - type: Transform
-      pos: 61.5,-37.5
-      parent: 2
-  - uid: 17921
-    components:
-    - type: Transform
-      pos: 60.5,-37.5
-      parent: 2
   - uid: 17922
     components:
     - type: Transform
       pos: 57.5,-37.5
       parent: 2
-  - uid: 17923
-    components:
-    - type: Transform
-      pos: 58.5,-37.5
-      parent: 2
   - uid: 17925
     components:
     - type: Transform
@@ -51272,11 +50922,6 @@ entities:
     - type: Transform
       pos: 49.5,-37.5
       parent: 2
-  - uid: 17936
-    components:
-    - type: Transform
-      pos: 59.5,-37.5
-      parent: 2
   - uid: 17937
     components:
     - type: Transform
@@ -51322,11 +50967,31 @@ entities:
     - type: Transform
       pos: 57.5,-0.5
       parent: 2
+  - uid: 18175
+    components:
+    - type: Transform
+      pos: 77.5,-41.5
+      parent: 2
   - uid: 18188
     components:
     - type: Transform
       pos: -70.5,-56.5
       parent: 2
+  - uid: 18205
+    components:
+    - type: Transform
+      pos: 77.5,-42.5
+      parent: 2
+  - uid: 18206
+    components:
+    - type: Transform
+      pos: 67.5,-37.5
+      parent: 2
+  - uid: 18213
+    components:
+    - type: Transform
+      pos: 68.5,-40.5
+      parent: 2
   - uid: 18266
     components:
     - type: Transform
@@ -51342,6 +51007,41 @@ entities:
     - type: Transform
       pos: -70.5,-59.5
       parent: 2
+  - uid: 18432
+    components:
+    - type: Transform
+      pos: 67.5,-39.5
+      parent: 2
+  - uid: 18453
+    components:
+    - type: Transform
+      pos: 78.5,-42.5
+      parent: 2
+  - uid: 18461
+    components:
+    - type: Transform
+      pos: 69.5,-40.5
+      parent: 2
+  - uid: 18537
+    components:
+    - type: Transform
+      pos: 67.5,-40.5
+      parent: 2
+  - uid: 18540
+    components:
+    - type: Transform
+      pos: 67.5,-38.5
+      parent: 2
+  - uid: 18552
+    components:
+    - type: Transform
+      pos: 73.5,-40.5
+      parent: 2
+  - uid: 18580
+    components:
+    - type: Transform
+      pos: 71.5,-40.5
+      parent: 2
   - uid: 18597
     components:
     - type: Transform
@@ -51387,6 +51087,11 @@ entities:
     - type: Transform
       pos: -68.5,-59.5
       parent: 2
+  - uid: 18668
+    components:
+    - type: Transform
+      pos: 74.5,-41.5
+      parent: 2
   - uid: 18726
     components:
     - type: Transform
@@ -51397,6 +51102,11 @@ entities:
     - type: Transform
       pos: 14.5,-33.5
       parent: 2
+  - uid: 18864
+    components:
+    - type: Transform
+      pos: 58.5,-37.5
+      parent: 2
   - uid: 18891
     components:
     - type: Transform
@@ -51847,6 +51557,11 @@ entities:
     - type: Transform
       pos: 41.5,14.5
       parent: 2
+  - uid: 22067
+    components:
+    - type: Transform
+      pos: 74.5,-40.5
+      parent: 2
   - uid: 22114
     components:
     - type: Transform
@@ -54316,6 +54031,11 @@ entities:
     - type: Transform
       pos: 15.5,-16.5
       parent: 2
+  - uid: 7642
+    components:
+    - type: Transform
+      pos: -7.5,-36.5
+      parent: 2
   - uid: 7647
     components:
     - type: Transform
@@ -54346,6 +54066,21 @@ entities:
     - type: Transform
       pos: 22.5,22.5
       parent: 2
+  - uid: 7764
+    components:
+    - type: Transform
+      pos: -6.5,-36.5
+      parent: 2
+  - uid: 7774
+    components:
+    - type: Transform
+      pos: -6.5,-33.5
+      parent: 2
+  - uid: 7777
+    components:
+    - type: Transform
+      pos: -6.5,-35.5
+      parent: 2
   - uid: 7779
     components:
     - type: Transform
@@ -54466,6 +54201,11 @@ entities:
     - type: Transform
       pos: -50.5,-51.5
       parent: 2
+  - uid: 8299
+    components:
+    - type: Transform
+      pos: -6.5,-34.5
+      parent: 2
   - uid: 8368
     components:
     - type: Transform
@@ -55611,31 +55351,6 @@ entities:
     - type: Transform
       pos: -1.5,-42.5
       parent: 2
-  - uid: 11681
-    components:
-    - type: Transform
-      pos: -10.5,-33.5
-      parent: 2
-  - uid: 11682
-    components:
-    - type: Transform
-      pos: -9.5,-33.5
-      parent: 2
-  - uid: 11683
-    components:
-    - type: Transform
-      pos: -8.5,-33.5
-      parent: 2
-  - uid: 11684
-    components:
-    - type: Transform
-      pos: -8.5,-34.5
-      parent: 2
-  - uid: 11685
-    components:
-    - type: Transform
-      pos: -8.5,-35.5
-      parent: 2
   - uid: 11686
     components:
     - type: Transform
@@ -56276,6 +55991,11 @@ entities:
     - type: Transform
       pos: -42.5,8.5
       parent: 2
+  - uid: 15215
+    components:
+    - type: Transform
+      pos: -6.5,-31.5
+      parent: 2
   - uid: 15264
     components:
     - type: Transform
@@ -56431,6 +56151,11 @@ entities:
     - type: Transform
       pos: 19.5,-39.5
       parent: 2
+  - uid: 15756
+    components:
+    - type: Transform
+      pos: -5.5,-31.5
+      parent: 2
   - uid: 15761
     components:
     - type: Transform
@@ -57041,6 +56766,26 @@ entities:
     - type: Transform
       pos: -46.5,-26.5
       parent: 2
+  - uid: 17663
+    components:
+    - type: Transform
+      pos: -4.5,-31.5
+      parent: 2
+  - uid: 17665
+    components:
+    - type: Transform
+      pos: -6.5,-32.5
+      parent: 2
+  - uid: 17669
+    components:
+    - type: Transform
+      pos: -4.5,-30.5
+      parent: 2
+  - uid: 17670
+    components:
+    - type: Transform
+      pos: -4.5,-29.5
+      parent: 2
   - uid: 17675
     components:
     - type: Transform
@@ -60855,11 +60600,6 @@ entities:
     - type: Transform
       pos: -53.5,-21.5
       parent: 2
-  - uid: 9988
-    components:
-    - type: Transform
-      pos: -2.5,-34.5
-      parent: 2
   - uid: 10261
     components:
     - type: Transform
@@ -60885,26 +60625,11 @@ entities:
     - type: Transform
       pos: -14.5,-46.5
       parent: 2
-  - uid: 13696
-    components:
-    - type: Transform
-      pos: -2.5,-35.5
-      parent: 2
-  - uid: 13697
-    components:
-    - type: Transform
-      pos: -3.5,-35.5
-      parent: 2
   - uid: 14940
     components:
     - type: Transform
       pos: -48.5,-22.5
       parent: 2
-  - uid: 17581
-    components:
-    - type: Transform
-      pos: -3.5,-34.5
-      parent: 2
   - uid: 18844
     components:
     - type: Transform
@@ -61344,11 +61069,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,22.5
       parent: 2
-  - uid: 1444
-    components:
-    - type: Transform
-      pos: 2.5,-27.5
-      parent: 2
   - uid: 1516
     components:
     - type: Transform
@@ -61361,11 +61081,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,22.5
       parent: 2
-  - uid: 1567
-    components:
-    - type: Transform
-      pos: 1.5,-27.5
-      parent: 2
   - uid: 1662
     components:
     - type: Transform
@@ -61384,11 +61099,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-10.5
       parent: 2
-  - uid: 1698
-    components:
-    - type: Transform
-      pos: 0.5,-27.5
-      parent: 2
   - uid: 1704
     components:
     - type: Transform
@@ -61602,11 +61312,6 @@ entities:
     - type: Transform
       pos: 23.5,-17.5
       parent: 2
-  - uid: 2404
-    components:
-    - type: Transform
-      pos: 61.5,-40.5
-      parent: 2
   - uid: 2406
     components:
     - type: Transform
@@ -61735,11 +61440,6 @@ entities:
     - type: Transform
       pos: 3.5,-33.5
       parent: 2
-  - uid: 2939
-    components:
-    - type: Transform
-      pos: 3.5,-26.5
-      parent: 2
   - uid: 2940
     components:
     - type: Transform
@@ -61756,16 +61456,6 @@ entities:
     - type: Transform
       pos: 3.5,-30.5
       parent: 2
-  - uid: 2945
-    components:
-    - type: Transform
-      pos: 3.5,-29.5
-      parent: 2
-  - uid: 2946
-    components:
-    - type: Transform
-      pos: 3.5,-28.5
-      parent: 2
   - uid: 2951
     components:
     - type: Transform
@@ -61829,18 +61519,22 @@ entities:
     - type: Transform
       pos: 44.5,-4.5
       parent: 2
+  - uid: 3242
+    components:
+    - type: Transform
+      pos: -0.5,-27.5
+      parent: 2
+  - uid: 3243
+    components:
+    - type: Transform
+      pos: 3.5,-28.5
+      parent: 2
   - uid: 3254
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,24.5
       parent: 2
-  - uid: 3269
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,-34.5
-      parent: 2
   - uid: 3337
     components:
     - type: Transform
@@ -62235,11 +61929,6 @@ entities:
     - type: Transform
       pos: 30.5,-55.5
       parent: 2
-  - uid: 5197
-    components:
-    - type: Transform
-      pos: -0.5,-27.5
-      parent: 2
   - uid: 5244
     components:
     - type: Transform
@@ -62332,11 +62021,6 @@ entities:
     - type: Transform
       pos: 16.5,-17.5
       parent: 2
-  - uid: 5892
-    components:
-    - type: Transform
-      pos: 78.5,-37.5
-      parent: 2
   - uid: 6040
     components:
     - type: Transform
@@ -62358,11 +62042,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,2.5
       parent: 2
-  - uid: 6179
-    components:
-    - type: Transform
-      pos: 79.5,-37.5
-      parent: 2
   - uid: 6331
     components:
     - type: Transform
@@ -62448,6 +62127,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 40.5,-36.5
       parent: 2
+  - uid: 6839
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 2
   - uid: 6940
     components:
     - type: Transform
@@ -62527,6 +62211,11 @@ entities:
     - type: Transform
       pos: 11.5,-17.5
       parent: 2
+  - uid: 7460
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 2
   - uid: 7467
     components:
     - type: Transform
@@ -62559,6 +62248,11 @@ entities:
     - type: Transform
       pos: 4.5,-95.5
       parent: 2
+  - uid: 7631
+    components:
+    - type: Transform
+      pos: -0.5,-25.5
+      parent: 2
   - uid: 7654
     components:
     - type: Transform
@@ -62570,24 +62264,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,24.5
       parent: 2
-  - uid: 7776
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-30.5
-      parent: 2
-  - uid: 7777
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-31.5
-      parent: 2
-  - uid: 7778
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-33.5
-      parent: 2
   - uid: 7803
     components:
     - type: Transform
@@ -63472,11 +63148,6 @@ entities:
     - type: Transform
       pos: 21.5,-13.5
       parent: 2
-  - uid: 11078
-    components:
-    - type: Transform
-      pos: 79.5,-38.5
-      parent: 2
   - uid: 11153
     components:
     - type: Transform
@@ -63533,6 +63204,16 @@ entities:
     - type: Transform
       pos: 10.5,2.5
       parent: 2
+  - uid: 11765
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 2
+  - uid: 11771
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 2
   - uid: 11772
     components:
     - type: Transform
@@ -63948,11 +63629,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -25.5,20.5
       parent: 2
-  - uid: 16559
-    components:
-    - type: Transform
-      pos: 76.5,-37.5
-      parent: 2
   - uid: 16710
     components:
     - type: Transform
@@ -65164,6 +64840,11 @@ entities:
     - type: Transform
       pos: 29.5,18.5
       parent: 2
+  - uid: 22593
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 2
   - uid: 22641
     components:
     - type: Transform
@@ -65328,6 +65009,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 49.5,-37.5
       parent: 2
+  - uid: 24536
+    components:
+    - type: Transform
+      pos: 57.5,-41.5
+      parent: 2
+  - uid: 24550
+    components:
+    - type: Transform
+      pos: 56.5,-41.5
+      parent: 2
   - uid: 24556
     components:
     - type: Transform
@@ -65638,107 +65329,12 @@ entities:
     - type: Transform
       pos: -49.5,31.5
       parent: 2
-  - uid: 24737
-    components:
-    - type: Transform
-      pos: 75.5,-37.5
-      parent: 2
-  - uid: 24738
-    components:
-    - type: Transform
-      pos: 74.5,-37.5
-      parent: 2
-  - uid: 24739
-    components:
-    - type: Transform
-      pos: 73.5,-37.5
-      parent: 2
-  - uid: 24740
-    components:
-    - type: Transform
-      pos: 72.5,-37.5
-      parent: 2
-  - uid: 24741
-    components:
-    - type: Transform
-      pos: 71.5,-37.5
-      parent: 2
-  - uid: 24742
-    components:
-    - type: Transform
-      pos: 70.5,-37.5
-      parent: 2
-  - uid: 24743
-    components:
-    - type: Transform
-      pos: 69.5,-37.5
-      parent: 2
-  - uid: 24744
-    components:
-    - type: Transform
-      pos: 68.5,-37.5
-      parent: 2
-  - uid: 24745
-    components:
-    - type: Transform
-      pos: 67.5,-37.5
-      parent: 2
-  - uid: 24746
-    components:
-    - type: Transform
-      pos: 66.5,-37.5
-      parent: 2
-  - uid: 24747
-    components:
-    - type: Transform
-      pos: 65.5,-37.5
-      parent: 2
-  - uid: 24748
-    components:
-    - type: Transform
-      pos: 64.5,-37.5
-      parent: 2
-  - uid: 24749
-    components:
-    - type: Transform
-      pos: 63.5,-37.5
-      parent: 2
-  - uid: 24751
-    components:
-    - type: Transform
-      pos: 62.5,-38.5
-      parent: 2
-  - uid: 24755
-    components:
-    - type: Transform
-      pos: 63.5,-38.5
-      parent: 2
-  - uid: 24762
-    components:
-    - type: Transform
-      pos: 59.5,-40.5
-      parent: 2
-  - uid: 24763
-    components:
-    - type: Transform
-      pos: 62.5,-39.5
-      parent: 2
-  - uid: 24767
-    components:
-    - type: Transform
-      pos: 61.5,-39.5
-      parent: 2
   - uid: 24779
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 56.5,-40.5
       parent: 2
-  - uid: 24781
-    components:
-    - type: Transform
-      pos: 60.5,-40.5
-      parent: 2
   - uid: 24783
     components:
     - type: Transform
@@ -66635,6 +66231,11 @@ entities:
     - type: Transform
       pos: -51.46843,8.50683
       parent: 2
+  - uid: 3664
+    components:
+    - type: Transform
+      pos: 52.541405,-38.388084
+      parent: 2
   - uid: 4299
     components:
     - type: Transform
@@ -66741,6 +66342,11 @@ entities:
       parent: 2
 - proto: ChairFoldingSpawnFolded
   entities:
+  - uid: 16928
+    components:
+    - type: Transform
+      pos: 52.467888,-35.41414
+      parent: 2
   - uid: 18834
     components:
     - type: Transform
@@ -67092,10 +66698,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 21.511818,3.5986362
       parent: 2
-  - uid: 24549
+- proto: ChairOfficeLight
+  entities:
+  - uid: 7766
     components:
     - type: Transform
-      pos: 52.50381,-38.388973
+      pos: 0.6272726,-33.401337
       parent: 2
 - proto: ChairPilotSeat
   entities:
@@ -67495,10 +67103,10 @@ entities:
       parent: 2
 - proto: ClosetChefFilled
   entities:
-  - uid: 2729
+  - uid: 4256
     components:
     - type: Transform
-      pos: -3.5,-30.5
+      pos: -2.5,-33.5
       parent: 2
 - proto: ClosetEmergencyFilledRandom
   entities:
@@ -67816,6 +67424,11 @@ entities:
     - type: Transform
       pos: 25.5,10.5
       parent: 2
+  - uid: 12173
+    components:
+    - type: Transform
+      pos: 1.5,-30.5
+      parent: 2
   - uid: 12744
     components:
     - type: Transform
@@ -67953,6 +67566,11 @@ entities:
     - type: Transform
       pos: 39.5,5.5
       parent: 2
+  - uid: 3483
+    components:
+    - type: Transform
+      pos: 2.5,-30.5
+      parent: 2
   - uid: 5348
     components:
     - type: Transform
@@ -68242,10 +67860,10 @@ entities:
       parent: 2
 - proto: ClothingBeltChefFilled
   entities:
-  - uid: 3884
+  - uid: 2729
     components:
     - type: Transform
-      pos: -2.4525337,-35.40037
+      pos: -2.499279,-35.385586
       parent: 2
 - proto: ClothingBeltJanitorFilled
   entities:
@@ -68484,10 +68102,10 @@ entities:
       parent: 2
 - proto: ClothingHeadHatChef
   entities:
-  - uid: 3264
+  - uid: 3994
     components:
     - type: Transform
-      pos: 1.263932,-33.25513
+      pos: -0.6541244,-32.320724
       parent: 2
 - proto: ClothingHeadHatCone
   entities:
@@ -68506,6 +68124,26 @@ entities:
     - type: Transform
       pos: 32.340652,-78.34091
       parent: 2
+  - uid: 17850
+    components:
+    - type: Transform
+      pos: 67.72493,-37.660217
+      parent: 2
+  - uid: 17889
+    components:
+    - type: Transform
+      pos: 64.19193,-36.742912
+      parent: 2
+  - uid: 17897
+    components:
+    - type: Transform
+      pos: 67.162155,-37.086903
+      parent: 2
+  - uid: 18224
+    components:
+    - type: Transform
+      pos: 59.752228,-38.17099
+      parent: 2
 - proto: ClothingHeadHatFancyCrown
   entities:
   - uid: 20254
@@ -68904,6 +68542,13 @@ entities:
     - type: Transform
       pos: 16.506172,13.55266
       parent: 2
+- proto: ClothingOuterWinterChef
+  entities:
+  - uid: 5053
+    components:
+    - type: Transform
+      pos: -0.37912226,-32.513382
+      parent: 2
 - proto: ClothingOuterWinterChem
   entities:
   - uid: 15305
@@ -69482,18 +69127,6 @@ entities:
     - type: Transform
       pos: -9.5,-58.5
       parent: 2
-  - uid: 19556
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 51.5,-35.5
-      parent: 2
-  - uid: 19558
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-35.5
-      parent: 2
   - uid: 20842
     components:
     - type: Transform
@@ -69521,7 +69154,7 @@ entities:
   - uid: 7801
     components:
     - type: Transform
-      pos: 67.87616,-43.24812
+      pos: 66.544174,-43.025032
       parent: 2
 - proto: CommsComputerCircuitboard
   entities:
@@ -69913,11 +69546,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -58.5,-60.5
       parent: 2
-  - uid: 17939
+  - uid: 19581
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 96.5,-41.5
+      pos: 96.5,-43.5
       parent: 2
 - proto: ComputerRadar
   entities:
@@ -70132,22 +69765,6 @@ entities:
     - type: Transform
       pos: 6.5,27.5
       parent: 2
-  - uid: 1903
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-32.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 4
-  - uid: 1933
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-32.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 4
   - uid: 2671
     components:
     - type: Transform
@@ -70158,14 +69775,6 @@ entities:
     - type: Transform
       pos: 6.5,29.5
       parent: 2
-  - uid: 3487
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-32.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 4
   - uid: 3871
     components:
     - type: Transform
@@ -70198,14 +69807,6 @@ entities:
     - type: Transform
       pos: 2.5,28.5
       parent: 2
-  - uid: 6837
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-32.5
-      parent: 2
-    - type: DeviceLinkSink
-      invokeCounter: 4
   - uid: 9114
     components:
     - type: Transform
@@ -70339,7 +69940,7 @@ entities:
   - uid: 16726
     components:
     - type: Transform
-      pos: 67.61919,-41.510166
+      pos: 66.56502,-41.503143
       parent: 2
 - proto: CrateArtifactContainer
   entities:
@@ -70512,6 +70113,26 @@ entities:
     - type: Transform
       pos: 32.5,15.5
       parent: 2
+  - uid: 24540
+    components:
+    - type: Transform
+      pos: 80.5,-40.5
+      parent: 2
+  - uid: 24549
+    components:
+    - type: Transform
+      pos: 62.5,-38.5
+      parent: 2
+  - uid: 24555
+    components:
+    - type: Transform
+      pos: 78.5,-44.5
+      parent: 2
+  - uid: 24558
+    components:
+    - type: Transform
+      pos: 63.5,-38.5
+      parent: 2
 - proto: CrateEngineering
   entities:
   - uid: 15897
@@ -70703,6 +70324,11 @@ entities:
     - type: Transform
       pos: -29.5,18.5
       parent: 2
+  - uid: 24554
+    components:
+    - type: Transform
+      pos: 78.5,-40.5
+      parent: 2
 - proto: CrateFreezer
   entities:
   - uid: 2597
@@ -70736,35 +70362,11 @@ entities:
       removedMasks: 20
     - type: PlaceableSurface
       isPlaceable: True
-  - uid: 3241
+  - uid: 8364
     components:
     - type: Transform
-      pos: -2.5,-32.5
+      pos: -4.5,-30.5
       parent: 2
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 3245
-          - 3383
-          - 3246
-          - 1024
-          - 3244
-          - 3676
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 234.9976
-        moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
   - uid: 12674
     components:
     - type: Transform
@@ -70788,6 +70390,11 @@ entities:
     - type: Transform
       pos: -42.5,-39.5
       parent: 2
+  - uid: 17582
+    components:
+    - type: Transform
+      pos: -10.5,-33.5
+      parent: 2
   - uid: 19635
     components:
     - type: Transform
@@ -70814,10 +70421,10 @@ entities:
     - type: Transform
       pos: 39.5,-36.5
       parent: 2
-  - uid: 18032
+  - uid: 17891
     components:
     - type: Transform
-      pos: 95.5,-43.5
+      pos: 95.5,-45.5
       parent: 2
 - proto: CrateMaterialSilo
   entities:
@@ -70937,19 +70544,11 @@ entities:
       parent: 2
 - proto: CrateTrashCartFilled
   entities:
-  - uid: 3860
+  - uid: 2939
     components:
     - type: Transform
-      pos: -0.5,-29.5
+      pos: -0.5,-30.5
       parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-          Oxygen: 1.7459903
-          Nitrogen: 6.568249
   - uid: 12152
     components:
     - type: Transform
@@ -71336,6 +70935,61 @@ entities:
     - type: Transform
       pos: 7.4465623,-33.43011
       parent: 2
+- proto: DecalSpawnerBloodSplatters
+  entities:
+  - uid: 24854
+    components:
+    - type: Transform
+      pos: -10.5,-32.5
+      parent: 2
+- proto: DecalSpawnerDirtMonospace
+  entities:
+  - uid: 18183
+    components:
+    - type: Transform
+      pos: 65.5,-37.5
+      parent: 2
+- proto: DecalSpawnerDirtNear
+  entities:
+  - uid: 3884
+    components:
+    - type: Transform
+      pos: -10.5,-31.5
+      parent: 2
+  - uid: 16755
+    components:
+    - type: Transform
+      pos: 57.5,-37.5
+      parent: 2
+- proto: DecalSpawnerDirtWide
+  entities:
+  - uid: 3273
+    components:
+    - type: Transform
+      pos: -5.5,-32.5
+      parent: 2
+  - uid: 6082
+    components:
+    - type: Transform
+      pos: 0.5,-27.5
+      parent: 2
+  - uid: 11754
+    components:
+    - type: Transform
+      pos: -17.5,-35.5
+      parent: 2
+  - uid: 24794
+    components:
+    - type: Transform
+      pos: -8.5,-38.5
+      parent: 2
+- proto: DecalSpawnerGraffiti
+  entities:
+  - uid: 5970
+    components:
+    - type: Transform
+      pos: 2.5,-29.5
+      parent: 2
 - proto: DefaultStationBeaconAICore
   entities:
   - uid: 17963
@@ -71574,10 +71228,10 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconKitchen
   entities:
-  - uid: 15756
+  - uid: 5283
     components:
     - type: Transform
-      pos: -7.5,-32.5
+      pos: -5.5,-33.5
       parent: 2
 - proto: DefaultStationBeaconLawOffice
   entities:
@@ -71856,6 +71510,11 @@ entities:
     - type: Transform
       pos: -27.371931,-33.501823
       parent: 2
+  - uid: 2946
+    components:
+    - type: Transform
+      pos: -8.534687,-35.326263
+      parent: 2
   - uid: 3445
     components:
     - type: Transform
@@ -71939,6 +71598,11 @@ entities:
     - type: Transform
       pos: 9.5,-16.5
       parent: 2
+  - uid: 3883
+    components:
+    - type: Transform
+      pos: -3.5,-34.5
+      parent: 2
   - uid: 3894
     components:
     - type: Transform
@@ -71956,64 +71620,59 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 50.5,-16.5
       parent: 2
+  - uid: 4118
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-31.5
+      parent: 2
   - uid: 4171
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,6.5
       parent: 2
-  - uid: 4264
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-27.5
-      parent: 2
-  - uid: 4290
-    components:
-    - type: Transform
-      pos: -8.5,-34.5
-      parent: 2
   - uid: 4709
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 45.5,-37.5
       parent: 2
+  - uid: 4868
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-36.5
+      parent: 2
   - uid: 4876
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -16.5,-22.5
       parent: 2
+  - uid: 4878
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,-38.5
+      parent: 2
   - uid: 4932
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,12.5
       parent: 2
-  - uid: 5056
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-32.5
-      parent: 2
-  - uid: 5061
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-27.5
-      parent: 2
-  - uid: 5062
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-25.5
-      parent: 2
   - uid: 5180
     components:
     - type: Transform
       pos: -7.5,-41.5
       parent: 2
+  - uid: 5232
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-31.5
+      parent: 2
   - uid: 5448
     components:
     - type: Transform
@@ -72053,6 +71712,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 32.5,5.5
       parent: 2
+  - uid: 8007
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-34.5
+      parent: 2
   - uid: 8095
     components:
     - type: Transform
@@ -72065,6 +71730,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-20.5
       parent: 2
+  - uid: 8351
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-37.5
+      parent: 2
+  - uid: 9632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-37.5
+      parent: 2
   - uid: 9893
     components:
     - type: Transform
@@ -72112,17 +71789,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -22.5,-42.5
       parent: 2
+  - uid: 11749
+    components:
+    - type: Transform
+      pos: -20.5,-34.5
+      parent: 2
   - uid: 12156
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -22.5,-34.5
       parent: 2
-  - uid: 12173
-    components:
-    - type: Transform
-      pos: -12.5,-38.5
-      parent: 2
   - uid: 12174
     components:
     - type: Transform
@@ -72171,6 +71848,12 @@ entities:
     - type: Transform
       pos: -33.5,-22.5
       parent: 2
+  - uid: 15164
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-36.5
+      parent: 2
   - uid: 15166
     components:
     - type: Transform
@@ -72229,11 +71912,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -23.5,-46.5
       parent: 2
-  - uid: 17191
-    components:
-    - type: Transform
-      pos: 79.5,-37.5
-      parent: 2
   - uid: 17511
     components:
     - type: Transform
@@ -72422,6 +72100,24 @@ entities:
     - type: Transform
       pos: -20.5,-16.5
       parent: 2
+  - uid: 24595
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-37.5
+      parent: 2
+  - uid: 24596
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-37.5
+      parent: 2
+  - uid: 24720
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-38.5
+      parent: 2
 - proto: DisposalJunction
   entities:
   - uid: 1300
@@ -72560,6 +72256,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 21.5,-21.5
       parent: 2
+  - uid: 15150
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-36.5
+      parent: 2
   - uid: 15364
     components:
     - type: Transform
@@ -72613,21 +72315,15 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-48.5
       parent: 2
-  - uid: 3550
-    components:
-    - type: Transform
-      pos: -8.5,-36.5
-      parent: 2
   - uid: 4779
     components:
     - type: Transform
       pos: 29.5,-54.5
       parent: 2
-  - uid: 5169
+  - uid: 5063
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-41.5
+      pos: 48.5,-38.5
       parent: 2
   - uid: 6873
     components:
@@ -72732,6 +72428,12 @@ entities:
     - type: Transform
       pos: -7.5,-59.5
       parent: 2
+  - uid: 124
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-37.5
+      parent: 2
   - uid: 222
     components:
     - type: Transform
@@ -72808,12 +72510,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,-12.5
       parent: 2
-  - uid: 1038
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 74.5,-37.5
-      parent: 2
   - uid: 1174
     components:
     - type: Transform
@@ -72879,27 +72575,11 @@ entities:
     - type: Transform
       pos: -7.5,-54.5
       parent: 2
-  - uid: 2074
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,-37.5
-      parent: 2
   - uid: 2081
     components:
     - type: Transform
       pos: 10.5,-56.5
       parent: 2
-  - uid: 2268
-    components:
-    - type: Transform
-      pos: 79.5,-40.5
-      parent: 2
-  - uid: 2311
-    components:
-    - type: Transform
-      pos: 79.5,-38.5
-      parent: 2
   - uid: 2429
     components:
     - type: Transform
@@ -72912,18 +72592,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 47.5,-16.5
       parent: 2
-  - uid: 2459
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 73.5,-37.5
-      parent: 2
-  - uid: 2538
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-37.5
-      parent: 2
   - uid: 2560
     components:
     - type: Transform
@@ -72934,12 +72602,6 @@ entities:
     - type: Transform
       pos: -7.5,-50.5
       parent: 2
-  - uid: 2584
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-36.5
-      parent: 2
   - uid: 2694
     components:
     - type: Transform
@@ -73100,6 +72762,40 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,6.5
       parent: 2
+  - uid: 3246
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-36.5
+      parent: 2
+  - uid: 3271
+    components:
+    - type: Transform
+      pos: 10.5,-25.5
+      parent: 2
+  - uid: 3286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-31.5
+      parent: 2
+  - uid: 3288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-31.5
+      parent: 2
+  - uid: 3295
+    components:
+    - type: Transform
+      pos: -7.5,-35.5
+      parent: 2
+  - uid: 3297
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-31.5
+      parent: 2
   - uid: 3380
     components:
     - type: Transform
@@ -73111,12 +72807,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-46.5
       parent: 2
-  - uid: 3408
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 78.5,-37.5
-      parent: 2
   - uid: 3454
     components:
     - type: Transform
@@ -73158,33 +72848,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 39.5,19.5
       parent: 2
-  - uid: 3625
-    components:
-    - type: Transform
-      pos: 79.5,-39.5
-      parent: 2
   - uid: 3688
     components:
     - type: Transform
       pos: 46.5,-22.5
       parent: 2
-  - uid: 3698
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-36.5
-      parent: 2
   - uid: 3717
     components:
     - type: Transform
       pos: -1.5,-47.5
       parent: 2
-  - uid: 3724
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-31.5
-      parent: 2
   - uid: 3735
     components:
     - type: Transform
@@ -73236,17 +72909,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -13.5,-12.5
       parent: 2
-  - uid: 3994
+  - uid: 3937
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-27.5
-      parent: 2
-  - uid: 4067
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-25.5
+      pos: -7.5,-34.5
       parent: 2
   - uid: 4097
     components:
@@ -73254,12 +72920,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 22.5,6.5
       parent: 2
-  - uid: 4118
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-25.5
-      parent: 2
   - uid: 4149
     components:
     - type: Transform
@@ -73374,12 +73034,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 30.5,-25.5
       parent: 2
-  - uid: 4656
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-27.5
-      parent: 2
   - uid: 4702
     components:
     - type: Transform
@@ -73421,27 +73075,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -31.5,-41.5
       parent: 2
-  - uid: 4865
-    components:
-    - type: Transform
-      pos: -8.5,-37.5
-      parent: 2
-  - uid: 4868
-    components:
-    - type: Transform
-      pos: -8.5,-38.5
-      parent: 2
-  - uid: 4878
-    components:
-    - type: Transform
-      pos: -8.5,-39.5
-      parent: 2
   - uid: 4910
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 44.5,-41.5
       parent: 2
+  - uid: 4917
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-37.5
+      parent: 2
   - uid: 4933
     components:
     - type: Transform
@@ -73483,23 +73128,10 @@ entities:
     - type: Transform
       pos: -7.5,-47.5
       parent: 2
-  - uid: 5055
+  - uid: 5062
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-28.5
-      parent: 2
-  - uid: 5057
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-29.5
-      parent: 2
-  - uid: 5063
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-30.5
+      pos: -7.5,-33.5
       parent: 2
   - uid: 5128
     components:
@@ -73571,18 +73203,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 32.5,-54.5
       parent: 2
-  - uid: 5232
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-25.5
-      parent: 2
-  - uid: 5236
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-25.5
-      parent: 2
   - uid: 5239
     components:
     - type: Transform
@@ -73607,17 +73227,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,17.5
       parent: 2
+  - uid: 5276
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-36.5
+      parent: 2
   - uid: 5282
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -23.5,-45.5
       parent: 2
-  - uid: 5283
-    components:
-    - type: Transform
-      pos: 3.5,-26.5
-      parent: 2
   - uid: 5301
     components:
     - type: Transform
@@ -73677,29 +73298,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,12.5
       parent: 2
-  - uid: 5699
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-37.5
-      parent: 2
-  - uid: 5809
-    components:
-    - type: Transform
-      pos: 79.5,-41.5
-      parent: 2
-  - uid: 5898
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 72.5,-37.5
-      parent: 2
-  - uid: 6059
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-37.5
-      parent: 2
   - uid: 6148
     components:
     - type: Transform
@@ -73752,12 +73350,6 @@ entities:
     - type: Transform
       pos: 35.5,-19.5
       parent: 2
-  - uid: 6294
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-37.5
-      parent: 2
   - uid: 6299
     components:
     - type: Transform
@@ -73770,6 +73362,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,-33.5
       parent: 2
+  - uid: 6367
+    components:
+    - type: Transform
+      pos: -7.5,-32.5
+      parent: 2
   - uid: 6417
     components:
     - type: Transform
@@ -74060,6 +73657,11 @@ entities:
     - type: Transform
       pos: 10.5,-57.5
       parent: 2
+  - uid: 7701
+    components:
+    - type: Transform
+      pos: -6.5,-35.5
+      parent: 2
   - uid: 7718
     components:
     - type: Transform
@@ -74071,6 +73673,18 @@ entities:
     - type: Transform
       pos: 24.5,-34.5
       parent: 2
+  - uid: 7775
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-34.5
+      parent: 2
+  - uid: 7778
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-34.5
+      parent: 2
   - uid: 7849
     components:
     - type: Transform
@@ -74148,6 +73762,11 @@ entities:
     - type: Transform
       pos: 31.5,-3.5
       parent: 2
+  - uid: 8341
+    components:
+    - type: Transform
+      pos: -6.5,-36.5
+      parent: 2
   - uid: 8461
     components:
     - type: Transform
@@ -74350,12 +73969,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 31.5,-54.5
       parent: 2
-  - uid: 10005
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 75.5,-37.5
-      parent: 2
   - uid: 10063
     components:
     - type: Transform
@@ -75196,6 +74809,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 29.5,-22.5
       parent: 2
+  - uid: 14477
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-31.5
+      parent: 2
   - uid: 14717
     components:
     - type: Transform
@@ -75640,54 +75259,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-45.5
       parent: 2
-  - uid: 16539
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-37.5
-      parent: 2
-  - uid: 16543
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-37.5
-      parent: 2
-  - uid: 16544
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-37.5
-      parent: 2
-  - uid: 16548
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-37.5
-      parent: 2
-  - uid: 16551
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-37.5
-      parent: 2
-  - uid: 16556
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 71.5,-37.5
-      parent: 2
-  - uid: 16567
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-37.5
-      parent: 2
-  - uid: 16573
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 60.5,-37.5
-      parent: 2
   - uid: 16898
     components:
     - type: Transform
@@ -75791,18 +75362,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,-21.5
       parent: 2
-  - uid: 17683
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-37.5
-      parent: 2
-  - uid: 17850
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-37.5
-      parent: 2
   - uid: 18062
     components:
     - type: Transform
@@ -75889,12 +75448,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-22.5
       parent: 2
-  - uid: 18560
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-35.5
-      parent: 2
   - uid: 18563
     components:
     - type: Transform
@@ -75949,12 +75502,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,-19.5
       parent: 2
+  - uid: 18635
+    components:
+    - type: Transform
+      pos: -8.5,-38.5
+      parent: 2
   - uid: 18866
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 30.5,-54.5
       parent: 2
+  - uid: 18934
+    components:
+    - type: Transform
+      pos: -8.5,-39.5
+      parent: 2
   - uid: 19143
     components:
     - type: Transform
@@ -76300,12 +75863,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 48.5,-39.5
       parent: 2
-  - uid: 20372
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 48.5,-38.5
-      parent: 2
   - uid: 20374
     components:
     - type: Transform
@@ -76386,14 +75943,7 @@ entities:
   - uid: 20414
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-25.5
-      parent: 2
-  - uid: 20415
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-25.5
+      pos: -8.5,-40.5
       parent: 2
   - uid: 20416
     components:
@@ -76411,6 +75961,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-63.5
       parent: 2
+  - uid: 20815
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-41.5
+      parent: 2
   - uid: 21348
     components:
     - type: Transform
@@ -76483,12 +76039,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,-38.5
       parent: 2
-  - uid: 23024
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-41.5
-      parent: 2
   - uid: 23862
     components:
     - type: Transform
@@ -76850,6 +76400,36 @@ entities:
     - type: Transform
       pos: -20.5,-17.5
       parent: 2
+  - uid: 24721
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-37.5
+      parent: 2
+  - uid: 24731
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-37.5
+      parent: 2
+  - uid: 24732
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-37.5
+      parent: 2
+  - uid: 24733
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,-37.5
+      parent: 2
+  - uid: 24734
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-37.5
+      parent: 2
 - proto: DisposalRouter
   entities:
   - uid: 384
@@ -76958,15 +76538,6 @@ entities:
     - type: DisposalRouter
       tags:
       - Bar
-  - uid: 8351
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-25.5
-      parent: 2
-    - type: DisposalRouter
-      tags:
-      - Kitchen
   - uid: 9203
     components:
     - type: Transform
@@ -76975,6 +76546,15 @@ entities:
     - type: DisposalRouter
       tags:
       - Engineering
+  - uid: 11450
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-41.5
+      parent: 2
+    - type: DisposalRouter
+      tags:
+      - Kitchen
 - proto: DisposalTagger
   entities:
   - uid: 3893
@@ -76991,14 +76571,6 @@ entities:
       parent: 2
     - type: DisposalTagger
       tag: Trash
-  - uid: 4917
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-40.5
-      parent: 2
-    - type: DisposalTagger
-      tag: Trash
   - uid: 5228
     components:
     - type: Transform
@@ -77169,18 +76741,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,3.5
       parent: 2
-  - uid: 585
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 79.5,-42.5
-      parent: 2
   - uid: 737
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 34.5,-18.5
       parent: 2
+  - uid: 1567
+    components:
+    - type: Transform
+      pos: -9.5,-35.5
+      parent: 2
   - uid: 2255
     components:
     - type: Transform
@@ -77242,12 +76813,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 44.5,-24.5
       parent: 2
-  - uid: 5053
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-34.5
-      parent: 2
   - uid: 5151
     components:
     - type: Transform
@@ -77295,6 +76860,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-50.5
       parent: 2
+  - uid: 7772
+    components:
+    - type: Transform
+      pos: -2.5,-30.5
+      parent: 2
   - uid: 7836
     components:
     - type: Transform
@@ -77306,12 +76876,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 17.5,-20.5
       parent: 2
-  - uid: 8007
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-36.5
-      parent: 2
   - uid: 8496
     components:
     - type: Transform
@@ -77341,6 +76905,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-45.5
       parent: 2
+  - uid: 9148
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-35.5
+      parent: 2
   - uid: 9790
     components:
     - type: Transform
@@ -77358,6 +76928,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-16.5
       parent: 2
+  - uid: 11678
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,-35.5
+      parent: 2
   - uid: 12898
     components:
     - type: Transform
@@ -77429,12 +77005,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 34.5,15.5
       parent: 2
-  - uid: 16564
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-37.5
-      parent: 2
   - uid: 16653
     components:
     - type: Transform
@@ -77464,12 +77034,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,22.5
       parent: 2
-  - uid: 17580
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-32.5
-      parent: 2
   - uid: 18097
     components:
     - type: Transform
@@ -77488,12 +77052,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-24.5
       parent: 2
-  - uid: 18635
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-34.5
-      parent: 2
   - uid: 18854
     components:
     - type: Transform
@@ -77575,6 +77133,11 @@ entities:
     - type: Transform
       pos: -19.5,8.5
       parent: 2
+  - uid: 24735
+    components:
+    - type: Transform
+      pos: 55.5,-36.5
+      parent: 2
 - proto: DisposalUnit
   entities:
   - uid: 815
@@ -77602,16 +77165,16 @@ entities:
     - type: Transform
       pos: -27.5,-16.5
       parent: 2
-  - uid: 2170
-    components:
-    - type: Transform
-      pos: 79.5,-42.5
-      parent: 2
   - uid: 2297
     components:
     - type: Transform
       pos: -19.5,8.5
       parent: 2
+  - uid: 2586
+    components:
+    - type: Transform
+      pos: -9.5,-35.5
+      parent: 2
   - uid: 2871
     components:
     - type: Transform
@@ -77627,16 +77190,6 @@ entities:
     - type: Transform
       pos: -14.5,-37.5
       parent: 2
-  - uid: 3446
-    components:
-    - type: Transform
-      pos: -9.5,-34.5
-      parent: 2
-  - uid: 3482
-    components:
-    - type: Transform
-      pos: -5.5,-36.5
-      parent: 2
   - uid: 3617
     components:
     - type: Transform
@@ -77662,11 +77215,6 @@ entities:
     - type: Transform
       pos: 29.5,-53.5
       parent: 2
-  - uid: 4972
-    components:
-    - type: Transform
-      pos: 58.5,-37.5
-      parent: 2
   - uid: 5000
     components:
     - type: Transform
@@ -77742,6 +77290,11 @@ entities:
     - type: Transform
       pos: 11.5,22.5
       parent: 2
+  - uid: 11776
+    components:
+    - type: Transform
+      pos: 55.5,-36.5
+      parent: 2
   - uid: 12132
     components:
     - type: Transform
@@ -77812,6 +77365,11 @@ entities:
     - type: Transform
       pos: -49.5,-28.5
       parent: 2
+  - uid: 15854
+    components:
+    - type: Transform
+      pos: -2.5,-30.5
+      parent: 2
   - uid: 15874
     components:
     - type: Transform
@@ -77854,6 +77412,11 @@ entities:
       parent: 2
 - proto: DisposalYJunction
   entities:
+  - uid: 4023
+    components:
+    - type: Transform
+      pos: -12.5,-38.5
+      parent: 2
   - uid: 4786
     components:
     - type: Transform
@@ -78077,15 +77640,6 @@ entities:
     - type: Transform
       pos: 35.323483,3.8103867
       parent: 2
-- proto: DrinkCreamCarton
-  entities:
-  - uid: 3245
-    components:
-    - type: Transform
-      parent: 3241
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: DrinkDoctorsDelightGlass
   entities:
   - uid: 14103
@@ -78150,6 +77704,13 @@ entities:
     - type: Transform
       pos: 18.431465,17.597729
       parent: 2
+- proto: DrinkGreenTea
+  entities:
+  - uid: 22066
+    components:
+    - type: Transform
+      pos: -36.320995,-53.52601
+      parent: 2
 - proto: DrinkGrenadineBottleFull
   entities:
   - uid: 9546
@@ -78225,15 +77786,6 @@ entities:
     - type: Transform
       pos: -11.471631,-51.134304
       parent: 2
-- proto: DrinkMilkCarton
-  entities:
-  - uid: 3244
-    components:
-    - type: Transform
-      parent: 3241
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: DrinkMopwataBottleRandom
   entities:
   - uid: 1380
@@ -78359,15 +77911,6 @@ entities:
     - type: Transform
       pos: -0.088784575,23.71244
       parent: 2
-- proto: DrinkSoyMilkCarton
-  entities:
-  - uid: 3246
-    components:
-    - type: Transform
-      parent: 3241
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: DrinkSpaceGlue
   entities:
   - uid: 3898
@@ -79394,6 +78937,14 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 3229
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-33.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 3541
     components:
     - type: Transform
@@ -80024,9 +79575,6 @@ entities:
       - 16320
       - 16319
       - 16318
-      - 15150
-      - 15164
-      - 15165
     - type: Fixtures
       fixtures: {}
   - uid: 15202
@@ -80836,6 +80384,15 @@ entities:
       - 13639
       - 15272
       - 15421
+  - uid: 1698
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1933
   - uid: 1720
     components:
     - type: Transform
@@ -80859,6 +80416,15 @@ entities:
       - 15907
       - 15331
       - 16008
+  - uid: 2257
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1933
   - uid: 2282
     components:
     - type: Transform
@@ -80870,6 +80436,15 @@ entities:
       - 13639
       - 15272
       - 15421
+  - uid: 2307
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1933
   - uid: 2321
     components:
     - type: Transform
@@ -80892,6 +80467,15 @@ entities:
       - 3820
       - 21906
       - 22438
+  - uid: 2451
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1933
   - uid: 2520
     components:
     - type: Transform
@@ -81534,16 +81118,6 @@ entities:
       deviceLists:
       - 14047
       - 58
-  - uid: 15150
-    components:
-    - type: Transform
-      pos: -8.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 15163
-      - 15139
-      - 17576
   - uid: 15151
     components:
     - type: Transform
@@ -81580,26 +81154,6 @@ entities:
       - 15907
       - 15331
       - 16008
-  - uid: 15164
-    components:
-    - type: Transform
-      pos: -7.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 15163
-      - 15139
-      - 17576
-  - uid: 15165
-    components:
-    - type: Transform
-      pos: -6.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 15163
-      - 15139
-      - 17576
   - uid: 15171
     components:
     - type: Transform
@@ -82585,14 +82139,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 2688
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-31.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 4366
     components:
     - type: Transform
@@ -82630,6 +82176,13 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 11681
+    components:
+    - type: Transform
+      pos: -10.5,-31.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 12929
     components:
     - type: Transform
@@ -82953,23 +82506,11 @@ entities:
       parent: 2
 - proto: FoodBowlBig
   entities:
-  - uid: 3250
-    components:
-    - type: Transform
-      pos: 1.388993,-33.390644
-      parent: 2
   - uid: 8402
     components:
     - type: Transform
       pos: 39.47634,-17.316113
       parent: 2
-- proto: FoodBowlBigTrash
-  entities:
-  - uid: 3205
-    components:
-    - type: Transform
-      pos: 1.512306,-29.339378
-      parent: 2
 - proto: FoodBoxDonut
   entities:
   - uid: 12214
@@ -82998,11 +82539,11 @@ entities:
       parent: 2
 - proto: FoodCartHot
   entities:
-  - uid: 16000
+  - uid: 20415
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 1.5,-34.5
+      pos: -3.5,-30.5
       parent: 2
 - proto: FoodCondimentBottleBBQ
   entities:
@@ -83049,13 +82590,6 @@ entities:
     - type: Transform
       pos: 21.419569,-6.3672676
       parent: 2
-- proto: FoodContainerEgg
-  entities:
-  - uid: 3260
-    components:
-    - type: Transform
-      pos: -4.502074,-32.16814
-      parent: 2
 - proto: FoodDonutCaramel
   entities:
   - uid: 5594
@@ -83098,29 +82632,16 @@ entities:
       parent: 2
 - proto: FoodMeat
   entities:
-  - uid: 3383
+  - uid: 3241
     components:
     - type: Transform
-      parent: 3241
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 3676
+      pos: -10.675427,-33.534927
+      parent: 2
+  - uid: 4213
     components:
     - type: Transform
-      parent: 3241
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: FoodOnion
-  entities:
-  - uid: 1024
-    components:
-    - type: Transform
-      parent: 3241
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: -10.321085,-33.587044
+      parent: 2
 - proto: FoodPieBananaCream
   entities:
   - uid: 5033
@@ -83162,13 +82683,6 @@ entities:
     - type: Transform
       pos: 13.408668,-59.42358
       parent: 2
-- proto: FoodPlateTin
-  entities:
-  - uid: 3253
-    components:
-    - type: Transform
-      pos: 1.7537582,-33.348946
-      parent: 2
 - proto: FoodPoppy
   entities:
   - uid: 600
@@ -83183,11 +82697,6 @@ entities:
       parent: 2
 - proto: FoodShakerPepper
   entities:
-  - uid: 12891
-    components:
-    - type: Transform
-      pos: -8.667622,-35.44696
-      parent: 2
   - uid: 19602
     components:
     - type: Transform
@@ -83195,11 +82704,6 @@ entities:
       parent: 2
 - proto: FoodShakerSalt
   entities:
-  - uid: 17578
-    components:
-    - type: Transform
-      pos: -8.459184,-35.530354
-      parent: 2
   - uid: 19599
     components:
     - type: Transform
@@ -83233,11 +82737,6 @@ entities:
       parent: 2
 - proto: FoodTinMRETrash
   entities:
-  - uid: 13164
-    components:
-    - type: Transform
-      pos: -0.63953733,-29.354218
-      parent: 2
   - uid: 21603
     components:
     - type: Transform
@@ -83255,11 +82754,6 @@ entities:
     - type: Transform
       pos: 14.418226,-6.5569444
       parent: 2
-  - uid: 3941
-    components:
-    - type: Transform
-      pos: 1.491024,-28.265974
-      parent: 2
   - uid: 18407
     components:
     - type: Transform
@@ -83279,11 +82773,6 @@ entities:
       parent: 2
 - proto: FoodTinPeachesTrash
   entities:
-  - uid: 13161
-    components:
-    - type: Transform
-      pos: -0.35320318,-29.193445
-      parent: 2
   - uid: 16493
     components:
     - type: Transform
@@ -83333,7 +82822,7 @@ entities:
   - uid: 16757
     components:
     - type: Transform
-      pos: 67.912865,-41.277626
+      pos: 66.56502,-41.982643
       parent: 2
 - proto: GasAnalyzer
   entities:
@@ -83535,12 +83024,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,6.5
       parent: 2
-  - uid: 2562
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-31.5
-      parent: 2
   - uid: 2988
     components:
     - type: Transform
@@ -83567,14 +83050,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 17575
+  - uid: 16025
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 76.5,-38.5
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-30.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 18174
     components:
     - type: Transform
@@ -83652,6 +83133,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1686
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1727
     components:
     - type: Transform
@@ -83674,6 +83163,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 27.5,-46.5
       parent: 2
+  - uid: 1903
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 2018
     components:
     - type: Transform
@@ -83790,11 +83287,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 4197
-    components:
-    - type: Transform
-      pos: -0.5,-31.5
-      parent: 2
   - uid: 4433
     components:
     - type: Transform
@@ -84606,6 +84098,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 16000
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 16248
     components:
     - type: Transform
@@ -84706,20 +84206,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 18224
+  - uid: 18436
     components:
     - type: Transform
-      pos: 78.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 18544
-    components:
-    - type: Transform
-      pos: 79.5,-37.5
+      rot: 3.141592653589793 rad
+      pos: 67.5,-40.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 18561
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 78.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 18659
     components:
     - type: Transform
@@ -84783,6 +84285,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 18900
+    components:
+    - type: Transform
+      pos: 67.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 18938
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 19548
     components:
     - type: Transform
@@ -85017,14 +84534,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 23119
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-30.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 23126
     components:
     - type: Transform
@@ -85342,14 +84851,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 24596
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 24613
     components:
     - type: Transform
@@ -85543,13 +85044,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 18668
-    components:
-    - type: Transform
-      pos: 79.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 23976
     components:
     - type: Transform
@@ -86965,12 +86459,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 3238
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-31.5
-      parent: 2
   - uid: 3239
     components:
     - type: Transform
@@ -87727,6 +87215,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 6135
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 6157
     components:
     - type: Transform
@@ -88494,6 +87990,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7770
+    components:
+    - type: Transform
+      pos: -6.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7857
     components:
     - type: Transform
@@ -89382,6 +88885,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 10266
+    components:
+    - type: Transform
+      pos: -6.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 10455
     components:
     - type: Transform
@@ -89795,13 +89305,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 11215
-    components:
-    - type: Transform
-      pos: -6.5,-34.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 11276
     components:
     - type: Transform
@@ -89980,6 +89483,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 11499
+    components:
+    - type: Transform
+      pos: -6.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 11517
     components:
     - type: Transform
@@ -90042,8 +89552,8 @@ entities:
   - uid: 11642
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-35.5
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-36.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -90063,6 +89573,30 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 11656
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 11758
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 11759
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 11779
     components:
     - type: Transform
@@ -90101,14 +89635,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 11929
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 11949
     components:
     - type: Transform
@@ -92853,13 +92379,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 14007
-    components:
-    - type: Transform
-      pos: -6.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 14009
     components:
     - type: Transform
@@ -95012,22 +94531,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 15124
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 15125
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-35.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 15129
     components:
     - type: Transform
@@ -95044,14 +94547,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 15132
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 15159
     components:
     - type: Transform
@@ -95286,6 +94781,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 15788
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 15824
     components:
     - type: Transform
@@ -95294,6 +94797,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 15837
+    components:
+    - type: Transform
+      pos: -6.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 15847
     components:
     - type: Transform
@@ -95325,6 +94835,36 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 16001
+    components:
+    - type: Transform
+      pos: -6.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 16026
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 16027
+    components:
+    - type: Transform
+      pos: -11.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 16045
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 16194
     components:
     - type: Transform
@@ -95394,13 +94934,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 16928
-    components:
-    - type: Transform
-      pos: -6.5,-32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 16929
     components:
     - type: Transform
@@ -95967,6 +95500,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 17581
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 17748
     components:
     - type: Transform
@@ -95997,6 +95538,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 17892
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 17893
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 18063
     components:
     - type: Transform
@@ -96005,39 +95562,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 18183
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 77.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 18444
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18447
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18453
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18461
+  - uid: 18184
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -96045,31 +95570,15 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 18468
+  - uid: 18362
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 62.5,-37.5
+      pos: 59.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 18469
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18485
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18503
+  - uid: 18444
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -96077,51 +95586,19 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 18504
+  - uid: 18447
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 66.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18506
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18509
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18511
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-37.5
+      pos: 63.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 18512
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 70.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18523
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 72.5,-37.5
+      rot: 3.141592653589793 rad
+      pos: 67.5,-38.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -96129,7 +95606,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 73.5,-37.5
+      pos: 64.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -96137,7 +95614,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 74.5,-37.5
+      pos: 62.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -96145,15 +95622,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 75.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18537
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-37.5
+      pos: 58.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -96161,15 +95630,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 77.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18540
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 78.5,-37.5
+      pos: 56.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -96177,7 +95638,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-37.5
+      pos: 60.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -96188,27 +95649,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 18552
-    components:
-    - type: Transform
-      pos: 79.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18561
-    components:
-    - type: Transform
-      pos: 79.5,-39.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 18580
-    components:
-    - type: Transform
-      pos: 79.5,-40.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 18581
     components:
     - type: Transform
@@ -96297,6 +95737,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 18639
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 18642
     components:
     - type: Transform
@@ -96615,13 +96063,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 18939
-    components:
-    - type: Transform
-      pos: 78.5,-39.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 18969
     components:
     - type: Transform
@@ -96825,6 +96266,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 19558
+    components:
+    - type: Transform
+      pos: -11.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 19982
     components:
     - type: Transform
@@ -97767,10 +97215,10 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -4.5,-30.5
+      pos: -4.5,-31.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 22583
     components:
     - type: Transform
@@ -97803,6 +97251,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 22780
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 23061
     components:
     - type: Transform
@@ -97936,58 +97392,26 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 23107
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-31.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 23109
-    components:
-    - type: Transform
-      pos: -7.5,-34.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 23111
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-31.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 23113
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-31.5
+      pos: -11.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 23114
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-34.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 23115
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 23117
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -5.5,-30.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 23118
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-30.5
+      pos: -9.5,-36.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -100329,6 +99753,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 715
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1308
     components:
     - type: Transform
@@ -100830,6 +100262,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7768
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 7930
     components:
     - type: Transform
@@ -102006,6 +101446,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 16023
+    components:
+    - type: Transform
+      pos: -6.5,-31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 16127
     components:
     - type: Transform
@@ -102131,6 +101578,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 18485
+    components:
+    - type: Transform
+      pos: 79.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 18661
     components:
     - type: Transform
@@ -102155,14 +101609,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 18864
+  - uid: 18899
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 78.5,-40.5
+      pos: 69.5,-40.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 19570
     components:
     - type: Transform
@@ -102170,6 +101623,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
+  - uid: 19580
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 21066
     components:
     - type: Transform
@@ -102210,6 +101671,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 22068
+    components:
+    - type: Transform
+      pos: 57.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 22237
     components:
     - type: Transform
@@ -102318,21 +101786,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 23110
-    components:
-    - type: Transform
-      pos: -6.5,-31.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 23116
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 23405
     components:
     - type: Transform
@@ -102544,13 +101997,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 24595
-    components:
-    - type: Transform
-      pos: 57.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 24618
     components:
     - type: Transform
@@ -102892,6 +102338,12 @@ entities:
     - type: Transform
       pos: 32.5,-40.5
       parent: 2
+  - uid: 11764
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-30.5
+      parent: 2
   - uid: 14822
     components:
     - type: Transform
@@ -102899,12 +102351,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 16001
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-32.5
-      parent: 2
 - proto: GasThermoMachineHeater
   entities:
   - uid: 2409
@@ -102934,14 +102380,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 19546
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 23403
     components:
     - type: Transform
@@ -102964,6 +102402,17 @@ entities:
       color: '#03FCD3FF'
 - proto: GasVentPump
   entities:
+  - uid: 585
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+    - type: DeviceNetwork
+      deviceLists:
+      - 1909
   - uid: 646
     components:
     - type: Transform
@@ -103053,6 +102502,17 @@ entities:
       - 24059
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1689
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-33.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1933
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1913
     components:
     - type: Transform
@@ -103277,6 +102737,16 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 103
+  - uid: 7085
+    components:
+    - type: Transform
+      pos: -7.5,-33.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1933
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 7482
     components:
     - type: Transform
@@ -104026,15 +103496,25 @@ entities:
       - 13655
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 17941
+  - uid: 18032
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-38.5
+      pos: 66.5,-36.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: DeviceNetwork
       deviceLists:
       - 1909
+  - uid: 18523
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18894
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 18813
@@ -104070,17 +103550,6 @@ entities:
       - 18902
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 18899
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-40.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18894
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 19984
     components:
     - type: Transform
@@ -104368,17 +103837,6 @@ entities:
       - 14795
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 23108
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-33.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17576
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 23129
     components:
     - type: Transform
@@ -104755,14 +104213,14 @@ entities:
       color: '#0055CCFF'
 - proto: GasVentPumpFreezer
   entities:
-  - uid: 9632
+  - uid: 7072
     components:
     - type: Transform
-      pos: -3.5,-30.5
+      pos: -11.5,-32.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 22282
+      - 2191
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -104863,6 +104321,17 @@ entities:
       - 2196
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 2562
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-31.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 1933
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 2752
     components:
     - type: Transform
@@ -105640,17 +105109,6 @@ entities:
       - 15937
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 15115
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-31.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17576
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 15120
     components:
     - type: Transform
@@ -105915,17 +105373,6 @@ entities:
       - 18902
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 18900
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18894
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 19969
     components:
     - type: Transform
@@ -106116,6 +105563,16 @@ entities:
       - 14795
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 23117
+    components:
+    - type: Transform
+      pos: 69.5,-43.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18894
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 23131
     components:
     - type: Transform
@@ -106490,16 +105947,17 @@ entities:
       color: '#990000FF'
 - proto: GasVentScrubberFreezer
   entities:
-  - uid: 9463
+  - uid: 13399
     components:
     - type: Transform
-      pos: -4.5,-31.5
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-31.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 22282
+      - 2191
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#990000FF'
 - proto: GasVolumePump
   entities:
   - uid: 10856
@@ -107428,6 +106886,11 @@ entities:
     - type: Transform
       pos: -14.5,-18.5
       parent: 2
+  - uid: 2154
+    components:
+    - type: Transform
+      pos: 62.5,-35.5
+      parent: 2
   - uid: 2214
     components:
     - type: Transform
@@ -107453,6 +106916,11 @@ entities:
     - type: Transform
       pos: -22.5,-67.5
       parent: 2
+  - uid: 2371
+    components:
+    - type: Transform
+      pos: 67.5,-35.5
+      parent: 2
   - uid: 2383
     components:
     - type: Transform
@@ -107463,6 +106931,11 @@ entities:
     - type: Transform
       pos: -14.5,-20.5
       parent: 2
+  - uid: 2404
+    components:
+    - type: Transform
+      pos: 69.5,-36.5
+      parent: 2
   - uid: 2411
     components:
     - type: Transform
@@ -107478,6 +106951,11 @@ entities:
     - type: Transform
       pos: -14.5,-1.5
       parent: 2
+  - uid: 2459
+    components:
+    - type: Transform
+      pos: 69.5,-38.5
+      parent: 2
   - uid: 2527
     components:
     - type: Transform
@@ -108153,26 +107631,11 @@ entities:
     - type: Transform
       pos: -15.5,-62.5
       parent: 2
-  - uid: 4922
-    components:
-    - type: Transform
-      pos: 59.5,-37.5
-      parent: 2
-  - uid: 4923
-    components:
-    - type: Transform
-      pos: 59.5,-38.5
-      parent: 2
   - uid: 4924
     components:
     - type: Transform
       pos: -15.5,-67.5
       parent: 2
-  - uid: 4935
-    components:
-    - type: Transform
-      pos: 59.5,-36.5
-      parent: 2
   - uid: 4952
     components:
     - type: Transform
@@ -108323,11 +107786,6 @@ entities:
     - type: Transform
       pos: -27.5,26.5
       parent: 2
-  - uid: 5449
-    components:
-    - type: Transform
-      pos: 58.5,-38.5
-      parent: 2
   - uid: 5453
     components:
     - type: Transform
@@ -108373,6 +107831,12 @@ entities:
     - type: Transform
       pos: -42.5,-26.5
       parent: 2
+  - uid: 5546
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-41.5
+      parent: 2
   - uid: 5568
     components:
     - type: Transform
@@ -108483,6 +107947,18 @@ entities:
     - type: Transform
       pos: -21.5,-22.5
       parent: 2
+  - uid: 5892
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-44.5
+      parent: 2
+  - uid: 5898
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-43.5
+      parent: 2
   - uid: 5925
     components:
     - type: Transform
@@ -108493,6 +107969,12 @@ entities:
     - type: Transform
       pos: -27.5,29.5
       parent: 2
+  - uid: 6059
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-42.5
+      parent: 2
   - uid: 6071
     components:
     - type: Transform
@@ -108583,6 +108065,11 @@ entities:
     - type: Transform
       pos: 8.5,1.5
       parent: 2
+  - uid: 6555
+    components:
+    - type: Transform
+      pos: 59.5,-40.5
+      parent: 2
   - uid: 6585
     components:
     - type: Transform
@@ -108613,6 +108100,11 @@ entities:
     - type: Transform
       pos: 13.5,-38.5
       parent: 2
+  - uid: 6906
+    components:
+    - type: Transform
+      pos: 64.5,-40.5
+      parent: 2
   - uid: 6911
     components:
     - type: Transform
@@ -108648,6 +108140,11 @@ entities:
     - type: Transform
       pos: 10.5,1.5
       parent: 2
+  - uid: 6961
+    components:
+    - type: Transform
+      pos: 64.5,-41.5
+      parent: 2
   - uid: 6978
     components:
     - type: Transform
@@ -109928,6 +109425,11 @@ entities:
     - type: Transform
       pos: -49.5,-40.5
       parent: 2
+  - uid: 9983
+    components:
+    - type: Transform
+      pos: 60.5,-39.5
+      parent: 2
   - uid: 9987
     components:
     - type: Transform
@@ -110428,11 +109930,6 @@ entities:
     - type: Transform
       pos: -45.5,-9.5
       parent: 2
-  - uid: 11011
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
-      parent: 2
   - uid: 11016
     components:
     - type: Transform
@@ -110488,11 +109985,6 @@ entities:
     - type: Transform
       pos: -39.5,-4.5
       parent: 2
-  - uid: 11320
-    components:
-    - type: Transform
-      pos: 67.5,-39.5
-      parent: 2
   - uid: 11345
     components:
     - type: Transform
@@ -111823,11 +111315,6 @@ entities:
     - type: Transform
       pos: 72.5,11.5
       parent: 2
-  - uid: 16150
-    components:
-    - type: Transform
-      pos: 65.5,-40.5
-      parent: 2
   - uid: 16152
     components:
     - type: Transform
@@ -111948,21 +111435,6 @@ entities:
     - type: Transform
       pos: -50.5,6.5
       parent: 2
-  - uid: 16522
-    components:
-    - type: Transform
-      pos: 65.5,-43.5
-      parent: 2
-  - uid: 16523
-    components:
-    - type: Transform
-      pos: 65.5,-42.5
-      parent: 2
-  - uid: 16525
-    components:
-    - type: Transform
-      pos: 65.5,-41.5
-      parent: 2
   - uid: 16546
     components:
     - type: Transform
@@ -111973,11 +111445,22 @@ entities:
     - type: Transform
       pos: 85.5,-56.5
       parent: 2
+  - uid: 16561
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 79.5,-39.5
+      parent: 2
   - uid: 16570
     components:
     - type: Transform
       pos: 72.5,-41.5
       parent: 2
+  - uid: 16573
+    components:
+    - type: Transform
+      pos: 61.5,-35.5
+      parent: 2
   - uid: 16575
     components:
     - type: Transform
@@ -111988,11 +111471,6 @@ entities:
     - type: Transform
       pos: 71.5,-45.5
       parent: 2
-  - uid: 16611
-    components:
-    - type: Transform
-      pos: 68.5,-39.5
-      parent: 2
   - uid: 16615
     components:
     - type: Transform
@@ -112073,11 +111551,6 @@ entities:
     - type: Transform
       pos: -9.5,15.5
       parent: 2
-  - uid: 16834
-    components:
-    - type: Transform
-      pos: 58.5,-36.5
-      parent: 2
   - uid: 16846
     components:
     - type: Transform
@@ -112088,11 +111561,6 @@ entities:
     - type: Transform
       pos: 67.5,-45.5
       parent: 2
-  - uid: 16881
-    components:
-    - type: Transform
-      pos: 66.5,-39.5
-      parent: 2
   - uid: 16883
     components:
     - type: Transform
@@ -112373,11 +111841,41 @@ entities:
     - type: Transform
       pos: -13.5,39.5
       parent: 2
+  - uid: 17898
+    components:
+    - type: Transform
+      pos: 69.5,-37.5
+      parent: 2
+  - uid: 17900
+    components:
+    - type: Transform
+      pos: 68.5,-35.5
+      parent: 2
   - uid: 17901
     components:
     - type: Transform
       pos: -14.5,38.5
       parent: 2
+  - uid: 17902
+    components:
+    - type: Transform
+      pos: 66.5,-35.5
+      parent: 2
+  - uid: 17913
+    components:
+    - type: Transform
+      pos: 63.5,-35.5
+      parent: 2
+  - uid: 17917
+    components:
+    - type: Transform
+      pos: 63.5,-39.5
+      parent: 2
+  - uid: 17918
+    components:
+    - type: Transform
+      pos: 62.5,-39.5
+      parent: 2
   - uid: 17926
     components:
     - type: Transform
@@ -112433,6 +111931,17 @@ entities:
     - type: Transform
       pos: -11.5,27.5
       parent: 2
+  - uid: 18182
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-39.5
+      parent: 2
+  - uid: 18189
+    components:
+    - type: Transform
+      pos: 60.5,-35.5
+      parent: 2
   - uid: 18204
     components:
     - type: Transform
@@ -112698,11 +112207,6 @@ entities:
     - type: Transform
       pos: 92.5,-33.5
       parent: 2
-  - uid: 18432
-    components:
-    - type: Transform
-      pos: 65.5,-38.5
-      parent: 2
   - uid: 18451
     components:
     - type: Transform
@@ -112773,6 +112277,12 @@ entities:
     - type: Transform
       pos: 97.5,-31.5
       parent: 2
+  - uid: 18544
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 81.5,-39.5
+      parent: 2
   - uid: 18606
     components:
     - type: Transform
@@ -113048,6 +112558,27 @@ entities:
     - type: Transform
       pos: 77.5,-13.5
       parent: 2
+  - uid: 19568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-40.5
+      parent: 2
+  - uid: 19571
+    components:
+    - type: Transform
+      pos: 61.5,-39.5
+      parent: 2
+  - uid: 19572
+    components:
+    - type: Transform
+      pos: 79.5,-37.5
+      parent: 2
+  - uid: 19582
+    components:
+    - type: Transform
+      pos: 82.5,-34.5
+      parent: 2
   - uid: 19591
     components:
     - type: Transform
@@ -113868,6 +113399,12 @@ entities:
     - type: Transform
       pos: 15.5,27.5
       parent: 2
+  - uid: 22213
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,-35.5
+      parent: 2
   - uid: 22345
     components:
     - type: Transform
@@ -113903,11 +113440,6 @@ entities:
     - type: Transform
       pos: 28.5,-7.5
       parent: 2
-  - uid: 23114
-    components:
-    - type: Transform
-      pos: -5.5,-30.5
-      parent: 2
   - uid: 23669
     components:
     - type: Transform
@@ -113923,20 +113455,40 @@ entities:
     - type: Transform
       pos: 46.5,26.5
       parent: 2
-  - uid: 24732
+  - uid: 24532
     components:
     - type: Transform
-      pos: 78.5,-39.5
+      pos: 81.5,-35.5
       parent: 2
-  - uid: 24733
+  - uid: 24533
     components:
     - type: Transform
-      pos: 77.5,-38.5
+      pos: 78.5,-38.5
       parent: 2
-  - uid: 24734
+  - uid: 24534
     components:
     - type: Transform
-      pos: 80.5,-37.5
+      pos: 80.5,-36.5
+      parent: 2
+  - uid: 24535
+    components:
+    - type: Transform
+      pos: 79.5,-38.5
+      parent: 2
+  - uid: 24755
+    components:
+    - type: Transform
+      pos: 72.5,-37.5
+      parent: 2
+  - uid: 24756
+    components:
+    - type: Transform
+      pos: 73.5,-37.5
+      parent: 2
+  - uid: 24757
+    components:
+    - type: Transform
+      pos: 75.5,-37.5
       parent: 2
 - proto: GrilleBroken
   entities:
@@ -114021,6 +113573,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,-67.5
       parent: 2
+  - uid: 5169
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-27.5
+      parent: 2
   - uid: 5518
     components:
     - type: Transform
@@ -116089,6 +115647,11 @@ entities:
       parent: 2
 - proto: HolopadServiceBotany
   entities:
+  - uid: 13697
+    components:
+    - type: Transform
+      pos: -17.5,-36.5
+      parent: 2
   - uid: 20724
     components:
     - type: Transform
@@ -116117,10 +115680,10 @@ entities:
       parent: 2
 - proto: HolopadServiceKitchen
   entities:
-  - uid: 20815
+  - uid: 141
     components:
     - type: Transform
-      pos: -8.5,-32.5
+      pos: -6.5,-33.5
       parent: 2
 - proto: HolopadServiceLibrary
   entities:
@@ -116341,12 +115904,6 @@ entities:
     - type: Transform
       pos: -23.5,15.5
       parent: 2
-  - uid: 715
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -16.5,-37.5
-      parent: 2
   - uid: 811
     components:
     - type: Transform
@@ -116367,22 +115924,16 @@ entities:
     - type: Transform
       pos: -24.5,16.5
       parent: 2
-  - uid: 2503
+  - uid: 2584
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,-37.5
+      pos: -16.5,-36.5
       parent: 2
   - uid: 3292
     components:
     - type: Transform
       pos: -20.5,-33.5
       parent: 2
-  - uid: 3330
-    components:
-    - type: Transform
-      pos: -18.5,-32.5
-      parent: 2
   - uid: 3331
     components:
     - type: Transform
@@ -116429,16 +115980,20 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.5,-35.5
       parent: 2
-  - uid: 3413
+  - uid: 10978
     components:
     - type: Transform
       pos: -16.5,-32.5
       parent: 2
-  - uid: 11450
+  - uid: 11215
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,-32.5
+      pos: -18.5,-32.5
+      parent: 2
+  - uid: 11307
+    components:
+    - type: Transform
+      pos: -20.5,-34.5
       parent: 2
   - uid: 11560
     components:
@@ -116465,6 +116020,17 @@ entities:
     - type: Transform
       pos: 47.5,-62.5
       parent: 2
+  - uid: 17576
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-31.5
+      parent: 2
+  - uid: 23109
+    components:
+    - type: Transform
+      pos: -18.5,-36.5
+      parent: 2
 - proto: IDComputerCircuitboard
   entities:
   - uid: 9345
@@ -116717,19 +116283,19 @@ entities:
       parent: 2
 - proto: KitchenElectricGrill
   entities:
-  - uid: 3466
+  - uid: 7767
     components:
     - type: Transform
-      pos: -7.5,-33.5
+      pos: -5.5,-33.5
+      parent: 2
+  - uid: 14104
+    components:
+    - type: Transform
+      pos: -5.5,-32.5
       parent: 2
 - proto: KitchenMicrowave
   entities:
-  - uid: 3252
-    components:
-    - type: Transform
-      pos: -7.5,-30.5
-      parent: 2
-  - uid: 6082
+  - uid: 2608
     components:
     - type: Transform
       pos: -6.5,-30.5
@@ -116739,6 +116305,11 @@ entities:
     - type: Transform
       pos: -31.5,15.5
       parent: 2
+  - uid: 11682
+    components:
+    - type: Transform
+      pos: -7.5,-30.5
+      parent: 2
   - uid: 18794
     components:
     - type: Transform
@@ -116751,11 +116322,6 @@ entities:
       parent: 2
 - proto: KitchenReagentGrinder
   entities:
-  - uid: 2586
-    components:
-    - type: Transform
-      pos: -8.5,-30.5
-      parent: 2
   - uid: 3325
     components:
     - type: Transform
@@ -116766,6 +116332,11 @@ entities:
     - type: Transform
       pos: -29.5,-36.5
       parent: 2
+  - uid: 7771
+    components:
+    - type: Transform
+      pos: -5.5,-30.5
+      parent: 2
   - uid: 10451
     components:
     - type: Transform
@@ -116778,10 +116349,10 @@ entities:
       parent: 2
 - proto: KitchenSpike
   entities:
-  - uid: 3236
+  - uid: 11760
     components:
     - type: Transform
-      pos: -2.5,-30.5
+      pos: -10.5,-32.5
       parent: 2
 - proto: KnifePlastic
   entities:
@@ -117542,48 +117113,49 @@ entities:
       fixtures: {}
 - proto: LockableButtonHydroponics
   entities:
-  - uid: 16045
+  - uid: 3512
     components:
+    - type: MetaData
+      name: Shutters
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,-35.5
+      pos: -19.5,-31.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        3457:
-        - - Pressed
-          - DoorBolt
-        3456:
-        - - Pressed
-          - DoorBolt
-        16035:
+        16037:
         - - Pressed
           - Toggle
         16036:
         - - Pressed
           - Toggle
-        16037:
+        16035:
+        - - Pressed
+          - Toggle
+        11756:
         - - Pressed
           - Toggle
     - type: Fixtures
       fixtures: {}
 - proto: LockableButtonKitchen
   entities:
-  - uid: 16023
+  - uid: 9463
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-33.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,-35.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        16025:
+        6517:
         - - Pressed
           - Toggle
-        16026:
+        3232:
         - - Pressed
           - Toggle
-        16027:
+        3238:
+        - - Pressed
+          - Toggle
+        3236:
         - - Pressed
           - Toggle
     - type: Fixtures
@@ -117880,9 +117452,6 @@ entities:
         - - Pressed
           - Toggle
         20173:
-        - - Pressed
-          - Toggle
-        17722:
         - - Pressed
           - Toggle
         11980:
@@ -118039,10 +117608,10 @@ entities:
       parent: 2
 - proto: LockerFreezer
   entities:
-  - uid: 7085
+  - uid: 3179
     components:
     - type: Transform
-      pos: 1.5,-31.5
+      pos: -9.5,-30.5
       parent: 2
 - proto: LockerFreezerVaultFilled
   entities:
@@ -118675,6 +118244,11 @@ entities:
     - type: Transform
       pos: -51.5,11.5
       parent: 2
+  - uid: 18209
+    components:
+    - type: Transform
+      pos: 68.5,-36.5
+      parent: 2
   - uid: 19249
     components:
     - type: Transform
@@ -118849,11 +118423,6 @@ entities:
       parent: 2
 - proto: LootSpawnerRandomLockbox
   entities:
-  - uid: 946
-    components:
-    - type: Transform
-      pos: -0.5,-25.5
-      parent: 2
   - uid: 23688
     components:
     - type: Transform
@@ -118908,6 +118477,11 @@ entities:
     - type: Transform
       pos: 52.5,-33.5
       parent: 2
+  - uid: 18511
+    components:
+    - type: Transform
+      pos: 67.5,-36.5
+      parent: 2
   - uid: 19550
     components:
     - type: Transform
@@ -118935,6 +118509,11 @@ entities:
       parent: 2
 - proto: LootSpawnerScienceMinor
   entities:
+  - uid: 3623
+    components:
+    - type: Transform
+      pos: 53.5,-35.5
+      parent: 2
   - uid: 11845
     components:
     - type: Transform
@@ -118980,16 +118559,6 @@ entities:
     - type: Transform
       pos: 20.5,-23.5
       parent: 2
-  - uid: 24554
-    components:
-    - type: Transform
-      pos: 55.5,-38.5
-      parent: 2
-  - uid: 24555
-    components:
-    - type: Transform
-      pos: 55.5,-36.5
-      parent: 2
 - proto: LootSpawnerSecurity
   entities:
   - uid: 12370
@@ -119220,6 +118789,16 @@ entities:
       parent: 2
 - proto: MailingUnit
   entities:
+  - uid: 2609
+    components:
+    - type: Transform
+      pos: -20.5,-35.5
+      parent: 2
+    - type: MailingUnit
+      tag: Botany
+    - type: Configuration
+      config:
+        tag: Botany
   - uid: 4438
     components:
     - type: Transform
@@ -119258,6 +118837,16 @@ entities:
       parent: 2
     - type: MailingUnit
       tag: Bar
+  - uid: 11761
+    components:
+    - type: Transform
+      pos: -3.5,-35.5
+      parent: 2
+    - type: MailingUnit
+      tag: Kitchen
+    - type: Configuration
+      config:
+        tag: Kitchen
   - uid: 12581
     components:
     - type: Transform
@@ -119278,24 +118867,6 @@ entities:
     - type: Configuration
       config:
         tag: Medical
-  - uid: 17870
-    components:
-    - type: Transform
-      pos: 1.5,-32.5
-      parent: 2
-    - type: MailingUnit
-      tag: Kitchen
-  - uid: 18639
-    components:
-    - type: Transform
-      pos: -20.5,-34.5
-      parent: 2
-    - type: MailingUnit
-      tag: Botany
-      target: Botany
-    - type: Configuration
-      config:
-        tag: Botany
   - uid: 18881
     components:
     - type: Transform
@@ -119835,6 +119406,11 @@ entities:
     - type: Transform
       pos: -52.5,23.5
       parent: 2
+  - uid: 17797
+    components:
+    - type: Transform
+      pos: 61.5,-36.5
+      parent: 2
   - uid: 20526
     components:
     - type: Transform
@@ -120593,6 +120169,11 @@ entities:
     - type: Transform
       pos: -37.35199,29.609798
       parent: 2
+  - uid: 16834
+    components:
+    - type: Transform
+      pos: 55.410675,-41.387962
+      parent: 2
 - proto: NitrousOxideCanister
   entities:
   - uid: 23804
@@ -120626,13 +120207,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 4942
-    components:
-    - type: Transform
-      pos: -9.5,-35.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 20234
     components:
     - type: Transform
@@ -120648,12 +120222,19 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 24795
+    components:
+    - type: Transform
+      pos: -10.5,-34.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: NTDefaultCircuitBoard
   entities:
   - uid: 8217
     components:
     - type: Transform
-      pos: 68.4268,-43.24812
+      pos: 66.56502,-43.48368
       parent: 2
 - proto: NuclearBomb
   entities:
@@ -120684,7 +120265,7 @@ entities:
   - uid: 7800
     components:
     - type: Transform
-      pos: 68.20655,-41.522404
+      pos: 66.29405,-41.774162
       parent: 2
 - proto: OperatingTable
   entities:
@@ -120850,6 +120431,11 @@ entities:
     - type: Transform
       pos: -37.560013,29.658756
       parent: 2
+  - uid: 16611
+    components:
+    - type: Transform
+      pos: 55.702488,-41.408806
+      parent: 2
 - proto: PaintingSkeletonBoof
   entities:
   - uid: 8008
@@ -120873,7 +120459,7 @@ entities:
   - uid: 8200
     components:
     - type: Transform
-      pos: 68.09642,-43.50514
+      pos: 66.34616,-43.26478
       parent: 2
 - proto: PanFluteInstrument
   entities:
@@ -121340,7 +120926,7 @@ entities:
   - uid: 17965
     components:
     - type: Transform
-      pos: 68.63681,-43.41416
+      pos: 81.4563,-44.453102
       parent: 2
   - uid: 22272
     components:
@@ -121498,12 +121084,6 @@ entities:
       parent: 2
 - proto: PlasticFlapsAirtightClear
   entities:
-  - uid: 3596
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-32.5
-      parent: 2
   - uid: 4758
     components:
     - type: Transform
@@ -121516,12 +121096,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,29.5
       parent: 2
-  - uid: 6839
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-32.5
-      parent: 2
   - uid: 7219
     components:
     - type: Transform
@@ -121739,10 +121313,10 @@ entities:
     - type: Transform
       pos: -1.5,-23.5
       parent: 2
-  - uid: 16755
+  - uid: 17936
     components:
     - type: Transform
-      pos: 96.5,-43.5
+      pos: 96.5,-41.5
       parent: 2
 - proto: PortableGeneratorSuperPacman
   entities:
@@ -122081,6 +121655,11 @@ entities:
     - type: Transform
       pos: 27.5,-31.5
       parent: 2
+  - uid: 11753
+    components:
+    - type: Transform
+      pos: -22.5,-35.5
+      parent: 2
   - uid: 12698
     components:
     - type: Transform
@@ -122116,11 +121695,6 @@ entities:
     - type: Transform
       pos: 33.5,-20.5
       parent: 2
-  - uid: 17573
-    components:
-    - type: Transform
-      pos: -22.5,-35.5
-      parent: 2
   - uid: 18913
     components:
     - type: Transform
@@ -122432,6 +122006,12 @@ entities:
     - type: Transform
       pos: 16.5,-56.5
       parent: 2
+  - uid: 3941
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-30.5
+      parent: 2
   - uid: 6132
     components:
     - type: Transform
@@ -122674,11 +122254,6 @@ entities:
     - type: Transform
       pos: 57.5,-40.5
       parent: 2
-  - uid: 24784
-    components:
-    - type: Transform
-      pos: 79.5,-37.5
-      parent: 2
 - proto: Poweredlight
   entities:
   - uid: 292
@@ -122687,6 +122262,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -23.5,-45.5
       parent: 2
+  - uid: 495
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-34.5
+      parent: 2
   - uid: 1026
     components:
     - type: Transform
@@ -122748,6 +122329,11 @@ entities:
     - type: Transform
       pos: 19.5,-39.5
       parent: 2
+  - uid: 3724
+    components:
+    - type: Transform
+      pos: -4.5,-30.5
+      parent: 2
   - uid: 3726
     components:
     - type: Transform
@@ -122865,17 +122451,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-48.5
       parent: 2
-  - uid: 6367
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-34.5
-      parent: 2
-  - uid: 6452
-    components:
-    - type: Transform
-      pos: -20.5,-36.5
-      parent: 2
   - uid: 6661
     components:
     - type: Transform
@@ -122953,12 +122528,6 @@ entities:
     - type: Transform
       pos: 26.5,-24.5
       parent: 2
-  - uid: 11499
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,-35.5
-      parent: 2
   - uid: 11540
     components:
     - type: Transform
@@ -123091,11 +122660,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 52.5,-19.5
       parent: 2
-  - uid: 11846
-    components:
-    - type: Transform
-      pos: -14.5,-37.5
-      parent: 2
   - uid: 11944
     components:
     - type: Transform
@@ -123247,6 +122811,12 @@ entities:
     - type: Transform
       pos: 19.5,15.5
       parent: 2
+  - uid: 16548
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-38.5
+      parent: 2
   - uid: 16935
     components:
     - type: Transform
@@ -123348,11 +122918,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 69.5,-44.5
       parent: 2
-  - uid: 18362
-    components:
-    - type: Transform
-      pos: 80.5,-40.5
-      parent: 2
   - uid: 18363
     components:
     - type: Transform
@@ -123417,6 +122982,11 @@ entities:
     - type: Transform
       pos: 8.5,-87.5
       parent: 2
+  - uid: 19573
+    components:
+    - type: Transform
+      pos: 58.5,-36.5
+      parent: 2
   - uid: 20123
     components:
     - type: Transform
@@ -123531,11 +123101,6 @@ entities:
     - type: Transform
       pos: -35.5,-22.5
       parent: 2
-  - uid: 21279
-    components:
-    - type: Transform
-      pos: -9.5,-30.5
-      parent: 2
   - uid: 21280
     components:
     - type: Transform
@@ -123548,12 +123113,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -50.5,-44.5
       parent: 2
-  - uid: 21283
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-33.5
-      parent: 2
   - uid: 21285
     components:
     - type: Transform
@@ -123672,6 +123231,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -13.5,-33.5
       parent: 2
+  - uid: 22709
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-33.5
+      parent: 2
   - uid: 22732
     components:
     - type: Transform
@@ -123916,6 +123481,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,-4.5
       parent: 2
+  - uid: 23854
+    components:
+    - type: Transform
+      pos: 78.5,-40.5
+      parent: 2
   - uid: 24640
     components:
     - type: Transform
@@ -123950,6 +123520,17 @@ entities:
     - type: Transform
       pos: -14.5,17.5
       parent: 2
+  - uid: 24788
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-34.5
+      parent: 2
+  - uid: 24792
+    components:
+    - type: Transform
+      pos: -19.5,-32.5
+      parent: 2
 - proto: PoweredlightEmpty
   entities:
   - uid: 21609
@@ -124180,12 +123761,6 @@ entities:
     - type: Transform
       pos: -36.5,-82.5
       parent: 2
-  - uid: 24795
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-39.5
-      parent: 2
 - proto: PoweredSmallLight
   entities:
   - uid: 233
@@ -124218,10 +123793,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-15.5
       parent: 2
-  - uid: 2944
+  - uid: 3283
     components:
     - type: Transform
-      pos: -3.5,-34.5
+      pos: -10.5,-30.5
       parent: 2
   - uid: 3362
     components:
@@ -124335,18 +123910,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,-12.5
       parent: 2
+  - uid: 7773
+    components:
+    - type: Transform
+      pos: -9.5,-35.5
+      parent: 2
   - uid: 7794
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-14.5
       parent: 2
-  - uid: 8299
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-32.5
-      parent: 2
   - uid: 8417
     components:
     - type: Transform
@@ -124452,17 +124026,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,-44.5
       parent: 2
-  - uid: 11657
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-32.5
-      parent: 2
   - uid: 11658
     components:
     - type: Transform
       pos: 24.5,8.5
       parent: 2
+  - uid: 11757
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-38.5
+      parent: 2
   - uid: 11863
     components:
     - type: Transform
@@ -124544,12 +124118,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,-78.5
       parent: 2
-  - uid: 13399
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-33.5
-      parent: 2
   - uid: 13650
     components:
     - type: Transform
@@ -124662,11 +124230,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,5.5
       parent: 2
-  - uid: 17722
-    components:
-    - type: Transform
-      pos: -10.5,-36.5
-      parent: 2
   - uid: 17949
     components:
     - type: Transform
@@ -124708,6 +124271,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 48.5,-61.5
       parent: 2
+  - uid: 19560
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,-33.5
+      parent: 2
   - uid: 19601
     components:
     - type: Transform
@@ -124934,6 +124503,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -28.5,-15.5
       parent: 2
+  - uid: 24793
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,-38.5
+      parent: 2
 - proto: PoweredSmallLightEmpty
   entities:
   - uid: 9504
@@ -125539,12 +125114,6 @@ entities:
       parent: 2
 - proto: Rack
   entities:
-  - uid: 124
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-29.5
-      parent: 2
   - uid: 213
     components:
     - type: Transform
@@ -125621,11 +125190,11 @@ entities:
     - type: Transform
       pos: 6.5,-16.5
       parent: 2
-  - uid: 3242
+  - uid: 3245
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-32.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-35.5
       parent: 2
   - uid: 3455
     components:
@@ -125638,18 +125207,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-37.5
       parent: 2
-  - uid: 3495
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-35.5
-      parent: 2
   - uid: 3503
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -52.5,-36.5
       parent: 2
+  - uid: 3676
+    components:
+    - type: Transform
+      pos: 53.5,-35.5
+      parent: 2
   - uid: 3715
     components:
     - type: Transform
@@ -125678,11 +125246,6 @@ entities:
     - type: Transform
       pos: -2.5,-25.5
       parent: 2
-  - uid: 3937
-    components:
-    - type: Transform
-      pos: 1.5,-28.5
-      parent: 2
   - uid: 4188
     components:
     - type: Transform
@@ -126100,11 +125663,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -37.5,29.5
       parent: 2
-  - uid: 15215
-    components:
-    - type: Transform
-      pos: -4.5,-30.5
-      parent: 2
   - uid: 15242
     components:
     - type: Transform
@@ -126154,6 +125712,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -57.5,-58.5
       parent: 2
+  - uid: 16150
+    components:
+    - type: Transform
+      pos: 55.5,-41.5
+      parent: 2
   - uid: 16411
     components:
     - type: Transform
@@ -126225,6 +125788,16 @@ entities:
     - type: Transform
       pos: -8.5,12.5
       parent: 2
+  - uid: 18203
+    components:
+    - type: Transform
+      pos: 68.5,-36.5
+      parent: 2
+  - uid: 18506
+    components:
+    - type: Transform
+      pos: 61.5,-36.5
+      parent: 2
   - uid: 18589
     components:
     - type: Transform
@@ -126241,6 +125814,11 @@ entities:
     - type: Transform
       pos: 38.5,-63.5
       parent: 2
+  - uid: 18933
+    components:
+    - type: Transform
+      pos: -0.5,-32.5
+      parent: 2
   - uid: 19227
     components:
     - type: Transform
@@ -127312,12 +126890,6 @@ entities:
     - type: Transform
       pos: -26.5,-14.5
       parent: 2
-  - uid: 24761
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-40.5
-      parent: 2
 - proto: RailingCornerSmall
   entities:
   - uid: 7089
@@ -127827,6 +127399,11 @@ entities:
     - type: Transform
       pos: 49.5,11.5
       parent: 2
+  - uid: 11763
+    components:
+    - type: Transform
+      pos: 1.5,-34.5
+      parent: 2
   - uid: 13721
     components:
     - type: Transform
@@ -127854,11 +127431,6 @@ entities:
       parent: 2
 - proto: RandomDrinkGlass
   entities:
-  - uid: 2191
-    components:
-    - type: Transform
-      pos: 52.5,-35.5
-      parent: 2
   - uid: 3864
     components:
     - type: Transform
@@ -127916,13 +127488,13 @@ entities:
     - type: Transform
       pos: -19.5,-40.5
       parent: 2
-  - uid: 24540
-    components:
-    - type: Transform
-      pos: 52.5,-35.5
-      parent: 2
 - proto: RandomFoodBakedSingle
   entities:
+  - uid: 3882
+    components:
+    - type: Transform
+      pos: -6.5,-35.5
+      parent: 2
   - uid: 7905
     components:
     - type: Transform
@@ -127940,7 +127512,7 @@ entities:
       parent: 2
 - proto: RandomFoodMeal
   entities:
-  - uid: 3872
+  - uid: 7210
     components:
     - type: Transform
       pos: -7.5,-35.5
@@ -127952,18 +127524,6 @@ entities:
     - type: Transform
       pos: -7.5,-39.5
       parent: 2
-- proto: RandomIngredient
-  entities:
-  - uid: 3295
-    components:
-    - type: Transform
-      pos: -3.501844,-32.513046
-      parent: 2
-  - uid: 3637
-    components:
-    - type: Transform
-      pos: -7.506213,-32.40464
-      parent: 2
 - proto: RandomInstruments
   entities:
   - uid: 357
@@ -128345,11 +127905,6 @@ entities:
     - type: Transform
       pos: 6.5,-40.5
       parent: 2
-  - uid: 22691
-    components:
-    - type: Transform
-      pos: 2.5,-31.5
-      parent: 2
   - uid: 22692
     components:
     - type: Transform
@@ -128480,6 +128035,21 @@ entities:
     - type: Transform
       pos: 53.5,-42.5
       parent: 2
+  - uid: 24785
+    components:
+    - type: Transform
+      pos: -6.5,-29.5
+      parent: 2
+  - uid: 24786
+    components:
+    - type: Transform
+      pos: -1.5,-31.5
+      parent: 2
+  - uid: 24787
+    components:
+    - type: Transform
+      pos: 2.5,-33.5
+      parent: 2
 - proto: RandomPosterContraband
   entities:
   - uid: 5583
@@ -128931,6 +128501,11 @@ entities:
     - type: Transform
       pos: -25.293602,22.601685
       parent: 2
+  - uid: 11846
+    components:
+    - type: Transform
+      pos: 1.3880653,-33.39091
+      parent: 2
   - uid: 14971
     components:
     - type: Transform
@@ -129047,11 +128622,6 @@ entities:
     - type: Transform
       pos: 7.5,-93.5
       parent: 2
-  - uid: 8341
-    components:
-    - type: Transform
-      pos: -8.5,-31.5
-      parent: 2
   - uid: 8442
     components:
     - type: Transform
@@ -129212,11 +128782,21 @@ entities:
     - type: Transform
       pos: 30.5,-56.5
       parent: 2
+  - uid: 11684
+    components:
+    - type: Transform
+      pos: 51.5,-36.5
+      parent: 2
   - uid: 12407
     components:
     - type: Transform
       pos: -47.5,-52.5
       parent: 2
+  - uid: 12891
+    components:
+    - type: Transform
+      pos: -2.5,-27.5
+      parent: 2
   - uid: 15871
     components:
     - type: Transform
@@ -129267,6 +128847,21 @@ entities:
     - type: Transform
       pos: 33.5,-57.5
       parent: 2
+  - uid: 16870
+    components:
+    - type: Transform
+      pos: 55.5,-38.5
+      parent: 2
+  - uid: 16881
+    components:
+    - type: Transform
+      pos: 68.5,-38.5
+      parent: 2
+  - uid: 17191
+    components:
+    - type: Transform
+      pos: 63.5,-36.5
+      parent: 2
   - uid: 17261
     components:
     - type: Transform
@@ -129277,16 +128872,6 @@ entities:
     - type: Transform
       pos: -1.5,-26.5
       parent: 2
-  - uid: 18933
-    components:
-    - type: Transform
-      pos: 0.5,-28.5
-      parent: 2
-  - uid: 18934
-    components:
-    - type: Transform
-      pos: -2.5,-27.5
-      parent: 2
   - uid: 19134
     components:
     - type: Transform
@@ -129632,6 +129217,11 @@ entities:
     - type: Transform
       pos: -0.5,-97.5
       parent: 2
+  - uid: 24560
+    components:
+    - type: Transform
+      pos: 56.5,-36.5
+      parent: 2
 - proto: RandomSpawner100
   entities:
   - uid: 1934
@@ -129728,19 +129318,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.239346,-25.513208
       parent: 2
-- proto: ReagentContainerCornmeal
-  entities:
-  - uid: 3258
-    components:
-    - type: Transform
-      pos: -4.4029903,-30.299797
-      parent: 2
 - proto: ReagentContainerFlour
   entities:
-  - uid: 3256
+  - uid: 4942
     components:
     - type: Transform
-      pos: -4.4759436,-30.393612
+      pos: -2.629619,-32.00525
       parent: 2
   - uid: 19564
     components:
@@ -129749,10 +129332,10 @@ entities:
       parent: 2
 - proto: ReagentContainerSugar
   entities:
-  - uid: 3257
+  - uid: 3160
     components:
     - type: Transform
-      pos: -4.6426926,-30.331068
+      pos: -2.3314612,-32.27069
       parent: 2
   - uid: 19598
     components:
@@ -131079,13 +130662,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 2154
-    components:
-    - type: Transform
-      pos: 58.5,-36.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2178
     components:
     - type: Transform
@@ -131093,20 +130669,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 2203
-    components:
-    - type: Transform
-      pos: 65.5,-41.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
-  - uid: 2241
-    components:
-    - type: Transform
-      pos: 65.5,-43.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2292
     components:
     - type: Transform
@@ -131135,13 +130697,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 2371
-    components:
-    - type: Transform
-      pos: 65.5,-40.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2377
     components:
     - type: Transform
@@ -131170,13 +130725,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 2585
-    components:
-    - type: Transform
-      pos: 65.5,-42.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 2599
     components:
     - type: Transform
@@ -131394,6 +130942,13 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 3625
+    components:
+    - type: Transform
+      pos: 60.5,-39.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3642
     components:
     - type: Transform
@@ -131660,6 +131215,20 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 4922
+    components:
+    - type: Transform
+      pos: 67.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 4923
+    components:
+    - type: Transform
+      pos: 63.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4929
     components:
     - type: Transform
@@ -131821,17 +131390,10 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 5458
+  - uid: 5449
     components:
     - type: Transform
-      pos: 59.5,-38.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
-  - uid: 5464
-    components:
-    - type: Transform
-      pos: 59.5,-37.5
+      pos: 66.5,-35.5
       parent: 2
     - type: DeltaPressure
       gridUid: 2
@@ -131842,13 +131404,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 5546
-    components:
-    - type: Transform
-      pos: 58.5,-38.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 5566
     components:
     - type: Transform
@@ -131912,6 +131467,14 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 5699
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-43.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5706
     components:
     - type: Transform
@@ -131926,6 +131489,14 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 5809
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-42.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5837
     components:
     - type: Transform
@@ -131961,6 +131532,14 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 5882
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-40.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5889
     components:
     - type: Transform
@@ -132045,13 +131624,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 6260
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6265
     components:
     - type: Transform
@@ -132059,13 +131631,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 6293
-    components:
-    - type: Transform
-      pos: 68.5,-39.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6348
     components:
     - type: Transform
@@ -132213,13 +131778,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 6555
-    components:
-    - type: Transform
-      pos: 66.5,-39.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6583
     components:
     - type: Transform
@@ -132311,13 +131869,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 6906
-    components:
-    - type: Transform
-      pos: 67.5,-39.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 6926
     components:
     - type: Transform
@@ -134460,13 +134011,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 17797
-    components:
-    - type: Transform
-      pos: 59.5,-36.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 17821
     components:
     - type: Transform
@@ -134509,6 +134053,34 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 17895
+    components:
+    - type: Transform
+      pos: 62.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 17920
+    components:
+    - type: Transform
+      pos: 61.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 17921
+    components:
+    - type: Transform
+      pos: 63.5,-39.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 17923
+    components:
+    - type: Transform
+      pos: 60.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17946
     components:
     - type: Transform
@@ -134600,6 +134172,14 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 18939
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-41.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18997
     components:
     - type: Transform
@@ -134656,17 +134236,61 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 19566
+    components:
+    - type: Transform
+      pos: 69.5,-37.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 19567
+    components:
+    - type: Transform
+      pos: 68.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 19583
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 79.5,-39.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 19585
+    components:
+    - type: Transform
+      pos: 62.5,-39.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19586
     components:
     - type: Transform
-      pos: 78.5,-39.5
+      pos: 69.5,-38.5
       parent: 2
     - type: DeltaPressure
       gridUid: 2
   - uid: 19589
     components:
     - type: Transform
-      pos: 77.5,-38.5
+      pos: 69.5,-36.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 19590
+    components:
+    - type: Transform
+      pos: 61.5,-39.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 19597
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-44.5
       parent: 2
     - type: DeltaPressure
       gridUid: 2
@@ -134852,10 +134476,27 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 24731
+  - uid: 24530
     components:
     - type: Transform
-      pos: 80.5,-37.5
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-39.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 24531
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 81.5,-39.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 24791
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-35.5
       parent: 2
     - type: DeltaPressure
       gridUid: 2
@@ -134994,14 +134635,7 @@ entities:
   - uid: 16792
     components:
     - type: Transform
-      pos: 67.54577,-43.51738
-      parent: 2
-- proto: RollingPin
-  entities:
-  - uid: 3297
-    components:
-    - type: Transform
-      pos: -7.5270567,-32.467186
+      pos: 66.33574,-42.743584
       parent: 2
 - proto: RubberChicken
   entities:
@@ -135193,6 +134827,14 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 16559
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 78.5,-39.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 16680
     components:
     - type: Transform
@@ -135214,6 +134856,20 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 17939
+    components:
+    - type: Transform
+      pos: 65.5,-39.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+  - uid: 18504
+    components:
+    - type: Transform
+      pos: 58.5,-35.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 22035
     components:
     - type: Transform
@@ -135281,13 +134937,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 22213
-    components:
-    - type: Transform
-      pos: -5.5,-35.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 22214
     components:
     - type: Transform
@@ -135351,13 +135000,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 24720
-    components:
-    - type: Transform
-      pos: 80.5,-39.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 24722
     components:
     - type: Transform
@@ -135406,16 +135048,16 @@ entities:
     - type: Transform
       pos: -25.5,16.5
       parent: 2
+  - uid: 10443
+    components:
+    - type: Transform
+      pos: -18.5,-37.5
+      parent: 2
   - uid: 17167
     components:
     - type: Transform
       pos: 46.5,-60.5
       parent: 2
-  - uid: 22707
-    components:
-    - type: Transform
-      pos: -18.5,-36.5
-      parent: 2
 - proto: ShardGlass
   entities:
   - uid: 890
@@ -135920,6 +135562,27 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 3232
+    components:
+    - type: Transform
+      pos: -6.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 3236
+    components:
+    - type: Transform
+      pos: -8.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 3238
+    components:
+    - type: Transform
+      pos: -7.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3778
     components:
     - type: Transform
@@ -136022,6 +135685,13 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 6517
+    components:
+    - type: Transform
+      pos: -5.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10771
     components:
     - type: Transform
@@ -136054,6 +135724,14 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 11756
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12072
     components:
     - type: Transform
@@ -136131,27 +135809,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 16025
-    components:
-    - type: Transform
-      pos: -6.5,-35.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
-  - uid: 16026
-    components:
-    - type: Transform
-      pos: -7.5,-35.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
-  - uid: 16027
-    components:
-    - type: Transform
-      pos: -8.5,-35.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
   - uid: 16035
     components:
     - type: Transform
@@ -137753,19 +137410,10 @@ entities:
       fixtures: {}
 - proto: SignKitchen
   entities:
-  - uid: 5276
+  - uid: 7769
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-35.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
-  - uid: 7063
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-30.5
+      pos: -9.5,-34.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -138099,11 +137747,11 @@ entities:
       parent: 2
 - proto: SinkWide
   entities:
-  - uid: 3259
+  - uid: 3244
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-32.5
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-32.5
       parent: 2
   - uid: 3414
     components:
@@ -138155,6 +137803,11 @@ entities:
     - type: Transform
       pos: -40.5,-36.5
       parent: 2
+  - uid: 4067
+    components:
+    - type: Transform
+      pos: -5.5,-35.5
+      parent: 2
   - uid: 22308
     components:
     - type: Transform
@@ -139625,10 +139278,10 @@ entities:
       parent: 2
 - proto: SpawnMobAlexander
   entities:
-  - uid: 7460
+  - uid: 13696
     components:
     - type: Transform
-      pos: -9.5,-33.5
+      pos: -6.5,-32.5
       parent: 2
 - proto: SpawnMobBandito
   entities:
@@ -139929,15 +139582,20 @@ entities:
       parent: 2
 - proto: SpawnPointChef
   entities:
-  - uid: 3882
+  - uid: 3272
     components:
     - type: Transform
-      pos: -8.5,-33.5
+      pos: 0.5,-33.5
       parent: 2
-  - uid: 3883
+  - uid: 3464
     components:
     - type: Transform
-      pos: -8.5,-32.5
+      pos: -4.5,-33.5
+      parent: 2
+  - uid: 4865
+    components:
+    - type: Transform
+      pos: -4.5,-32.5
       parent: 2
 - proto: SpawnPointChemist
   entities:
@@ -140535,16 +140193,6 @@ entities:
     - type: Transform
       pos: -9.5,-40.5
       parent: 2
-  - uid: 22780
-    components:
-    - type: Transform
-      pos: -8.5,-40.5
-      parent: 2
-  - uid: 22781
-    components:
-    - type: Transform
-      pos: -8.5,-37.5
-      parent: 2
   - uid: 22782
     components:
     - type: Transform
@@ -140634,11 +140282,6 @@ entities:
       parent: 2
 - proto: SprayBottleSpaceCleaner
   entities:
-  - uid: 3279
-    components:
-    - type: Transform
-      pos: 1.7120702,-33.15089
-      parent: 2
   - uid: 5911
     components:
     - type: Transform
@@ -140809,7 +140452,7 @@ entities:
   - uid: 8230
     components:
     - type: Transform
-      pos: 68.47575,-41.265385
+      pos: 66.35658,-42.23281
       parent: 2
 - proto: StationMap
   entities:
@@ -141458,11 +141101,6 @@ entities:
     - type: Transform
       pos: 55.5,-40.5
       parent: 2
-  - uid: 24788
-    components:
-    - type: Transform
-      pos: 78.5,-38.5
-      parent: 2
 - proto: SuitStorageEVAAlternate
   entities:
   - uid: 2318
@@ -141711,6 +141349,21 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: HoP's Office
+  - uid: 17575
+    components:
+    - type: Transform
+      pos: 66.5,-38.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: AI Bridge East
+  - uid: 17683
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-36.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: AI Bridge West
   - uid: 21154
     components:
     - type: Transform
@@ -141727,31 +141380,28 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Conference Room
-  - uid: 24558
+  - uid: 23118
     components:
-    - type: MetaData
-      name: camera
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 69.5,-41.5
       parent: 2
     - type: SurveillanceCamera
-      id: AI - Boards
+      id: AI - Upload West
+  - uid: 23119
+    components:
+    - type: Transform
+      pos: 81.5,-44.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: AI - Staging Room
   - uid: 24559
     components:
     - type: Transform
       pos: 75.5,-44.5
       parent: 2
     - type: SurveillanceCamera
-      id: AI - Upload
-  - uid: 24560
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-40.5
-      parent: 2
-    - type: SurveillanceCamera
-      id: AI - Foyer
+      id: AI - Upload East
   - uid: 24561
     components:
     - type: Transform
@@ -141813,14 +141463,6 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: AI - Outside North East
-  - uid: 24776
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-36.5
-      parent: 2
-    - type: SurveillanceCamera
-      id: AI - Station Side Chute
   - uid: 24778
     components:
     - type: Transform
@@ -141828,14 +141470,6 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: AI - Station Side Breakroom
-  - uid: 24782
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-41.5
-      parent: 2
-    - type: SurveillanceCamera
-      id: AI - Station Side Airlock
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 7872
@@ -141925,6 +141559,59 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Atmos Burn Chamber
+  - uid: 24758
+    components:
+    - type: Transform
+      pos: 4.5,-19.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Tech Vault
+  - uid: 24759
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-19.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Power Bank
+  - uid: 24761
+    components:
+    - type: Transform
+      pos: -11.5,-21.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: AME
+  - uid: 24762
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-12.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Entrance - East
+  - uid: 24763
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-1.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Atmos - West
+  - uid: 24764
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Atmos - Center
+  - uid: 24766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-1.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Atmost - Front
 - proto: SurveillanceCameraGeneral
   entities:
   - uid: 526
@@ -141935,6 +141622,14 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Arrivals West Arm - South
+  - uid: 1024
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-20.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Evac - Outside
   - uid: 1180
     components:
     - type: Transform
@@ -141943,6 +141638,22 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Hall - Outside Clothing
+  - uid: 3698
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-39.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Cafeteria
+  - uid: 3860
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-39.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Library - Back Office
   - uid: 7726
     components:
     - type: Transform
@@ -141996,6 +141707,22 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Arrivals West Arm - Outside
+  - uid: 11751
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-37.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Library - North
+  - uid: 11752
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-37.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Stage
   - uid: 17484
     components:
     - type: Transform
@@ -142004,14 +141731,13 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Garden
-  - uid: 18056
+  - uid: 19556
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-37.5
+      pos: 19.5,-50.5
       parent: 2
     - type: SurveillanceCamera
-      id: Canteen - Stage
+      id: Game Room
   - uid: 20398
     components:
     - type: Transform
@@ -142027,7 +141753,7 @@ entities:
       pos: 53.5,-23.5
       parent: 2
     - type: SurveillanceCamera
-      id: Evac - West
+      id: Evac - East
   - uid: 20402
     components:
     - type: Transform
@@ -142035,7 +141761,7 @@ entities:
       pos: 44.5,-24.5
       parent: 2
     - type: SurveillanceCamera
-      id: Evac - East
+      id: Evac - West
   - uid: 21138
     components:
     - type: Transform
@@ -142083,6 +141809,14 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Hall - Outside Gravity Generator
+  - uid: 22015
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-44.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Library - South
   - uid: 22057
     components:
     - type: Transform
@@ -142149,14 +141883,30 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Docking Arm - North Gate
+  - uid: 22691
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-47.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Cryo
+  - uid: 23116
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,-20.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Hall - Outside Science
   - uid: 24480
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-39.5
+      rot: 3.141592653589793 rad
+      pos: 49.5,-11.5
       parent: 2
     - type: SurveillanceCamera
-      id: Cafeteria - West
+      id: Arcade
   - uid: 24589
     components:
     - type: Transform
@@ -142203,6 +141953,62 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: West Atrium - West
+  - uid: 24753
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,-16.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Evac - North
+  - uid: 24754
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-12.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Chapel
+  - uid: 24772
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-40.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Hall - Outside Conference Room
+  - uid: 24773
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-60.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Arrivals - Dock West
+  - uid: 24774
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-60.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Arrivals - Dock East
+  - uid: 24777
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,7.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Hall - Coffee Alley
+  - uid: 24781
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,13.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Hall - Outside Lawyer
 - proto: SurveillanceCameraMedical
   entities:
   - uid: 11147
@@ -142290,6 +142096,22 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Foyer
+  - uid: 24767
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -45.5,-24.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Surgery
+  - uid: 24768
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-22.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Break Room
 - proto: SurveillanceCameraRouterCircuitboard
   entities:
   - uid: 2970
@@ -142408,6 +142230,14 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Artifact Scanner
+  - uid: 24776
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-33.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Outside Server Room
 - proto: SurveillanceCameraSecurity
   entities:
   - uid: 672
@@ -142516,16 +142346,39 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Genpop - Visitation
-- proto: SurveillanceCameraService
-  entities:
-  - uid: 11307
+  - uid: 24784
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-32.5
+      pos: 28.5,10.5
       parent: 2
     - type: SurveillanceCamera
-      id: Kitchen - Back
+      id: Lawyer's Office
+- proto: SurveillanceCameraService
+  entities:
+  - uid: 654
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,-32.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Botany - North
+  - uid: 3487
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-32.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Kitchen
+  - uid: 20175
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-52.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Reporter's Room
   - uid: 22146
     components:
     - type: Transform
@@ -142533,6 +142386,14 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Janitor
+  - uid: 24775
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-45.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Bar
 - proto: SurveillanceCameraSupply
   entities:
   - uid: 1280
@@ -142589,6 +142450,21 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Salvage - Processing
+  - uid: 24765
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,17.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Staging Area
+  - uid: 24782
+    components:
+    - type: Transform
+      pos: 20.5,12.5
+      parent: 2
+    - type: SurveillanceCamera
+      id: Mail Room
 - proto: SurveillanceCameraWirelessRouterEntertainment
   entities:
   - uid: 3506
@@ -142818,25 +142694,21 @@ entities:
     - type: Transform
       pos: -13.5,-33.5
       parent: 2
-  - uid: 3225
+  - uid: 3223
     components:
     - type: Transform
-      pos: -8.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-35.5
       parent: 2
   - uid: 3226
     components:
     - type: Transform
-      pos: -7.5,-30.5
+      pos: -8.5,-35.5
       parent: 2
-  - uid: 3263
+  - uid: 3250
     components:
     - type: Transform
-      pos: 1.5,-33.5
-      parent: 2
-  - uid: 3275
-    components:
-    - type: Transform
-      pos: -6.5,-30.5
+      pos: -5.5,-30.5
       parent: 2
   - uid: 3307
     components:
@@ -142893,20 +142765,22 @@ entities:
     - type: Transform
       pos: 1.5,-39.5
       parent: 2
+  - uid: 3495
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-31.5
+      parent: 2
   - uid: 3564
     components:
     - type: Transform
       pos: 7.5,-31.5
       parent: 2
-  - uid: 3623
+  - uid: 3637
     components:
     - type: Transform
-      pos: -7.5,-32.5
-      parent: 2
-  - uid: 3624
-    components:
-    - type: Transform
-      pos: -7.5,-33.5
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-35.5
       parent: 2
   - uid: 4162
     components:
@@ -143018,6 +142892,16 @@ entities:
     - type: Transform
       pos: 6.5,-27.5
       parent: 2
+  - uid: 6288
+    components:
+    - type: Transform
+      pos: 0.5,-34.5
+      parent: 2
+  - uid: 6452
+    components:
+    - type: Transform
+      pos: -5.5,-33.5
+      parent: 2
   - uid: 6653
     components:
     - type: Transform
@@ -143053,6 +142937,11 @@ entities:
     - type: Transform
       pos: -45.5,-29.5
       parent: 2
+  - uid: 7064
+    components:
+    - type: Transform
+      pos: 1.5,-33.5
+      parent: 2
   - uid: 7097
     components:
     - type: Transform
@@ -143078,11 +142967,21 @@ entities:
     - type: Transform
       pos: -15.5,-25.5
       parent: 2
+  - uid: 7674
+    components:
+    - type: Transform
+      pos: -7.5,-30.5
+      parent: 2
   - uid: 7855
     components:
     - type: Transform
       pos: 13.5,-52.5
       parent: 2
+  - uid: 8492
+    components:
+    - type: Transform
+      pos: -6.5,-30.5
+      parent: 2
   - uid: 8538
     components:
     - type: Transform
@@ -143208,11 +143107,6 @@ entities:
     - type: Transform
       pos: -53.5,-51.5
       parent: 2
-  - uid: 11843
-    components:
-    - type: Transform
-      pos: -10.5,-36.5
-      parent: 2
   - uid: 12036
     components:
     - type: Transform
@@ -143313,6 +143207,11 @@ entities:
     - type: Transform
       pos: 53.5,-51.5
       parent: 2
+  - uid: 14007
+    components:
+    - type: Transform
+      pos: -5.5,-32.5
+      parent: 2
   - uid: 14108
     components:
     - type: Transform
@@ -143363,6 +143262,17 @@ entities:
     - type: Transform
       pos: 3.5,-55.5
       parent: 2
+  - uid: 15115
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-32.5
+      parent: 2
+  - uid: 15125
+    components:
+    - type: Transform
+      pos: 1.5,-34.5
+      parent: 2
   - uid: 15186
     components:
     - type: Transform
@@ -143498,6 +143408,12 @@ entities:
     - type: Transform
       pos: 32.5,-75.5
       parent: 2
+  - uid: 20372
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-35.5
+      parent: 2
   - uid: 20661
     components:
     - type: Transform
@@ -143553,16 +143469,6 @@ entities:
     - type: Transform
       pos: -25.5,-12.5
       parent: 2
-  - uid: 24550
-    components:
-    - type: Transform
-      pos: 55.5,-38.5
-      parent: 2
-  - uid: 24551
-    components:
-    - type: Transform
-      pos: 55.5,-36.5
-      parent: 2
 - proto: TableCarpet
   entities:
   - uid: 26
@@ -143617,21 +143523,6 @@ entities:
     - type: Transform
       pos: -14.5,-15.5
       parent: 2
-  - uid: 3272
-    components:
-    - type: Transform
-      pos: -6.5,-35.5
-      parent: 2
-  - uid: 3273
-    components:
-    - type: Transform
-      pos: -8.5,-35.5
-      parent: 2
-  - uid: 3274
-    components:
-    - type: Transform
-      pos: -7.5,-35.5
-      parent: 2
   - uid: 3327
     components:
     - type: Transform
@@ -144175,11 +144066,6 @@ entities:
     - type: Transform
       pos: -24.5,-4.5
       parent: 2
-  - uid: 1227
-    components:
-    - type: Transform
-      pos: 67.5,-41.5
-      parent: 2
   - uid: 1362
     components:
     - type: Transform
@@ -144190,11 +144076,6 @@ entities:
     - type: Transform
       pos: -0.5,16.5
       parent: 2
-  - uid: 1743
-    components:
-    - type: Transform
-      pos: 68.5,-41.5
-      parent: 2
   - uid: 1904
     components:
     - type: Transform
@@ -144211,11 +144092,6 @@ entities:
     - type: Transform
       pos: -14.5,-2.5
       parent: 2
-  - uid: 2291
-    components:
-    - type: Transform
-      pos: 68.5,-43.5
-      parent: 2
   - uid: 2370
     components:
     - type: Transform
@@ -144261,10 +144137,11 @@ entities:
     - type: Transform
       pos: 9.5,18.5
       parent: 2
-  - uid: 5882
+  - uid: 6260
     components:
     - type: Transform
-      pos: 67.5,-43.5
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-42.5
       parent: 2
   - uid: 7271
     components:
@@ -144394,6 +144271,18 @@ entities:
     - type: Transform
       pos: 87.5,-28.5
       parent: 2
+  - uid: 19546
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-41.5
+      parent: 2
+  - uid: 19569
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-43.5
+      parent: 2
   - uid: 20596
     components:
     - type: Transform
@@ -144415,11 +144304,23 @@ entities:
     - type: Transform
       pos: 19.5,-0.5
       parent: 2
+  - uid: 22132
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 80.5,-44.5
+      parent: 2
   - uid: 22644
     components:
     - type: Transform
       pos: 42.5,15.5
       parent: 2
+  - uid: 23856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 81.5,-44.5
+      parent: 2
 - proto: TableReinforcedGlass
   entities:
   - uid: 2080
@@ -144986,12 +144887,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 35.5,3.5
       parent: 2
-  - uid: 19560
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-35.5
-      parent: 2
   - uid: 22303
     components:
     - type: Transform
@@ -145310,13 +145205,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 22593
-    components:
-    - type: Transform
-      pos: -5.5,-30.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: ToiletDirtyWater
   entities:
   - uid: 905
@@ -145539,6 +145427,13 @@ entities:
     - type: Transform
       pos: 0.37641108,24.536484
       parent: 2
+- proto: ToyFigurineChef
+  entities:
+  - uid: 3178
+    components:
+    - type: Transform
+      pos: -5.4451985,-32.696793
+      parent: 2
 - proto: ToyFigurineChemist
   entities:
   - uid: 8550
@@ -145790,41 +145685,6 @@ entities:
       parent: 2
 - proto: TwoWayLever
   entities:
-  - uid: 6135
-    components:
-    - type: Transform
-      pos: -14.5,-32.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        1903:
-        - - Left
-          - Forward
-        - - Right
-          - Reverse
-        - - Middle
-          - Off
-        1933:
-        - - Left
-          - Forward
-        - - Right
-          - Reverse
-        - - Middle
-          - Off
-        3487:
-        - - Left
-          - Forward
-        - - Right
-          - Reverse
-        - - Middle
-          - Off
-        6837:
-        - - Left
-          - Forward
-        - - Right
-          - Reverse
-        - - Middle
-          - Off
   - uid: 6236
     components:
     - type: Transform
@@ -146142,13 +146002,6 @@ entities:
     - type: Transform
       pos: -54.5,-27.5
       parent: 2
-- proto: VariantCubeBox
-  entities:
-  - uid: 3243
-    components:
-    - type: Transform
-      pos: -4.4842043,-32.333588
-      parent: 2
 - proto: VendingBarDrobe
   entities:
   - uid: 21407
@@ -146198,17 +146051,17 @@ entities:
       parent: 2
 - proto: VendingMachineChefDrobe
   entities:
-  - uid: 3512
+  - uid: 3657
     components:
     - type: Transform
-      pos: -3.5,-35.5
+      pos: 1.5,-32.5
       parent: 2
 - proto: VendingMachineChefvend
   entities:
-  - uid: 3179
+  - uid: 3205
     components:
     - type: Transform
-      pos: -9.5,-30.5
+      pos: -8.5,-33.5
       parent: 2
 - proto: VendingMachineChemDrobe
   entities:
@@ -146282,10 +146135,11 @@ entities:
       parent: 2
 - proto: VendingMachineCondiments
   entities:
-  - uid: 6370
+  - uid: 3225
     components:
     - type: Transform
-      pos: -10.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-35.5
       parent: 2
   - uid: 7915
     components:
@@ -146308,10 +146162,10 @@ entities:
       parent: 2
 - proto: VendingMachineDinnerware
   entities:
-  - uid: 4213
+  - uid: 7776
     components:
     - type: Transform
-      pos: -0.5,-33.5
+      pos: -8.5,-34.5
       parent: 2
 - proto: VendingMachineDonut
   entities:
@@ -147306,6 +147160,12 @@ entities:
     - type: Transform
       pos: -34.5,-5.5
       parent: 2
+  - uid: 1044
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-30.5
+      parent: 2
   - uid: 1070
     components:
     - type: Transform
@@ -147641,11 +147501,6 @@ entities:
     - type: Transform
       pos: 83.5,-45.5
       parent: 2
-  - uid: 1839
-    components:
-    - type: Transform
-      pos: 81.5,-39.5
-      parent: 2
   - uid: 1840
     components:
     - type: Transform
@@ -147806,11 +147661,6 @@ entities:
     - type: Transform
       pos: 97.5,-43.5
       parent: 2
-  - uid: 2257
-    components:
-    - type: Transform
-      pos: -1.5,-32.5
-      parent: 2
   - uid: 2258
     components:
     - type: Transform
@@ -147842,6 +147692,11 @@ entities:
     - type: Transform
       pos: -18.5,-8.5
       parent: 2
+  - uid: 2311
+    components:
+    - type: Transform
+      pos: 64.5,-35.5
+      parent: 2
   - uid: 2312
     components:
     - type: Transform
@@ -147958,10 +147813,11 @@ entities:
     - type: Transform
       pos: -40.5,28.5
       parent: 2
-  - uid: 2609
+  - uid: 2606
     components:
     - type: Transform
-      pos: -4.5,-29.5
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-33.5
       parent: 2
   - uid: 2612
     components:
@@ -148098,6 +147954,12 @@ entities:
     - type: Transform
       pos: 37.5,-47.5
       parent: 2
+  - uid: 2944
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-29.5
+      parent: 2
   - uid: 3017
     components:
     - type: Transform
@@ -148183,21 +148045,29 @@ entities:
     - type: Transform
       pos: -9.5,20.5
       parent: 2
-  - uid: 3223
-    components:
-    - type: Transform
-      pos: -5.5,-33.5
-      parent: 2
-  - uid: 3229
-    components:
-    - type: Transform
-      pos: -3.5,-33.5
-      parent: 2
   - uid: 3233
     components:
     - type: Transform
       pos: -4.5,-72.5
       parent: 2
+  - uid: 3253
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-29.5
+      parent: 2
+  - uid: 3256
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-29.5
+      parent: 2
+  - uid: 3257
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-32.5
+      parent: 2
   - uid: 3266
     components:
     - type: Transform
@@ -148223,11 +148093,23 @@ entities:
     - type: Transform
       pos: 97.5,-41.5
       parent: 2
+  - uid: 3311
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-34.5
+      parent: 2
   - uid: 3323
     components:
     - type: Transform
       pos: 47.5,13.5
       parent: 2
+  - uid: 3330
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-33.5
+      parent: 2
   - uid: 3339
     components:
     - type: Transform
@@ -148338,6 +148220,12 @@ entities:
     - type: Transform
       pos: -37.5,-70.5
       parent: 2
+  - uid: 3828
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-34.5
+      parent: 2
   - uid: 3845
     components:
     - type: Transform
@@ -148638,6 +148526,12 @@ entities:
     - type: Transform
       pos: 51.5,18.5
       parent: 2
+  - uid: 4751
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-35.5
+      parent: 2
   - uid: 4788
     components:
     - type: Transform
@@ -148903,6 +148797,17 @@ entities:
     - type: Transform
       pos: 50.5,22.5
       parent: 2
+  - uid: 5458
+    components:
+    - type: Transform
+      pos: 57.5,-42.5
+      parent: 2
+  - uid: 5464
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-35.5
+      parent: 2
   - uid: 5490
     components:
     - type: Transform
@@ -149163,6 +149068,12 @@ entities:
     - type: Transform
       pos: 60.5,-74.5
       parent: 2
+  - uid: 6293
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-39.5
+      parent: 2
   - uid: 6310
     components:
     - type: Transform
@@ -149979,6 +149890,11 @@ entities:
     - type: Transform
       pos: -46.5,-25.5
       parent: 2
+  - uid: 11078
+    components:
+    - type: Transform
+      pos: 58.5,-40.5
+      parent: 2
   - uid: 11169
     components:
     - type: Transform
@@ -150024,6 +149940,11 @@ entities:
     - type: Transform
       pos: -25.5,-38.5
       parent: 2
+  - uid: 11320
+    components:
+    - type: Transform
+      pos: 55.5,-42.5
+      parent: 2
   - uid: 11324
     components:
     - type: Transform
@@ -150049,6 +149970,12 @@ entities:
     - type: Transform
       pos: 15.5,-20.5
       parent: 2
+  - uid: 11769
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-30.5
+      parent: 2
   - uid: 11822
     components:
     - type: Transform
@@ -151304,15 +151231,11 @@ entities:
     - type: Transform
       pos: 2.5,-35.5
       parent: 2
-  - uid: 14477
-    components:
-    - type: Transform
-      pos: -1.5,-30.5
-      parent: 2
   - uid: 14479
     components:
     - type: Transform
-      pos: -1.5,-29.5
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-34.5
       parent: 2
   - uid: 14485
     components:
@@ -151914,11 +151837,6 @@ entities:
     - type: Transform
       pos: -37.5,-58.5
       parent: 2
-  - uid: 15788
-    components:
-    - type: Transform
-      pos: -2.5,-29.5
-      parent: 2
   - uid: 15812
     components:
     - type: Transform
@@ -152644,11 +152562,6 @@ entities:
     - type: Transform
       pos: 84.5,-45.5
       parent: 2
-  - uid: 16542
-    components:
-    - type: Transform
-      pos: 80.5,-39.5
-      parent: 2
   - uid: 16549
     components:
     - type: Transform
@@ -153264,11 +153177,6 @@ entities:
     - type: Transform
       pos: -31.5,-64.5
       parent: 2
-  - uid: 18184
-    components:
-    - type: Transform
-      pos: 79.5,-36.5
-      parent: 2
   - uid: 18190
     components:
     - type: Transform
@@ -153304,6 +153212,12 @@ entities:
     - type: Transform
       pos: 50.5,-29.5
       parent: 2
+  - uid: 18202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 78.5,-39.5
+      parent: 2
   - uid: 18208
     components:
     - type: Transform
@@ -153444,11 +153358,6 @@ entities:
     - type: Transform
       pos: 26.5,-59.5
       parent: 2
-  - uid: 18938
-    components:
-    - type: Transform
-      pos: 80.5,-38.5
-      parent: 2
   - uid: 18970
     components:
     - type: Transform
@@ -153549,20 +153458,28 @@ entities:
     - type: Transform
       pos: 27.5,-69.5
       parent: 2
+  - uid: 19563
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-39.5
+      parent: 2
+  - uid: 19565
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-39.5
+      parent: 2
   - uid: 19584
     components:
     - type: Transform
-      pos: 78.5,-36.5
-      parent: 2
-  - uid: 19585
-    components:
-    - type: Transform
-      pos: 80.5,-36.5
+      pos: 58.5,-42.5
       parent: 2
   - uid: 19587
     components:
     - type: Transform
-      pos: 77.5,-36.5
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-35.5
       parent: 2
   - uid: 19588
     components:
@@ -153702,11 +153619,23 @@ entities:
     - type: Transform
       pos: -52.5,-27.5
       parent: 2
+  - uid: 20759
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-39.5
+      parent: 2
   - uid: 20767
     components:
     - type: Transform
       pos: -52.5,-26.5
       parent: 2
+  - uid: 21279
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-29.5
+      parent: 2
   - uid: 21297
     components:
     - type: Transform
@@ -154097,21 +154026,6 @@ entities:
     - type: Transform
       pos: 11.5,-7.5
       parent: 2
-  - uid: 24752
-    components:
-    - type: Transform
-      pos: 56.5,-41.5
-      parent: 2
-  - uid: 24766
-    components:
-    - type: Transform
-      pos: 57.5,-41.5
-      parent: 2
-  - uid: 24768
-    components:
-    - type: Transform
-      pos: 55.5,-41.5
-      parent: 2
   - uid: 24769
     components:
     - type: Transform
@@ -154119,6 +154033,11 @@ entities:
       parent: 2
 - proto: WallReinforcedRust
   entities:
+  - uid: 3413
+    components:
+    - type: Transform
+      pos: -9.5,-29.5
+      parent: 2
   - uid: 4945
     components:
     - type: Transform
@@ -154389,6 +154308,11 @@ entities:
     - type: Transform
       pos: -26.5,37.5
       parent: 2
+  - uid: 6370
+    components:
+    - type: Transform
+      pos: -12.5,-31.5
+      parent: 2
   - uid: 6374
     components:
     - type: Transform
@@ -154864,11 +154788,6 @@ entities:
     - type: Transform
       pos: 8.5,-75.5
       parent: 2
-  - uid: 8364
-    components:
-    - type: Transform
-      pos: -5.5,-29.5
-      parent: 2
   - uid: 8393
     components:
     - type: Transform
@@ -155079,11 +154998,6 @@ entities:
     - type: Transform
       pos: 24.5,18.5
       parent: 2
-  - uid: 9148
-    components:
-    - type: Transform
-      pos: -3.5,-29.5
-      parent: 2
   - uid: 9215
     components:
     - type: Transform
@@ -155789,11 +155703,6 @@ entities:
     - type: Transform
       pos: -14.5,-57.5
       parent: 2
-  - uid: 10978
-    components:
-    - type: Transform
-      pos: -1.5,-33.5
-      parent: 2
   - uid: 11017
     components:
     - type: Transform
@@ -156104,11 +156013,6 @@ entities:
     - type: Transform
       pos: -52.5,-35.5
       parent: 2
-  - uid: 11656
-    components:
-    - type: Transform
-      pos: -2.5,-33.5
-      parent: 2
   - uid: 11722
     components:
     - type: Transform
@@ -156434,11 +156338,6 @@ entities:
     - type: Transform
       pos: 4.5,-24.5
       parent: 2
-  - uid: 18426
-    components:
-    - type: Transform
-      pos: -4.5,-33.5
-      parent: 2
   - uid: 18439
     components:
     - type: Transform
@@ -156579,11 +156478,6 @@ entities:
     - type: Transform
       pos: -46.5,-7.5
       parent: 2
-  - uid: 20175
-    components:
-    - type: Transform
-      pos: -5.5,-32.5
-      parent: 2
   - uid: 20178
     components:
     - type: Transform
@@ -156769,6 +156663,11 @@ entities:
     - type: Transform
       pos: -58.5,-61.5
       parent: 2
+  - uid: 22707
+    components:
+    - type: Transform
+      pos: -8.5,-32.5
+      parent: 2
   - uid: 23324
     components:
     - type: Transform
@@ -157071,6 +156970,12 @@ entities:
     - type: Transform
       pos: -9.5,21.5
       parent: 2
+  - uid: 946
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-35.5
+      parent: 2
   - uid: 996
     components:
     - type: Transform
@@ -157161,6 +157066,12 @@ entities:
     - type: Transform
       pos: -31.5,-23.5
       parent: 2
+  - uid: 1444
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-31.5
+      parent: 2
   - uid: 1451
     components:
     - type: Transform
@@ -157296,11 +157207,6 @@ entities:
     - type: Transform
       pos: -11.5,-5.5
       parent: 2
-  - uid: 2307
-    components:
-    - type: Transform
-      pos: -10.5,-29.5
-      parent: 2
   - uid: 2343
     components:
     - type: Transform
@@ -157391,11 +157297,6 @@ entities:
     - type: Transform
       pos: -18.5,-14.5
       parent: 2
-  - uid: 2606
-    components:
-    - type: Transform
-      pos: -7.5,-29.5
-      parent: 2
   - uid: 2624
     components:
     - type: Transform
@@ -157406,11 +157307,6 @@ entities:
     - type: Transform
       pos: -18.5,-13.5
       parent: 2
-  - uid: 2687
-    components:
-    - type: Transform
-      pos: 2.5,-32.5
-      parent: 2
   - uid: 2710
     components:
     - type: Transform
@@ -157496,11 +157392,6 @@ entities:
     - type: Transform
       pos: 89.5,-28.5
       parent: 2
-  - uid: 3160
-    components:
-    - type: Transform
-      pos: -8.5,-29.5
-      parent: 2
   - uid: 3163
     components:
     - type: Transform
@@ -157536,31 +157427,22 @@ entities:
     - type: Transform
       pos: -0.5,-46.5
       parent: 2
+  - uid: 3252
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-29.5
+      parent: 2
   - uid: 3261
     components:
     - type: Transform
       pos: 44.5,-32.5
       parent: 2
-  - uid: 3265
-    components:
-    - type: Transform
-      pos: -12.5,-33.5
-      parent: 2
   - uid: 3270
     components:
     - type: Transform
       pos: 17.5,-58.5
       parent: 2
-  - uid: 3271
-    components:
-    - type: Transform
-      pos: -9.5,-35.5
-      parent: 2
-  - uid: 3283
-    components:
-    - type: Transform
-      pos: -10.5,-30.5
-      parent: 2
   - uid: 3285
     components:
     - type: Transform
@@ -157581,11 +157463,6 @@ entities:
     - type: Transform
       pos: -12.5,-35.5
       parent: 2
-  - uid: 3311
-    components:
-    - type: Transform
-      pos: -12.5,-34.5
-      parent: 2
   - uid: 3318
     components:
     - type: Transform
@@ -157666,11 +157543,6 @@ entities:
     - type: Transform
       pos: -2.5,-36.5
       parent: 2
-  - uid: 3483
-    components:
-    - type: Transform
-      pos: -4.5,-35.5
-      parent: 2
   - uid: 3502
     components:
     - type: Transform
@@ -157721,11 +157593,6 @@ entities:
     - type: Transform
       pos: 21.5,-38.5
       parent: 2
-  - uid: 3828
-    components:
-    - type: Transform
-      pos: -9.5,-29.5
-      parent: 2
   - uid: 3841
     components:
     - type: Transform
@@ -157766,11 +157633,6 @@ entities:
     - type: Transform
       pos: 16.5,-47.5
       parent: 2
-  - uid: 4023
-    components:
-    - type: Transform
-      pos: -0.5,-30.5
-      parent: 2
   - uid: 4055
     components:
     - type: Transform
@@ -157856,6 +157718,11 @@ entities:
     - type: Transform
       pos: 8.5,-40.5
       parent: 2
+  - uid: 4656
+    components:
+    - type: Transform
+      pos: 2.5,-27.5
+      parent: 2
   - uid: 4694
     components:
     - type: Transform
@@ -157961,6 +157828,11 @@ entities:
     - type: Transform
       pos: -18.5,-26.5
       parent: 2
+  - uid: 5197
+    components:
+    - type: Transform
+      pos: 0.5,-27.5
+      parent: 2
   - uid: 5218
     components:
     - type: Transform
@@ -158001,11 +157873,6 @@ entities:
     - type: Transform
       pos: 16.5,-48.5
       parent: 2
-  - uid: 5342
-    components:
-    - type: Transform
-      pos: -5.5,-35.5
-      parent: 2
   - uid: 5349
     components:
     - type: Transform
@@ -158386,11 +158253,6 @@ entities:
     - type: Transform
       pos: 21.5,-51.5
       parent: 2
-  - uid: 5970
-    components:
-    - type: Transform
-      pos: -12.5,-29.5
-      parent: 2
   - uid: 6023
     components:
     - type: Transform
@@ -158476,11 +158338,6 @@ entities:
     - type: Transform
       pos: -12.5,-49.5
       parent: 2
-  - uid: 6288
-    components:
-    - type: Transform
-      pos: 2.5,-34.5
-      parent: 2
   - uid: 6292
     components:
     - type: Transform
@@ -158581,11 +158438,6 @@ entities:
     - type: Transform
       pos: 39.5,8.5
       parent: 2
-  - uid: 6517
-    components:
-    - type: Transform
-      pos: 2.5,-30.5
-      parent: 2
   - uid: 6518
     components:
     - type: Transform
@@ -158686,6 +158538,12 @@ entities:
     - type: Transform
       pos: -45.5,-49.5
       parent: 2
+  - uid: 6837
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-31.5
+      parent: 2
   - uid: 6840
     components:
     - type: Transform
@@ -158801,11 +158659,6 @@ entities:
     - type: Transform
       pos: 27.5,-15.5
       parent: 2
-  - uid: 7210
-    components:
-    - type: Transform
-      pos: -10.5,-33.5
-      parent: 2
   - uid: 7222
     components:
     - type: Transform
@@ -158941,11 +158794,6 @@ entities:
     - type: Transform
       pos: 27.5,14.5
       parent: 2
-  - uid: 7631
-    components:
-    - type: Transform
-      pos: -21.5,-35.5
-      parent: 2
   - uid: 7635
     components:
     - type: Transform
@@ -158956,11 +158804,6 @@ entities:
     - type: Transform
       pos: 23.5,-2.5
       parent: 2
-  - uid: 7642
-    components:
-    - type: Transform
-      pos: 2.5,-31.5
-      parent: 2
   - uid: 7643
     components:
     - type: Transform
@@ -158991,11 +158834,6 @@ entities:
     - type: Transform
       pos: 22.5,-1.5
       parent: 2
-  - uid: 7701
-    components:
-    - type: Transform
-      pos: -10.5,-35.5
-      parent: 2
   - uid: 7759
     components:
     - type: Transform
@@ -159161,11 +158999,6 @@ entities:
     - type: Transform
       pos: 19.5,-1.5
       parent: 2
-  - uid: 8492
-    components:
-    - type: Transform
-      pos: -20.5,-35.5
-      parent: 2
   - uid: 8503
     components:
     - type: Transform
@@ -159591,6 +159424,12 @@ entities:
     - type: Transform
       pos: 63.5,-80.5
       parent: 2
+  - uid: 11843
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-29.5
+      parent: 2
   - uid: 11848
     components:
     - type: Transform
@@ -159611,6 +159450,12 @@ entities:
     - type: Transform
       pos: 48.5,-55.5
       parent: 2
+  - uid: 11929
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-29.5
+      parent: 2
   - uid: 11951
     components:
     - type: Transform
@@ -160021,6 +159866,24 @@ entities:
     - type: Transform
       pos: 2.5,-42.5
       parent: 2
+  - uid: 15132
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-29.5
+      parent: 2
+  - uid: 15137
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-29.5
+      parent: 2
+  - uid: 15165
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-31.5
+      parent: 2
   - uid: 15252
     components:
     - type: Transform
@@ -160236,6 +160099,12 @@ entities:
     - type: Transform
       pos: 8.5,-55.5
       parent: 2
+  - uid: 17662
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-35.5
+      parent: 2
   - uid: 17720
     components:
     - type: Transform
@@ -160404,7 +160273,8 @@ entities:
   - uid: 21370
     components:
     - type: Transform
-      pos: -10.5,-34.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-32.5
       parent: 2
   - uid: 21673
     components:
@@ -160426,11 +160296,6 @@ entities:
     - type: Transform
       pos: -54.5,-52.5
       parent: 2
-  - uid: 22015
-    components:
-    - type: Transform
-      pos: -1.5,-35.5
-      parent: 2
   - uid: 22022
     components:
     - type: Transform
@@ -160471,6 +160336,30 @@ entities:
     - type: Transform
       pos: 40.5,13.5
       parent: 2
+  - uid: 22282
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-31.5
+      parent: 2
+  - uid: 23024
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-34.5
+      parent: 2
+  - uid: 23107
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-33.5
+      parent: 2
+  - uid: 23108
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-33.5
+      parent: 2
   - uid: 23321
     components:
     - type: Transform
@@ -160813,11 +160702,6 @@ entities:
     - type: Transform
       pos: 15.5,-50.5
       parent: 2
-  - uid: 1044
-    components:
-    - type: Transform
-      pos: -12.5,-30.5
-      parent: 2
   - uid: 1045
     components:
     - type: Transform
@@ -160958,6 +160842,11 @@ entities:
     - type: Transform
       pos: 17.5,4.5
       parent: 2
+  - uid: 1436
+    components:
+    - type: Transform
+      pos: -1.5,-30.5
+      parent: 2
   - uid: 1438
     components:
     - type: Transform
@@ -161038,11 +160927,6 @@ entities:
     - type: Transform
       pos: 17.5,3.5
       parent: 2
-  - uid: 1725
-    components:
-    - type: Transform
-      pos: -6.5,-29.5
-      parent: 2
   - uid: 1783
     components:
     - type: Transform
@@ -161208,11 +161092,6 @@ entities:
     - type: Transform
       pos: -41.5,-26.5
       parent: 2
-  - uid: 2682
-    components:
-    - type: Transform
-      pos: 2.5,-33.5
-      parent: 2
   - uid: 2756
     components:
     - type: Transform
@@ -161278,6 +161157,11 @@ entities:
     - type: Transform
       pos: 8.5,21.5
       parent: 2
+  - uid: 3279
+    components:
+    - type: Transform
+      pos: 0.5,-28.5
+      parent: 2
   - uid: 3282
     components:
     - type: Transform
@@ -161438,11 +161322,6 @@ entities:
     - type: Transform
       pos: 34.5,-3.5
       parent: 2
-  - uid: 4017
-    components:
-    - type: Transform
-      pos: 2.5,-29.5
-      parent: 2
   - uid: 4044
     components:
     - type: Transform
@@ -161483,11 +161362,6 @@ entities:
     - type: Transform
       pos: 13.5,-46.5
       parent: 2
-  - uid: 4256
-    components:
-    - type: Transform
-      pos: 1.5,-30.5
-      parent: 2
   - uid: 4269
     components:
     - type: Transform
@@ -161588,6 +161462,16 @@ entities:
     - type: Transform
       pos: -6.5,-91.5
       parent: 2
+  - uid: 11685
+    components:
+    - type: Transform
+      pos: 2.5,-32.5
+      parent: 2
+  - uid: 11780
+    components:
+    - type: Transform
+      pos: -1.5,-29.5
+      parent: 2
   - uid: 12570
     components:
     - type: Transform
@@ -161823,11 +161707,6 @@ entities:
     - type: Transform
       pos: 23.5,-58.5
       parent: 2
-  - uid: 14104
-    components:
-    - type: Transform
-      pos: 2.5,-28.5
-      parent: 2
   - uid: 14105
     components:
     - type: Transform
@@ -161978,6 +161857,11 @@ entities:
     - type: Transform
       pos: 19.5,-38.5
       parent: 2
+  - uid: 15124
+    components:
+    - type: Transform
+      pos: -5.5,-29.5
+      parent: 2
   - uid: 15168
     components:
     - type: Transform
@@ -162258,6 +162142,11 @@ entities:
     - type: Transform
       pos: -1.5,12.5
       parent: 2
+  - uid: 11775
+    components:
+    - type: Transform
+      pos: 51.5,-35.5
+      parent: 2
   - uid: 12782
     components:
     - type: Transform
@@ -162332,16 +162221,16 @@ entities:
       parent: 2
 - proto: WaterTankHighCapacity
   entities:
-  - uid: 1197
-    components:
-    - type: Transform
-      pos: -17.5,-36.5
-      parent: 2
   - uid: 3914
     components:
     - type: Transform
       pos: 28.5,-2.5
       parent: 2
+  - uid: 11755
+    components:
+    - type: Transform
+      pos: -17.5,-37.5
+      parent: 2
 - proto: WaterVaporCanister
   entities:
   - uid: 1458
@@ -162419,7 +162308,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 20759
+      - 17919
       - 4914
   - uid: 17952
     components:
@@ -162428,7 +162317,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 20759
+      - 17919
       - 4914
   - uid: 17956
     components:
@@ -162440,6 +162329,7 @@ entities:
       deviceLists:
       - 22532
       - 24330
+      - 24551
   - uid: 18438
     components:
     - type: Transform
@@ -162450,6 +162340,7 @@ entities:
       deviceLists:
       - 22532
       - 24330
+      - 24551
   - uid: 20692
     components:
     - type: Transform
@@ -162482,6 +162373,16 @@ entities:
       - 17940
       - 20692
       - 17100
+  - uid: 17919
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 76.5,-40.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17950
+      - 17952
   - uid: 20709
     components:
     - type: Transform
@@ -162494,16 +162395,6 @@ entities:
       - 17940
       - 20692
       - 17100
-  - uid: 20759
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 80.5,-38.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 17952
-      - 17950
   - uid: 22532
     components:
     - type: Transform
@@ -162524,6 +162415,16 @@ entities:
       devices:
       - 17956
       - 18438
+  - uid: 24551
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-39.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18438
+      - 17956
 - proto: WeaponEnergyTurretSecurity
   entities:
   - uid: 4886
@@ -162848,24 +162749,6 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 10445
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-32.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
-- proto: WindoorKitchenLocked
-  entities:
-  - uid: 13346
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-32.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
 - proto: WindoorSecure
   entities:
   - uid: 3235
@@ -163317,15 +163200,7 @@ entities:
       gridUid: 2
 - proto: WindoorSecureKitchenLocked
   entities:
-  - uid: 7014
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-35.5
-      parent: 2
-    - type: DeltaPressure
-      gridUid: 2
-  - uid: 7064
+  - uid: 5342
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -163333,7 +163208,23 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
-  - uid: 15837
+  - uid: 11750
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 21283
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
+  - uid: 22781
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -164209,6 +164100,14 @@ entities:
       parent: 2
     - type: DeltaPressure
       gridUid: 2
+  - uid: 4197
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-35.5
+      parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4224
     components:
     - type: Transform
diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml
index 58d864740a..b357069817 100644
--- a/Resources/Maps/exo.yml
+++ b/Resources/Maps/exo.yml
@@ -47101,7 +47101,6 @@ entities:
     - type: Transform
       pos: -20.5,-25.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconAtmospherics
   entities:
   - uid: 16227
@@ -47130,7 +47129,6 @@ entities:
     - type: Transform
       pos: -48.5,-45.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconBrigMed
   entities:
   - uid: 18105
@@ -47145,7 +47143,6 @@ entities:
     - type: Transform
       pos: -42.5,-54.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconCargoBay
   entities:
   - uid: 16244
@@ -47153,7 +47150,6 @@ entities:
     - type: Transform
       pos: 24.5,-97.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconCargoReception
   entities:
   - uid: 16243
@@ -47182,7 +47178,6 @@ entities:
     - type: Transform
       pos: 19.5,-72.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconCMORoom
   entities:
   - uid: 16267
@@ -47190,7 +47185,6 @@ entities:
     - type: Transform
       pos: 11.5,-16.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconCryosleep
   entities:
   - uid: 16223
@@ -47277,7 +47271,6 @@ entities:
     - type: Transform
       pos: 14.5,-59.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconHOSRoom
   entities:
   - uid: 18071
@@ -47292,7 +47285,6 @@ entities:
     - type: Transform
       pos: -8.5,-51.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconKitchen
   entities:
   - uid: 16228
@@ -47321,7 +47313,6 @@ entities:
     - type: Transform
       pos: 14.5,-29.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconMorgue
   entities:
   - uid: 8744
@@ -47336,7 +47327,6 @@ entities:
     - type: Transform
       pos: 46.5,-17.5
       parent: 2
-    - type: BombingTarget
     - type: NavMapBeacon
       defaultText: Genpop
 - proto: DefaultStationBeaconPowerBank
@@ -47353,7 +47343,6 @@ entities:
     - type: Transform
       pos: 9.5,-88.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconRDRoom
   entities:
   - uid: 5092
@@ -47382,7 +47371,6 @@ entities:
     - type: Transform
       pos: -6.5,-21.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconSecurity
   entities:
   - uid: 18001
@@ -47411,7 +47399,6 @@ entities:
     - type: Transform
       pos: -23.5,-71.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconSolarsE
   entities:
   - uid: 8642
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index bcb5673b42..12543f1134 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 267.2.0
+  engineVersion: 267.3.0
   forkId: ""
   forkVersion: ""
-  time: 10/08/2025 23:22:51
-  entityCount: 36080
+  time: 10/16/2025 13:06:44
+  entityCount: 36082
 maps:
 - 1
 grids:
@@ -186578,6 +186578,29 @@ entities:
       parent: 13329
     - type: Fixtures
       fixtures: {}
+- proto: SignArrivals
+  entities:
+  - uid: 9339
+    components:
+    - type: Transform
+      pos: -37.5,-27.5
+      parent: 13329
+    - type: Fixtures
+      fixtures: {}
+  - uid: 9340
+    components:
+    - type: Transform
+      pos: -24.5,-7.5
+      parent: 13329
+    - type: Fixtures
+      fixtures: {}
+  - uid: 10642
+    components:
+    - type: Transform
+      pos: -24.5,-23.5
+      parent: 13329
+    - type: Fixtures
+      fixtures: {}
 - proto: SignAtmos
   entities:
   - uid: 26468
@@ -188492,14 +188515,6 @@ entities:
       fixtures: {}
 - proto: SignShipDock
   entities:
-  - uid: 13601
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -37.5,-27.5
-      parent: 13329
-    - type: Fixtures
-      fixtures: {}
   - uid: 19947
     components:
     - type: Transform
diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index c371d2f04c..96f372c677 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -42804,7 +42804,21 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.493689,4.5440345
       parent: 2
+- proto: DefaultStationBeaconAI
+  entities:
+  - uid: 15919
+    components:
+    - type: Transform
+      pos: 73.5,23.5
+      parent: 2
 - proto: DefaultStationBeaconAICore
+  entities:
+  - uid: 15916
+    components:
+    - type: Transform
+      pos: 95.5,30.5
+      parent: 2
+- proto: DefaultStationBeaconAIUpload
   entities:
   - uid: 14515
     components:
@@ -42818,6 +42832,13 @@ entities:
     - type: Transform
       pos: 31.5,-40.5
       parent: 2
+- proto: DefaultStationBeaconAnchor
+  entities:
+  - uid: 15922
+    components:
+    - type: Transform
+      pos: 6.5,-21.5
+      parent: 2
 - proto: DefaultStationBeaconAnomalyGenerator
   entities:
   - uid: 8139
@@ -42825,6 +42846,13 @@ entities:
     - type: Transform
       pos: 68.5,15.5
       parent: 2
+- proto: DefaultStationBeaconArmory
+  entities:
+  - uid: 15787
+    components:
+    - type: Transform
+      pos: 41.5,34.5
+      parent: 2
 - proto: DefaultStationBeaconArrivals
   entities:
   - uid: 14028
@@ -42951,6 +42979,20 @@ entities:
     - type: Transform
       pos: 0.5,-30.5
       parent: 2
+- proto: DefaultStationBeaconDorms
+  entities:
+  - uid: 15912
+    components:
+    - type: Transform
+      pos: 15.5,14.5
+      parent: 2
+- proto: DefaultStationBeaconEngineering
+  entities:
+  - uid: 15913
+    components:
+    - type: Transform
+      pos: 18.5,-25.5
+      parent: 2
 - proto: DefaultStationBeaconEscapePodE
   entities:
   - uid: 2949
@@ -42986,6 +43028,13 @@ entities:
     - type: Transform
       pos: 9.5,-6.5
       parent: 2
+- proto: DefaultStationBeaconGravGen
+  entities:
+  - uid: 15910
+    components:
+    - type: Transform
+      pos: 14.5,38.5
+      parent: 2
 - proto: DefaultStationBeaconHOPOffice
   entities:
   - uid: 13131
@@ -42993,6 +43042,13 @@ entities:
     - type: Transform
       pos: 17.5,-4.5
       parent: 2
+- proto: DefaultStationBeaconHOSRoom
+  entities:
+  - uid: 15907
+    components:
+    - type: Transform
+      pos: 48.5,39.5
+      parent: 2
 - proto: DefaultStationBeaconJanitorsCloset
   entities:
   - uid: 13133
@@ -43021,6 +43077,13 @@ entities:
     - type: Transform
       pos: 10.5,5.5
       parent: 2
+- proto: DefaultStationBeaconMedical
+  entities:
+  - uid: 15914
+    components:
+    - type: Transform
+      pos: 51.5,3.5
+      parent: 2
 - proto: DefaultStationBeaconMorgue
   entities:
   - uid: 13137
@@ -43028,6 +43091,13 @@ entities:
     - type: Transform
       pos: 70.5,-3.5
       parent: 2
+- proto: DefaultStationBeaconPermaBrig
+  entities:
+  - uid: 15911
+    components:
+    - type: Transform
+      pos: 34.5,20.5
+      parent: 2
 - proto: DefaultStationBeaconPowerBank
   entities:
   - uid: 13139
@@ -43070,6 +43140,20 @@ entities:
     - type: Transform
       pos: 7.5,33.5
       parent: 2
+- proto: DefaultStationBeaconSecurity
+  entities:
+  - uid: 15908
+    components:
+    - type: Transform
+      pos: 33.5,29.5
+      parent: 2
+- proto: DefaultStationBeaconSecurityCheckpoint
+  entities:
+  - uid: 15915
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 2
 - proto: DefaultStationBeaconServerRoom
   entities:
   - uid: 13172
@@ -43098,6 +43182,13 @@ entities:
     - type: Transform
       pos: 3.5,-35.5
       parent: 2
+- proto: DefaultStationBeaconSurgery
+  entities:
+  - uid: 15920
+    components:
+    - type: Transform
+      pos: 65.5,-5.5
+      parent: 2
 - proto: DefaultStationBeaconTechVault
   entities:
   - uid: 13175
@@ -43133,6 +43224,13 @@ entities:
     - type: Transform
       pos: 18.5,41.5
       parent: 2
+- proto: DefaultStationBeaconWardensOffice
+  entities:
+  - uid: 15909
+    components:
+    - type: Transform
+      pos: 42.5,25.5
+      parent: 2
 - proto: Defibrillator
   entities:
   - uid: 11416
@@ -73548,7 +73646,7 @@ entities:
         Connect the green pipes to the machine frame across from the lathes. You'll need a machine board to finish the freezer, and probably some spare parts.
 
 
-        Once the freezer is finished, hook it up to the green pipes and set it to 173K. Make sure you turn it on this time, we don't want a repeat of the containment field incident.
+        Once the freezer is finished, hook it up to the green pipes and set it to 270K. Make sure you turn it on this time, we don't want a repeat of the containment field incident.
 
 
         DO NOT upgrade the lathes to hyper-convection until the system is finished, you'll ash me and every other moth in this department.
@@ -85872,13 +85970,15 @@ entities:
     - type: Transform
       pos: 14.5,-17.5
       parent: 2
-- proto: SurveillanceCameraRouterSecurity
+- proto: SurveillanceCameraRouterScience
   entities:
   - uid: 4644
     components:
     - type: Transform
       pos: 15.5,-19.5
       parent: 2
+- proto: SurveillanceCameraRouterSecurity
+  entities:
   - uid: 6899
     components:
     - type: Transform
@@ -88825,6 +88925,8 @@ entities:
     - type: Transform
       pos: 43.5,-4.5
       parent: 2
+- proto: VendingMachineSeedsUnlocked
+  entities:
   - uid: 7681
     components:
     - type: Transform
diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml
index 0a0f1d7428..31c56aee2e 100644
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 266.0.0
+  engineVersion: 267.2.0
   forkId: ""
   forkVersion: ""
-  time: 09/03/2025 00:56:56
-  entityCount: 26486
+  time: 10/12/2025 22:58:09
+  entityCount: 26498
 maps:
 - 1
 grids:
@@ -9858,139 +9858,42 @@ entities:
         uniqueMixes:
         - volume: 2500
           immutable: True
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+          moles: {}
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         - volume: 2500
           temperature: 235
           moles:
-          - 27.225372
-          - 102.419266
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 27.225372
+            Nitrogen: 102.419266
         - volume: 2500
           temperature: 293.14975
           moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 20.078888
+            Nitrogen: 75.53487
         - volume: 2500
           temperature: 293.1495
           moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 20.078888
+            Nitrogen: 75.53487
+        - volume: 2500
+          temperature: 293.15
+          moles: {}
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Plasma: 6666.982
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
-          - 0
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 6666.982
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Nitrogen: 6666.982
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -14718,7 +14621,7 @@ entities:
       pos: -131.5,-45.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -61365.79
+      secondsUntilStateChange: -62401.16
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -65246,18 +65149,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
   - uid: 13666
     components:
     - type: Transform
@@ -65505,18 +65398,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -65562,18 +65445,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67653,18 +67526,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67719,18 +67582,8 @@ entities:
         immutable: False
         temperature: 293.1462
         moles:
-        - 1.606311
-        - 6.042789
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.606311
+          Nitrogen: 6.042789
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -67933,18 +67786,8 @@ entities:
         immutable: False
         temperature: 293.147
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
   - uid: 17839
     components:
     - type: Transform
@@ -67966,18 +67809,8 @@ entities:
         immutable: False
         temperature: 293.1465
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68000,18 +67833,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68046,18 +67869,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.8856695
-        - 7.0937095
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.8856695
+          Nitrogen: 7.0937095
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68127,18 +67940,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.8856695
-        - 7.0937095
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.8856695
+          Nitrogen: 7.0937095
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68277,18 +68080,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -68358,18 +68151,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -84031,9 +83814,10 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      solution: pool
-      destroyOnEmpty: false
       utensil: Spoon
+      trash: []
+      destroyOnEmpty: False
+      solution: pool
   - uid: 16868
     components:
     - type: Transform
@@ -84041,9 +83825,10 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      solution: pool
-      destroyOnEmpty: false
       utensil: Spoon
+      trash: []
+      destroyOnEmpty: False
+      solution: pool
   - uid: 16872
     components:
     - type: Transform
@@ -84051,9 +83836,10 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      solution: pool
-      destroyOnEmpty: false
       utensil: Spoon
+      trash: []
+      destroyOnEmpty: False
+      solution: pool
   - uid: 16907
     components:
     - type: Transform
@@ -84061,9 +83847,10 @@ entities:
       parent: 2
     - type: Edible
       edible: Drink
-      solution: pool
-      destroyOnEmpty: false
       utensil: Spoon
+      trash: []
+      destroyOnEmpty: False
+      solution: pool
   - uid: 17621
     components:
     - type: Transform
@@ -84932,6 +84719,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 26495
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -151.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
 - proto: GasPipeBend
   entities:
   - uid: 1565
@@ -85178,14 +84973,6 @@ entities:
     - type: Transform
       pos: -146.5,3.5
       parent: 2
-  - uid: 6055
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -150.5,2.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 6060
     components:
     - type: Transform
@@ -86712,6 +86499,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 26493
+    components:
+    - type: Transform
+      pos: -150.5,3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
+  - uid: 26494
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -151.5,3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
 - proto: GasPipeFourway
   entities:
   - uid: 2081
@@ -112212,6 +112014,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 26497
+    components:
+    - type: Transform
+      pos: -151.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 13
@@ -112482,6 +112291,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -146.5,1.5
       parent: 2
+  - uid: 6055
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -150.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 6102
     components:
     - type: Transform
@@ -115952,6 +115769,17 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+- proto: GasPressureRegulator
+  entities:
+  - uid: 26496
+    components:
+    - type: Transform
+      pos: -151.5,0.5
+      parent: 2
+    - type: GasPressureRegulator
+      threshold: 95000
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
 - proto: GasThermoMachineFreezer
   entities:
   - uid: 1385
@@ -116027,6 +115855,13 @@ entities:
     - type: Transform
       pos: -140.5,-2.5
       parent: 2
+  - uid: 26498
+    components:
+    - type: Transform
+      pos: -151.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
 - proto: GasVentPump
   entities:
   - uid: 275
@@ -122715,11 +122550,6 @@ entities:
     - type: Transform
       pos: -22.5,-18.5
       parent: 2
-  - uid: 10489
-    components:
-    - type: Transform
-      pos: -41.5,-42.5
-      parent: 2
   - uid: 10490
     components:
     - type: Transform
@@ -126054,18 +125884,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -126109,18 +125929,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -126156,18 +125966,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -126200,18 +126000,8 @@ entities:
         immutable: False
         temperature: 293.1465
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128417,18 +128207,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128671,18 +128451,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128757,18 +128527,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -128805,18 +128565,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: Lock
       locked: False
     - type: Fixtures
@@ -130218,6 +129968,11 @@ entities:
     - type: Transform
       pos: -136.5,-4.5
       parent: 2
+  - uid: 10489
+    components:
+    - type: Transform
+      pos: -41.5,-42.5
+      parent: 2
   - uid: 15329
     components:
     - type: Transform
@@ -130238,6 +129993,26 @@ entities:
     - type: Transform
       pos: -37.5,-2.5
       parent: 2
+  - uid: 26488
+    components:
+    - type: Transform
+      pos: -113.5,-26.5
+      parent: 2
+  - uid: 26489
+    components:
+    - type: Transform
+      pos: -105.5,-61.5
+      parent: 2
+  - uid: 26490
+    components:
+    - type: Transform
+      pos: -73.5,-39.5
+      parent: 2
+  - uid: 26491
+    components:
+    - type: Transform
+      pos: -84.5,6.5
+      parent: 2
 - proto: NitrogenTankFilled
   entities:
   - uid: 23345
@@ -130518,6 +130293,11 @@ entities:
     - type: Transform
       pos: -37.5,-3.5
       parent: 2
+  - uid: 26492
+    components:
+    - type: Transform
+      pos: -91.5,4.5
+      parent: 2
 - proto: PaladinCircuitBoard
   entities:
   - uid: 24947
@@ -131401,130 +131181,174 @@ entities:
     - type: Transform
       pos: -26.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6025
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -27.5,-66.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6031
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -27.5,-67.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9355
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -26.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12207
     components:
     - type: Transform
       pos: -25.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15446
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -25.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16456
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -24.5,-67.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23312
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-62.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23373
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23392
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23441
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23448
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23450
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-62.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23451
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23452
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23453
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23454
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23845
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -118.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24260
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -118.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24872
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -122.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24925
     components:
     - type: Transform
       pos: -122.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24926
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -123.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: PlasmaTank
   entities:
   - uid: 2843
@@ -131560,40 +131384,54 @@ entities:
       rot: 3.141592653589793 rad
       pos: -117.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24896
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -118.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24897
     components:
     - type: Transform
       pos: -118.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24903
     components:
     - type: Transform
       pos: -117.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24932
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -121.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24937
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -121.5,-82.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24938
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -119.5,-82.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: PlasmaWindowDirectional
   entities:
   - uid: 6607
@@ -131602,16 +131440,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -78.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21053
     components:
     - type: Transform
       pos: -39.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21054
     components:
     - type: Transform
       pos: -37.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 964
@@ -131777,7 +131621,7 @@ entities:
       pos: -14.584713,16.470493
       parent: 2
     - type: MeleeWeapon
-      attackRate: 10
+      attackRate: 2
       autoAttack: True
     - type: Item
       size: Huge
@@ -135510,18 +135354,6 @@ entities:
     - type: Transform
       pos: -100.5,-27.5
       parent: 2
-- proto: PrefilledSyringe
-  entities:
-  - uid: 6481
-    components:
-    - type: Transform
-      pos: -36.23253,-30.543175
-      parent: 2
-  - uid: 7609
-    components:
-    - type: Transform
-      pos: -134.52573,-43.445347
-      parent: 2
 - proto: Protolathe
   entities:
   - uid: 9781
@@ -136980,591 +136812,827 @@ entities:
     - type: Transform
       pos: -110.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 667
     components:
     - type: Transform
       pos: -112.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 670
     components:
     - type: Transform
       pos: -110.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 673
     components:
     - type: Transform
       pos: -109.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 675
     components:
     - type: Transform
       pos: -111.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 807
     components:
     - type: Transform
       pos: -124.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1870
     components:
     - type: Transform
       pos: -111.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1984
     components:
     - type: Transform
       pos: -109.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2453
     components:
     - type: Transform
       pos: -148.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5278
     components:
     - type: Transform
       pos: -112.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5279
     components:
     - type: Transform
       pos: -112.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5280
     components:
     - type: Transform
       pos: -108.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5281
     components:
     - type: Transform
       pos: -108.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5282
     components:
     - type: Transform
       pos: -108.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5283
     components:
     - type: Transform
       pos: -112.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5284
     components:
     - type: Transform
       pos: -112.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5285
     components:
     - type: Transform
       pos: -112.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5286
     components:
     - type: Transform
       pos: -108.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5287
     components:
     - type: Transform
       pos: -108.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5288
     components:
     - type: Transform
       pos: -108.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5289
     components:
     - type: Transform
       pos: -114.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5290
     components:
     - type: Transform
       pos: -114.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5291
     components:
     - type: Transform
       pos: -114.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5292
     components:
     - type: Transform
       pos: -106.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5293
     components:
     - type: Transform
       pos: -106.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5294
     components:
     - type: Transform
       pos: -106.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5295
     components:
     - type: Transform
       pos: -114.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5296
     components:
     - type: Transform
       pos: -114.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5297
     components:
     - type: Transform
       pos: -114.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5298
     components:
     - type: Transform
       pos: -106.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5299
     components:
     - type: Transform
       pos: -106.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5300
     components:
     - type: Transform
       pos: -106.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5342
     components:
     - type: Transform
       pos: -126.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5345
     components:
     - type: Transform
       pos: -124.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5359
     components:
     - type: Transform
       pos: -124.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5360
     components:
     - type: Transform
       pos: -124.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5361
     components:
     - type: Transform
       pos: -126.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5378
     components:
     - type: Transform
       pos: -124.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5380
     components:
     - type: Transform
       pos: -124.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5418
     components:
     - type: Transform
       pos: -126.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5419
     components:
     - type: Transform
       pos: -126.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5434
     components:
     - type: Transform
       pos: -124.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5443
     components:
     - type: Transform
       pos: -124.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5450
     components:
     - type: Transform
       pos: -124.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5470
     components:
     - type: Transform
       pos: -124.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5479
     components:
     - type: Transform
       pos: -124.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5480
     components:
     - type: Transform
       pos: -124.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5505
     components:
     - type: Transform
       pos: -142.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5506
     components:
     - type: Transform
       pos: -142.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5941
     components:
     - type: Transform
       pos: -146.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5942
     components:
     - type: Transform
       pos: -148.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5943
     components:
     - type: Transform
       pos: -147.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5944
     components:
     - type: Transform
       pos: -148.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5945
     components:
     - type: Transform
       pos: -146.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5946
     components:
     - type: Transform
       pos: -147.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5981
     components:
     - type: Transform
       pos: -142.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5990
     components:
     - type: Transform
       pos: -152.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5999
     components:
     - type: Transform
       pos: -148.5,-51.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6005
     components:
     - type: Transform
       pos: -142.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6082
     components:
     - type: Transform
       pos: -148.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6083
     components:
     - type: Transform
       pos: -146.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6084
     components:
     - type: Transform
       pos: -147.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6091
     components:
     - type: Transform
       pos: -146.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6092
     components:
     - type: Transform
       pos: -148.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6096
     components:
     - type: Transform
       pos: -153.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6101
     components:
     - type: Transform
       pos: -146.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6103
     components:
     - type: Transform
       pos: -146.5,-41.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6245
     components:
     - type: Transform
       pos: -68.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6924
     components:
     - type: Transform
       pos: -126.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7167
     components:
     - type: Transform
       pos: -146.5,-51.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7192
     components:
     - type: Transform
       pos: -148.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7211
     components:
     - type: Transform
       pos: -148.5,-41.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7247
     components:
     - type: Transform
       pos: -148.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7307
     components:
     - type: Transform
       pos: -155.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7317
     components:
     - type: Transform
       pos: -155.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7839
     components:
     - type: Transform
       pos: -143.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7840
     components:
     - type: Transform
       pos: -151.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7842
     components:
     - type: Transform
       pos: -146.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7856
     components:
     - type: Transform
       pos: -155.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7890
     components:
     - type: Transform
       pos: -69.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9817
     components:
     - type: Transform
       pos: -126.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9912
     components:
     - type: Transform
       pos: -126.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13497
     components:
     - type: Transform
       pos: -109.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13498
     components:
     - type: Transform
       pos: -110.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13499
     components:
     - type: Transform
       pos: -111.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13661
     components:
     - type: Transform
       pos: -146.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13662
     components:
     - type: Transform
       pos: -151.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13664
     components:
     - type: Transform
       pos: -151.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13670
     components:
     - type: Transform
       pos: -151.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13718
     components:
     - type: Transform
       pos: -143.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14110
     components:
     - type: Transform
       pos: -67.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14756
     components:
     - type: Transform
       pos: -67.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16466
     components:
     - type: Transform
       pos: -153.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20368
     components:
     - type: Transform
       pos: -124.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20411
     components:
     - type: Transform
       pos: -122.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23079
     components:
     - type: Transform
       pos: -124.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23103
     components:
     - type: Transform
       pos: -114.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23104
     components:
     - type: Transform
       pos: -114.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23108
     components:
     - type: Transform
       pos: -114.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23396
     components:
     - type: Transform
       pos: -116.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23401
     components:
     - type: Transform
       pos: -120.5,-81.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23498
     components:
     - type: Transform
       pos: -116.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23716
     components:
     - type: Transform
       pos: -69.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24847
     components:
     - type: Transform
       pos: -116.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24880
     components:
     - type: Transform
       pos: -118.5,-64.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24887
     components:
     - type: Transform
       pos: -116.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24888
     components:
     - type: Transform
       pos: -126.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24889
     components:
     - type: Transform
       pos: -126.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24890
     components:
     - type: Transform
       pos: -126.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24891
     components:
     - type: Transform
       pos: -124.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24894
     components:
     - type: Transform
       pos: -122.5,-64.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24901
     components:
     - type: Transform
       pos: -124.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24921
     components:
     - type: Transform
       pos: -123.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24933
     components:
     - type: Transform
       pos: -121.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24934
     components:
     - type: Transform
       pos: -119.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24935
     components:
     - type: Transform
       pos: -118.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24936
     components:
     - type: Transform
       pos: -117.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25187
     components:
     - type: Transform
       pos: -124.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ReinforcedPlasmaWindowDiagonal
   entities:
   - uid: 7308
@@ -137572,35 +137640,47 @@ entities:
     - type: Transform
       pos: -155.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7324
     components:
     - type: Transform
       pos: -154.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7332
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -154.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7333
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -154.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7334
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -154.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7342
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -155.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ReinforcedWindow
   entities:
   - uid: 4
@@ -137608,1876 +137688,2626 @@ entities:
     - type: Transform
       pos: -114.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10
     components:
     - type: Transform
       pos: -69.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18
     components:
     - type: Transform
       pos: -69.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 31
     components:
     - type: Transform
       pos: -69.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 46
     components:
     - type: Transform
       pos: -66.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 47
     components:
     - type: Transform
       pos: -64.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 48
     components:
     - type: Transform
       pos: -65.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 49
     components:
     - type: Transform
       pos: -64.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 50
     components:
     - type: Transform
       pos: -62.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 51
     components:
     - type: Transform
       pos: -61.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 52
     components:
     - type: Transform
       pos: -60.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 54
     components:
     - type: Transform
       pos: -58.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 56
     components:
     - type: Transform
       pos: -58.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 57
     components:
     - type: Transform
       pos: -57.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 58
     components:
     - type: Transform
       pos: -56.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 59
     components:
     - type: Transform
       pos: -53.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 60
     components:
     - type: Transform
       pos: -53.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 61
     components:
     - type: Transform
       pos: -53.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 71
     components:
     - type: Transform
       pos: -59.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 73
     components:
     - type: Transform
       pos: -101.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 107
     components:
     - type: Transform
       pos: -65.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 109
     components:
     - type: Transform
       pos: -65.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 110
     components:
     - type: Transform
       pos: -64.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 111
     components:
     - type: Transform
       pos: -63.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 112
     components:
     - type: Transform
       pos: -62.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 113
     components:
     - type: Transform
       pos: -60.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 114
     components:
     - type: Transform
       pos: -59.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 116
     components:
     - type: Transform
       pos: -58.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 117
     components:
     - type: Transform
       pos: -57.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 118
     components:
     - type: Transform
       pos: -57.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 141
     components:
     - type: Transform
       pos: -63.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 167
     components:
     - type: Transform
       pos: -52.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 171
     components:
     - type: Transform
       pos: -51.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 178
     components:
     - type: Transform
       pos: -31.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 249
     components:
     - type: Transform
       pos: -31.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 285
     components:
     - type: Transform
       pos: -82.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 287
     components:
     - type: Transform
       pos: -85.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 291
     components:
     - type: Transform
       pos: -84.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 316
     components:
     - type: Transform
       pos: -35.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 320
     components:
     - type: Transform
       pos: -34.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 322
     components:
     - type: Transform
       pos: -32.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 351
     components:
     - type: Transform
       pos: -93.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 398
     components:
     - type: Transform
       pos: -48.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 420
     components:
     - type: Transform
       pos: -92.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 474
     components:
     - type: Transform
       pos: -66.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 504
     components:
     - type: Transform
       pos: -116.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 751
     components:
     - type: Transform
       pos: -83.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 787
     components:
     - type: Transform
       pos: -138.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 953
     components:
     - type: Transform
       pos: -83.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1014
     components:
     - type: Transform
       pos: -53.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1015
     components:
     - type: Transform
       pos: -54.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1170
     components:
     - type: Transform
       pos: -35.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1174
     components:
     - type: Transform
       pos: -35.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1176
     components:
     - type: Transform
       pos: -35.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1252
     components:
     - type: Transform
       pos: -20.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1253
     components:
     - type: Transform
       pos: -20.5,-52.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1254
     components:
     - type: Transform
       pos: -20.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1312
     components:
     - type: Transform
       pos: -31.5,-2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1313
     components:
     - type: Transform
       pos: -31.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1314
     components:
     - type: Transform
       pos: -31.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1331
     components:
     - type: Transform
       pos: -117.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1534
     components:
     - type: Transform
       pos: -20.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1676
     components:
     - type: Transform
       pos: -93.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1712
     components:
     - type: Transform
       pos: -24.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1713
     components:
     - type: Transform
       pos: -27.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1714
     components:
     - type: Transform
       pos: -27.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1738
     components:
     - type: Transform
       pos: -101.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1809
     components:
     - type: Transform
       pos: -56.5,-79.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1810
     components:
     - type: Transform
       pos: -55.5,-79.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1864
     components:
     - type: Transform
       pos: -117.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1873
     components:
     - type: Transform
       pos: -106.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1888
     components:
     - type: Transform
       pos: -34.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1892
     components:
     - type: Transform
       pos: -106.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1950
     components:
     - type: Transform
       pos: -106.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1978
     components:
     - type: Transform
       pos: -32.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2053
     components:
     - type: Transform
       pos: -95.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2054
     components:
     - type: Transform
       pos: -95.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2129
     components:
     - type: Transform
       pos: -33.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2196
     components:
     - type: Transform
       pos: -119.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2221
     components:
     - type: Transform
       pos: -123.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2222
     components:
     - type: Transform
       pos: -123.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2223
     components:
     - type: Transform
       pos: -123.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2238
     components:
     - type: Transform
       pos: -123.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2363
     components:
     - type: Transform
       pos: -89.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2365
     components:
     - type: Transform
       pos: -89.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2367
     components:
     - type: Transform
       pos: -93.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2533
     components:
     - type: Transform
       pos: -121.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2648
     components:
     - type: Transform
       pos: -89.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2682
     components:
     - type: Transform
       pos: -63.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2695
     components:
     - type: Transform
       pos: -59.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2852
     components:
     - type: Transform
       pos: -51.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2853
     components:
     - type: Transform
       pos: -50.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2854
     components:
     - type: Transform
       pos: -49.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2855
     components:
     - type: Transform
       pos: -45.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2856
     components:
     - type: Transform
       pos: -43.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2857
     components:
     - type: Transform
       pos: -44.5,3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2906
     components:
     - type: Transform
       pos: -47.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2939
     components:
     - type: Transform
       pos: -50.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2947
     components:
     - type: Transform
       pos: -52.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2948
     components:
     - type: Transform
       pos: -51.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2949
     components:
     - type: Transform
       pos: -50.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3313
     components:
     - type: Transform
       pos: -8.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3415
     components:
     - type: Transform
       pos: -48.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3751
     components:
     - type: Transform
       pos: -7.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3775
     components:
     - type: Transform
       pos: -9.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3785
     components:
     - type: Transform
       pos: -7.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3809
     components:
     - type: Transform
       pos: -67.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3828
     components:
     - type: Transform
       pos: -48.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3829
     components:
     - type: Transform
       pos: -48.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3960
     components:
     - type: Transform
       pos: -31.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3963
     components:
     - type: Transform
       pos: -31.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3970
     components:
     - type: Transform
       pos: -29.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4017
     components:
     - type: Transform
       pos: -89.5,-28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4129
     components:
     - type: Transform
       pos: -101.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4229
     components:
     - type: Transform
       pos: -83.5,24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4230
     components:
     - type: Transform
       pos: -83.5,23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4231
     components:
     - type: Transform
       pos: -83.5,25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4287
     components:
     - type: Transform
       pos: -31.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4526
     components:
     - type: Transform
       pos: -84.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4541
     components:
     - type: Transform
       pos: -97.5,9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4548
     components:
     - type: Transform
       pos: -97.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4583
     components:
     - type: Transform
       pos: -80.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4629
     components:
     - type: Transform
       pos: -97.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4630
     components:
     - type: Transform
       pos: -9.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4674
     components:
     - type: Transform
       pos: -8.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4693
     components:
     - type: Transform
       pos: -85.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4698
     components:
     - type: Transform
       pos: -85.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4710
     components:
     - type: Transform
       pos: -83.5,29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4711
     components:
     - type: Transform
       pos: -83.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4712
     components:
     - type: Transform
       pos: -83.5,28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4725
     components:
     - type: Transform
       pos: -87.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4726
     components:
     - type: Transform
       pos: -85.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4745
     components:
     - type: Transform
       pos: -85.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4747
     components:
     - type: Transform
       pos: -140.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4756
     components:
     - type: Transform
       pos: -83.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4762
     components:
     - type: Transform
       pos: -84.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4825
     components:
     - type: Transform
       pos: -93.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4833
     components:
     - type: Transform
       pos: -127.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4906
     components:
     - type: Transform
       pos: -126.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4907
     components:
     - type: Transform
       pos: -125.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5675
     components:
     - type: Transform
       pos: -107.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5676
     components:
     - type: Transform
       pos: -108.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5693
     components:
     - type: Transform
       pos: -140.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5700
     components:
     - type: Transform
       pos: -120.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5701
     components:
     - type: Transform
       pos: -118.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5715
     components:
     - type: Transform
       pos: -106.5,-63.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5762
     components:
     - type: Transform
       pos: -115.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5774
     components:
     - type: Transform
       pos: -117.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5777
     components:
     - type: Transform
       pos: -114.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5778
     components:
     - type: Transform
       pos: -117.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5813
     components:
     - type: Transform
       pos: -116.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5814
     components:
     - type: Transform
       pos: -113.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5815
     components:
     - type: Transform
       pos: -113.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5816
     components:
     - type: Transform
       pos: -116.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5867
     components:
     - type: Transform
       pos: -106.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5868
     components:
     - type: Transform
       pos: -106.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5869
     components:
     - type: Transform
       pos: -106.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6125
     components:
     - type: Transform
       pos: -155.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6198
     components:
     - type: Transform
       pos: -126.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6201
     components:
     - type: Transform
       pos: -126.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6202
     components:
     - type: Transform
       pos: -126.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6203
     components:
     - type: Transform
       pos: -126.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6267
     components:
     - type: Transform
       pos: -125.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6269
     components:
     - type: Transform
       pos: -121.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6270
     components:
     - type: Transform
       pos: -121.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6311
     components:
     - type: Transform
       pos: -126.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6682
     components:
     - type: Transform
       pos: -81.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6755
     components:
     - type: Transform
       pos: -95.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6756
     components:
     - type: Transform
       pos: -95.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6897
     components:
     - type: Transform
       pos: -86.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6972
     components:
     - type: Transform
       pos: -140.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7145
     components:
     - type: Transform
       pos: -1.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7159
     components:
     - type: Transform
       pos: -2.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7165
     components:
     - type: Transform
       pos: -1.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7171
     components:
     - type: Transform
       pos: -1.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7175
     components:
     - type: Transform
       pos: -2.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7183
     components:
     - type: Transform
       pos: -1.5,-14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7187
     components:
     - type: Transform
       pos: -3.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7203
     components:
     - type: Transform
       pos: -1.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7209
     components:
     - type: Transform
       pos: -1.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7219
     components:
     - type: Transform
       pos: -1.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7220
     components:
     - type: Transform
       pos: -3.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7249
     components:
     - type: Transform
       pos: -93.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7257
     components:
     - type: Transform
       pos: -141.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7280
     components:
     - type: Transform
       pos: -117.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7281
     components:
     - type: Transform
       pos: -117.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7284
     components:
     - type: Transform
       pos: -117.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7285
     components:
     - type: Transform
       pos: -117.5,-52.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7318
     components:
     - type: Transform
       pos: -131.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7389
     components:
     - type: Transform
       pos: -131.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7390
     components:
     - type: Transform
       pos: -131.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7391
     components:
     - type: Transform
       pos: -131.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7392
     components:
     - type: Transform
       pos: -131.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7529
     components:
     - type: Transform
       pos: -137.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7568
     components:
     - type: Transform
       pos: -141.5,-37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7876
     components:
     - type: Transform
       pos: -121.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7898
     components:
     - type: Transform
       pos: -81.5,19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8052
     components:
     - type: Transform
       pos: -130.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8075
     components:
     - type: Transform
       pos: -140.5,-41.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8164
     components:
     - type: Transform
       pos: -83.5,19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8195
     components:
     - type: Transform
       pos: -0.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8196
     components:
     - type: Transform
       pos: 1.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8197
     components:
     - type: Transform
       pos: 0.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8198
     components:
     - type: Transform
       pos: 1.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8199
     components:
     - type: Transform
       pos: 0.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8200
     components:
     - type: Transform
       pos: -0.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8201
     components:
     - type: Transform
       pos: -0.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8202
     components:
     - type: Transform
       pos: -0.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8203
     components:
     - type: Transform
       pos: 0.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8204
     components:
     - type: Transform
       pos: 1.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8205
     components:
     - type: Transform
       pos: 0.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8206
     components:
     - type: Transform
       pos: 1.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8213
     components:
     - type: Transform
       pos: 1.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8214
     components:
     - type: Transform
       pos: 0.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8215
     components:
     - type: Transform
       pos: -0.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8216
     components:
     - type: Transform
       pos: -0.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8217
     components:
     - type: Transform
       pos: 0.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8218
     components:
     - type: Transform
       pos: 1.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8228
     components:
     - type: Transform
       pos: -9.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8229
     components:
     - type: Transform
       pos: -10.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8230
     components:
     - type: Transform
       pos: -11.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8236
     components:
     - type: Transform
       pos: -5.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8238
     components:
     - type: Transform
       pos: -7.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8239
     components:
     - type: Transform
       pos: -7.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8244
     components:
     - type: Transform
       pos: -3.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8253
     components:
     - type: Transform
       pos: -16.5,-64.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8260
     components:
     - type: Transform
       pos: -11.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8261
     components:
     - type: Transform
       pos: -9.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8262
     components:
     - type: Transform
       pos: -5.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8263
     components:
     - type: Transform
       pos: -3.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8296
     components:
     - type: Transform
       pos: -6.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8297
     components:
     - type: Transform
       pos: -7.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8299
     components:
     - type: Transform
       pos: -8.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8343
     components:
     - type: Transform
       pos: -29.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8363
     components:
     - type: Transform
       pos: -38.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8364
     components:
     - type: Transform
       pos: -38.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8365
     components:
     - type: Transform
       pos: -38.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8366
     components:
     - type: Transform
       pos: -38.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8367
     components:
     - type: Transform
       pos: -36.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8368
     components:
     - type: Transform
       pos: -36.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8369
     components:
     - type: Transform
       pos: -36.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8370
     components:
     - type: Transform
       pos: -36.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8377
     components:
     - type: Transform
       pos: -82.5,19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8522
     components:
     - type: Transform
       pos: -34.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8529
     components:
     - type: Transform
       pos: -32.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8708
     components:
     - type: Transform
       pos: -5.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8709
     components:
     - type: Transform
       pos: -3.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8710
     components:
     - type: Transform
       pos: -4.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8711
     components:
     - type: Transform
       pos: -3.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8714
     components:
     - type: Transform
       pos: -4.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8715
     components:
     - type: Transform
       pos: -3.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8716
     components:
     - type: Transform
       pos: -5.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8729
     components:
     - type: Transform
       pos: -7.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8737
     components:
     - type: Transform
       pos: -7.5,-28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8738
     components:
     - type: Transform
       pos: -7.5,-31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8739
     components:
     - type: Transform
       pos: -7.5,-32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8740
     components:
     - type: Transform
       pos: -7.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8920
     components:
     - type: Transform
       pos: -14.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8938
     components:
     - type: Transform
       pos: -14.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9034
     components:
     - type: Transform
       pos: -90.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9098
     components:
     - type: Transform
       pos: -106.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9324
     components:
     - type: Transform
       pos: -30.5,22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9539
     components:
     - type: Transform
       pos: -97.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9549
     components:
     - type: Transform
       pos: -95.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9788
     components:
     - type: Transform
       pos: -32.5,-75.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9838
     components:
     - type: Transform
       pos: -136.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9958
     components:
     - type: Transform
       pos: -16.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9964
     components:
     - type: Transform
       pos: -16.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9980
     components:
     - type: Transform
       pos: -95.5,38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9981
     components:
     - type: Transform
       pos: -93.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9982
     components:
     - type: Transform
       pos: -93.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9983
     components:
     - type: Transform
       pos: -93.5,38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9986
     components:
     - type: Transform
       pos: -95.5,39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9987
     components:
     - type: Transform
       pos: -93.5,39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10035
     components:
     - type: Transform
       pos: -140.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10084
     components:
     - type: Transform
       pos: -34.5,-77.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10087
     components:
     - type: Transform
       pos: -32.5,-77.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10488
     components:
     - type: Transform
       pos: -16.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 10528
     components:
     - type: Transform
       pos: -83.5,-6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11035
     components:
     - type: Transform
       pos: -28.5,22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11047
     components:
     - type: Transform
       pos: -34.5,-75.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11048
     components:
     - type: Transform
       pos: -34.5,-76.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11059
     components:
     - type: Transform
       pos: -108.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11076
     components:
     - type: Transform
       pos: -32.5,-76.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11080
     components:
     - type: Transform
       pos: -28.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11092
     components:
     - type: Transform
       pos: -30.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11358
     components:
     - type: Transform
       pos: -22.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11359
     components:
     - type: Transform
       pos: -22.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11710
     components:
     - type: Transform
       pos: -99.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11716
     components:
     - type: Transform
       pos: -99.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12425
     components:
     - type: Transform
       pos: -28.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12450
     components:
     - type: Transform
       pos: -101.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12546
     components:
     - type: Transform
       pos: -31.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12588
     components:
     - type: Transform
       pos: -126.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12748
     components:
     - type: Transform
       pos: -133.5,-57.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12840
     components:
     - type: Transform
       pos: -13.5,-64.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 12855
     components:
     - type: Transform
       pos: -101.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13241
     components:
     - type: Transform
       pos: -138.5,15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13248
     components:
     - type: Transform
       pos: -31.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13523
     components:
     - type: Transform
       pos: -140.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13879
     components:
     - type: Transform
       pos: -138.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14003
     components:
     - type: Transform
       pos: -137.5,21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14499
     components:
     - type: Transform
       pos: -13.5,-66.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15407
     components:
     - type: Transform
       pos: -125.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16087
     components:
     - type: Transform
       pos: -106.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16091
     components:
     - type: Transform
       pos: -123.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16141
     components:
     - type: Transform
       pos: -93.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16488
     components:
     - type: Transform
       pos: -137.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16505
     components:
     - type: Transform
       pos: -138.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16695
     components:
     - type: Transform
       pos: -129.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16716
     components:
     - type: Transform
       pos: -33.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16836
     components:
     - type: Transform
       pos: -107.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16906
     components:
     - type: Transform
       pos: -22.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17005
     components:
     - type: Transform
       pos: -115.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17075
     components:
     - type: Transform
       pos: -86.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17161
     components:
     - type: Transform
       pos: -31.5,-75.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17164
     components:
     - type: Transform
       pos: -35.5,-75.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17359
     components:
     - type: Transform
       pos: -127.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17513
     components:
     - type: Transform
       pos: -136.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17538
     components:
     - type: Transform
       pos: -140.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17651
     components:
     - type: Transform
       pos: -14.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18193
     components:
     - type: Transform
       pos: -95.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18686
     components:
     - type: Transform
       pos: -95.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18726
     components:
     - type: Transform
       pos: -138.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18833
     components:
     - type: Transform
       pos: -97.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18937
     components:
     - type: Transform
       pos: -95.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18941
     components:
     - type: Transform
       pos: -95.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19623
     components:
     - type: Transform
       pos: -114.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19629
     components:
     - type: Transform
       pos: -115.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19750
     components:
     - type: Transform
       pos: -113.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19752
     components:
     - type: Transform
       pos: -69.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19864
     components:
     - type: Transform
       pos: -67.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19914
     components:
     - type: Transform
       pos: -101.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20160
     components:
     - type: Transform
       pos: -139.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20167
     components:
     - type: Transform
       pos: -123.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20277
     components:
     - type: Transform
       pos: -139.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20319
     components:
     - type: Transform
       pos: -57.5,-79.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20329
     components:
     - type: Transform
       pos: -128.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20445
     components:
     - type: Transform
       pos: -119.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20449
     components:
     - type: Transform
       pos: -122.5,36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20450
     components:
     - type: Transform
       pos: -122.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20456
     components:
     - type: Transform
       pos: -121.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20466
     components:
     - type: Transform
       pos: -120.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20503
     components:
     - type: Transform
       pos: -92.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20563
     components:
     - type: Transform
       pos: -101.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20564
     components:
     - type: Transform
       pos: -92.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20734
     components:
     - type: Transform
       pos: -92.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20736
     components:
     - type: Transform
       pos: -92.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20780
     components:
     - type: Transform
       pos: -97.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20844
     components:
     - type: Transform
       pos: -36.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20936
     components:
     - type: Transform
       pos: -93.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21002
     components:
     - type: Transform
       pos: -104.5,37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21491
     components:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21492
     components:
     - type: Transform
       pos: -20.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21493
     components:
     - type: Transform
       pos: -19.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21873
     components:
     - type: Transform
       pos: -36.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21874
     components:
     - type: Transform
       pos: -33.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 21879
     components:
     - type: Transform
       pos: -141.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22701
     components:
     - type: Transform
       pos: -39.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22904
     components:
     - type: Transform
       pos: -141.5,14.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22936
     components:
     - type: Transform
       pos: -43.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22962
     components:
     - type: Transform
       pos: -44.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22963
     components:
     - type: Transform
       pos: -42.5,-65.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23053
     components:
     - type: Transform
       pos: -91.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23504
     components:
     - type: Transform
       pos: -95.5,31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23751
     components:
     - type: Transform
       pos: -21.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23752
     components:
     - type: Transform
       pos: -20.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24036
     components:
     - type: Transform
       pos: -93.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24115
     components:
     - type: Transform
       pos: -16.5,-66.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24214
     components:
     - type: Transform
       pos: -32.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24215
     components:
     - type: Transform
       pos: -34.5,-78.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24333
     components:
     - type: Transform
       pos: -19.5,-51.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24334
     components:
     - type: Transform
       pos: -18.5,-51.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25403
     components:
     - type: Transform
       pos: -113.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25986
     components:
     - type: Transform
       pos: -110.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: RemoteSignaller
   entities:
   - uid: 3377
@@ -140132,120 +140962,166 @@ entities:
     - type: Transform
       pos: -24.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 138
     components:
     - type: Transform
       pos: -26.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7272
     components:
     - type: Transform
       pos: -115.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7273
     components:
     - type: Transform
       pos: -113.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7274
     components:
     - type: Transform
       pos: -114.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7275
     components:
     - type: Transform
       pos: -113.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7276
     components:
     - type: Transform
       pos: -114.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7277
     components:
     - type: Transform
       pos: -115.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8820
     components:
     - type: Transform
       pos: -13.5,-41.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8821
     components:
     - type: Transform
       pos: -13.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8822
     components:
     - type: Transform
       pos: -13.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9078
     components:
     - type: Transform
       pos: -35.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9414
     components:
     - type: Transform
       pos: -34.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9769
     components:
     - type: Transform
       pos: -33.5,-68.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11133
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11176
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11330
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11783
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -95.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15252
     components:
     - type: Transform
       pos: -33.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15282
     components:
     - type: Transform
       pos: -34.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15283
     components:
     - type: Transform
       pos: -35.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19536
     components:
     - type: Transform
       pos: -89.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19537
     components:
     - type: Transform
       pos: -88.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ShuttersNormalOpen
   entities:
   - uid: 399
@@ -140253,27 +141129,37 @@ entities:
     - type: Transform
       pos: -50.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1716
     components:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1763
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -101.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2958
     components:
     - type: Transform
       pos: -47.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2959
     components:
     - type: Transform
       pos: -49.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 2
   - uid: 2960
@@ -140281,26 +141167,36 @@ entities:
     - type: Transform
       pos: -49.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2962
     components:
     - type: Transform
       pos: -52.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2963
     components:
     - type: Transform
       pos: -51.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2964
     components:
     - type: Transform
       pos: -48.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2998
     components:
     - type: Transform
       pos: -53.5,-10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3344
@@ -140309,6 +141205,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3382
@@ -140317,6 +141215,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3830
@@ -140325,6 +141225,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3831
@@ -140333,6 +141235,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3832
@@ -140341,6 +141245,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3833
@@ -140349,6 +141255,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3997
@@ -140357,6 +141265,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3998
@@ -140365,6 +141275,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 3999
@@ -140373,6 +141285,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4456
@@ -140381,6 +141295,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -121.5,-82.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4457
@@ -140388,6 +141304,8 @@ entities:
     - type: Transform
       pos: -120.5,-81.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4459
@@ -140396,6 +141314,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -126.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4466
@@ -140404,6 +141324,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -124.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4467
@@ -140412,6 +141334,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -124.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4468
@@ -140420,6 +141344,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -119.5,-82.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4469
@@ -140428,6 +141354,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -124.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 5039
@@ -140435,47 +141363,65 @@ entities:
     - type: Transform
       pos: -19.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6265
     components:
     - type: Transform
       pos: -125.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6306
     components:
     - type: Transform
       pos: -121.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6307
     components:
     - type: Transform
       pos: -121.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6308
     components:
     - type: Transform
       pos: -121.5,-15.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6310
     components:
     - type: Transform
       pos: -126.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7778
     components:
     - type: Transform
       pos: -20.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8901
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -101.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11616
     components:
     - type: Transform
       pos: -30.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11619
@@ -140483,6 +141429,8 @@ entities:
     - type: Transform
       pos: -28.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11620
@@ -140490,6 +141438,8 @@ entities:
     - type: Transform
       pos: -28.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11621
@@ -140497,6 +141447,8 @@ entities:
     - type: Transform
       pos: -30.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11622
@@ -140505,6 +141457,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11623
@@ -140513,6 +141467,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11624
@@ -140521,6 +141477,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 13038
@@ -140529,18 +141487,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -101.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13042
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -101.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14139
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -131.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 14140
@@ -140549,6 +141513,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -131.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 14141
@@ -140557,6 +141523,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -131.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 14142
@@ -140565,6 +141533,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -131.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 17815
@@ -140573,6 +141543,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 17819
@@ -140581,6 +141553,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 17820
@@ -140589,6 +141563,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 19528
@@ -140597,70 +141573,94 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -85.5,33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19529
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -85.5,34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19530
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -85.5,35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19531
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -83.5,30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19532
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -83.5,29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19533
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -83.5,28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19534
     components:
     - type: Transform
       pos: -85.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19535
     components:
     - type: Transform
       pos: -87.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22373
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22374
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22375
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25385
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -126.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25386
@@ -140669,6 +141669,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -126.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25387
@@ -140677,6 +141679,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -116.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25388
@@ -140685,6 +141689,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -116.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25389
@@ -140693,6 +141699,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -116.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25390
@@ -140701,6 +141709,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -114.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25391
@@ -140709,6 +141719,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -114.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25392
@@ -140717,6 +141729,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -114.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 25623
@@ -140725,24 +141739,32 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -66.5,-29.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25624
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25625
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,-31.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25626
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -66.5,-32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ShuttersWindow
   entities:
   - uid: 3976
@@ -140750,6 +141772,8 @@ entities:
     - type: Transform
       pos: -25.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ShuttersWindowOpen
   entities:
   - uid: 11617
@@ -140757,6 +141781,8 @@ entities:
     - type: Transform
       pos: -29.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11618
@@ -140764,6 +141790,8 @@ entities:
     - type: Transform
       pos: -29.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
 - proto: ShuttleConsoleCircuitboard
@@ -140780,6 +141808,8 @@ entities:
     - type: Transform
       pos: -42.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: SignAi
   entities:
   - uid: 21670
@@ -147823,18 +148853,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
 - proto: SuitStorageHOS
   entities:
   - uid: 6775
@@ -147886,18 +148906,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -147924,18 +148934,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -147962,18 +148962,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -148000,18 +148990,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -149971,6 +150951,11 @@ entities:
     - type: Transform
       pos: -60.35623,-4.475757
       parent: 2
+  - uid: 6481
+    components:
+    - type: Transform
+      pos: -36.23253,-30.543175
+      parent: 2
   - uid: 7290
     components:
     - type: Transform
@@ -149981,6 +150966,11 @@ entities:
     - type: Transform
       pos: -149.48795,-42.47385
       parent: 2
+  - uid: 7609
+    components:
+    - type: Transform
+      pos: -134.52573,-43.445347
+      parent: 2
 - proto: Table
   entities:
   - uid: 699
@@ -152609,131 +153599,183 @@ entities:
     - type: Transform
       pos: -55.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1474
     components:
     - type: Transform
       pos: -51.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2392
     components:
     - type: Transform
       pos: -124.5,-52.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3552
     components:
     - type: Transform
       pos: -55.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4059
     components:
     - type: Transform
       pos: -20.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4060
     components:
     - type: Transform
       pos: -20.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4061
     components:
     - type: Transform
       pos: -20.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4063
     components:
     - type: Transform
       pos: -20.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4375
     components:
     - type: Transform
       pos: -114.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4376
     components:
     - type: Transform
       pos: -114.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6707
     components:
     - type: Transform
       pos: -19.5,-28.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6842
     components:
     - type: Transform
       pos: -89.5,-32.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6967
     components:
     - type: Transform
       pos: -89.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9233
     components:
     - type: Transform
       pos: -43.5,-44.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9249
     components:
     - type: Transform
       pos: -43.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9257
     components:
     - type: Transform
       pos: -43.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9329
     components:
     - type: Transform
       pos: -22.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11000
     components:
     - type: Transform
       pos: -22.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11797
     components:
     - type: Transform
       pos: -27.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 13229
     components:
     - type: Transform
       pos: -19.5,-33.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16048
     components:
     - type: Transform
       pos: -87.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17298
     components:
     - type: Transform
       pos: -126.5,-52.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19403
     components:
     - type: Transform
       pos: -56.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26064
     components:
     - type: Transform
       pos: -120.5,23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26065
     components:
     - type: Transform
       pos: -118.5,23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26110
     components:
     - type: Transform
       pos: -27.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ToiletDirtyWater
   entities:
   - uid: 356
@@ -170306,18 +171348,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.8856695
-        - 7.0937095
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.8856695
+          Nitrogen: 7.0937095
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -171007,17 +172039,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -53.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2059
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2967
     components:
     - type: Transform
       pos: -49.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171031,6 +172069,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171044,6 +172084,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -50.5,-60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorHydroponicsLocked
   entities:
   - uid: 6138
@@ -171052,11 +172094,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -54.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -261472.55
+      secondsUntilStateChange: -262507.9
       state: Opening
     - type: Airlock
       autoClose: False
@@ -171066,18 +172110,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -56.5,-23.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23313
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -56.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23429
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -56.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorKitchenLocked
   entities:
   - uid: 6506
@@ -171085,6 +172135,8 @@ entities:
     - type: Transform
       pos: -54.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecure
   entities:
   - uid: 1715
@@ -171093,6 +172145,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171108,6 +172162,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -93.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171121,18 +172177,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -91.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9624
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -90.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26478
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -92.5,-24.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureAtmosphericsLocked
   entities:
   - uid: 2090
@@ -171141,12 +172203,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: -110.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5730
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -108.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureCargoLocked
   entities:
   - uid: 11109
@@ -171155,18 +172221,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -102.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25555
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -97.5,16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25849
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -100.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureChemistryLocked
   entities:
   - uid: 3922
@@ -171174,23 +172246,31 @@ entities:
     - type: Transform
       pos: -38.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3923
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -38.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22702
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -37.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23992
     components:
     - type: Transform
       pos: -37.5,-16.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureEngineeringLocked
   entities:
   - uid: 5724
@@ -171198,17 +172278,23 @@ entities:
     - type: Transform
       pos: -110.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5729
     components:
     - type: Transform
       pos: -108.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 25601
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -120.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureHeadOfPersonnelLocked
   entities:
   - uid: 2966
@@ -171217,6 +172303,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -49.5,-8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 2
     - type: DeviceLinkSource
@@ -171232,12 +172320,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 19617
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,-4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureMedicalLocked
   entities:
   - uid: 3975
@@ -171246,12 +172338,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -27.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24545
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-19.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecurePlasma
   entities:
   - uid: 21052
@@ -171259,6 +172355,8 @@ entities:
     - type: Transform
       pos: -38.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSource
       linkedPorts:
         21056:
@@ -171272,6 +172370,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -95.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureScienceLocked
   entities:
   - uid: 7302
@@ -171279,12 +172379,16 @@ entities:
     - type: Transform
       pos: -120.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7303
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -120.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureSecurityLocked
   entities:
   - uid: 24033
@@ -171293,6 +172397,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -27.5,6.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -171308,24 +172414,32 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,10.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20026
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -49.5,-54.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26077
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -50.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26078
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -49.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorServiceLocked
   entities:
   - uid: 14529
@@ -171334,12 +172448,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -96.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14531
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,2.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorTheatreLocked
   entities:
   - uid: 3372
@@ -171348,6 +172466,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -62.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: Window
   entities:
   - uid: 162
@@ -171355,226 +172475,316 @@ entities:
     - type: Transform
       pos: -34.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 169
     components:
     - type: Transform
       pos: -33.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 170
     components:
     - type: Transform
       pos: -32.5,-26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 292
     components:
     - type: Transform
       pos: -31.5,-30.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 497
     components:
     - type: Transform
       pos: -31.5,-49.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 809
     components:
     - type: Transform
       pos: -104.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1265
     components:
     - type: Transform
       pos: -24.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1272
     components:
     - type: Transform
       pos: -24.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1273
     components:
     - type: Transform
       pos: -24.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1279
     components:
     - type: Transform
       pos: -24.5,-34.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1286
     components:
     - type: Transform
       pos: -24.5,-39.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1288
     components:
     - type: Transform
       pos: -24.5,-40.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1409
     components:
     - type: Transform
       pos: -27.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1425
     components:
     - type: Transform
       pos: -27.5,-45.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1566
     components:
     - type: Transform
       pos: -31.5,-47.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1568
     components:
     - type: Transform
       pos: -27.5,-46.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1624
     components:
     - type: Transform
       pos: -27.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1631
     components:
     - type: Transform
       pos: -27.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1635
     components:
     - type: Transform
       pos: -27.5,-3.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1636
     components:
     - type: Transform
       pos: -27.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 4109
     components:
     - type: Transform
       pos: -27.5,-43.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 6960
     components:
     - type: Transform
       pos: -102.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9225
     components:
     - type: Transform
       pos: -31.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9297
     components:
     - type: Transform
       pos: -30.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11011
     components:
     - type: Transform
       pos: -28.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11017
     components:
     - type: Transform
       pos: -27.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11018
     components:
     - type: Transform
       pos: -29.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11024
     components:
     - type: Transform
       pos: -30.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11025
     components:
     - type: Transform
       pos: -29.5,18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11028
     components:
     - type: Transform
       pos: -28.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11029
     components:
     - type: Transform
       pos: -27.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11030
     components:
     - type: Transform
       pos: -31.5,13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11784
     components:
     - type: Transform
       pos: -105.5,-21.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14570
     components:
     - type: Transform
       pos: -64.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14595
     components:
     - type: Transform
       pos: -64.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15921
     components:
     - type: Transform
       pos: -105.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 17183
     components:
     - type: Transform
       pos: -61.5,-17.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 18600
     components:
     - type: Transform
       pos: -72.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20548
     components:
     - type: Transform
       pos: -101.5,-0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23215
     components:
     - type: Transform
       pos: -102.5,-36.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23418
     components:
     - type: Transform
       pos: -101.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23419
     components:
     - type: Transform
       pos: -99.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 23446
     components:
     - type: Transform
       pos: -100.5,-11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24342
     components:
     - type: Transform
       pos: -25.5,-27.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24343
     components:
     - type: Transform
       pos: -23.5,-27.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindowDirectional
   entities:
   - uid: 886
@@ -171583,132 +172793,178 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -48.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 887
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 893
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 894
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-71.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 1805
     components:
     - type: Transform
       pos: -50.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2361
     components:
     - type: Transform
       pos: -53.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2563
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7751
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9113
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9114
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-59.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9115
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-61.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14855
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15245
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-70.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 15622
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -51.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16396
     components:
     - type: Transform
       pos: -53.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16409
     components:
     - type: Transform
       pos: -52.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16412
     components:
     - type: Transform
       pos: -51.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16751
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16753
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -49.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16754
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16771
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -50.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 16772
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -52.5,-69.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 20804
     components:
     - type: Transform
       pos: -49.5,-74.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindowFrostedDirectional
   entities:
   - uid: 2847
@@ -171717,46 +172973,62 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -43.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3893
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -41.5,-38.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3902
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -41.5,-37.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5643
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,-1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14204
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,1.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 14205
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -96.5,0.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22301
     components:
     - type: Transform
       pos: -44.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 22302
     components:
     - type: Transform
       pos: -46.5,-50.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 2069
@@ -171765,318 +173037,432 @@ entities:
       rot: 3.141592653589793 rad
       pos: -109.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2086
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -111.5,-7.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2255
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2258
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2308
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -119.5,-55.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2830
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -64.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2831
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -63.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2832
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -62.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2833
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -60.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2834
     components:
     - type: Transform
       pos: -58.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2835
     components:
     - type: Transform
       pos: -59.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2836
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -58.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2837
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -60.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2838
     components:
     - type: Transform
       pos: -63.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2839
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -59.5,-12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2840
     components:
     - type: Transform
       pos: -64.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 2841
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -62.5,-9.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3015
     components:
     - type: Transform
       pos: -63.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3026
     components:
     - type: Transform
       pos: -61.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3027
     components:
     - type: Transform
       pos: -60.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3028
     components:
     - type: Transform
       pos: -59.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 3029
     components:
     - type: Transform
       pos: -62.5,5.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5727
     components:
     - type: Transform
       pos: -109.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 5728
     components:
     - type: Transform
       pos: -111.5,-13.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7298
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -121.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7299
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -119.5,-42.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7300
     components:
     - type: Transform
       pos: -119.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7301
     components:
     - type: Transform
       pos: -121.5,-48.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7530
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -121.5,-55.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7534
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -117.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7535
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -116.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7545
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -115.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7547
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -114.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7571
     components:
     - type: Transform
       pos: -114.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7580
     components:
     - type: Transform
       pos: -115.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7581
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -112.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7585
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -111.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7587
     components:
     - type: Transform
       pos: -116.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7588
     components:
     - type: Transform
       pos: -117.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7589
     components:
     - type: Transform
       pos: -111.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7590
     components:
     - type: Transform
       pos: -112.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7591
     components:
     - type: Transform
       pos: -118.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7592
     components:
     - type: Transform
       pos: -121.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7593
     components:
     - type: Transform
       pos: -113.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7594
     components:
     - type: Transform
       pos: -122.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7616
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -118.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7644
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -122.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7645
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -113.5,-58.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 7648
     components:
     - type: Transform
       pos: -119.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8153
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -101.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 8553
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -95.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 9515
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-18.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 11135
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -99.5,12.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24314
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-20.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 24644
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -19.5,11.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26076
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
   - uid: 26084
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -49.5,-56.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: Wirecutter
   entities:
   - uid: 8868
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 58400ac0fe..1e33a9d347 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -69413,113 +69413,6 @@ entities:
       parent: 31
     - type: WarpPoint
       location: library
-- proto: WarpPointBombing
-  entities:
-  - uid: 934
-    components:
-    - type: Transform
-      pos: -36.5,14.5
-      parent: 31
-    - type: WarpPoint
-      location: chapel
-  - uid: 2142
-    components:
-    - type: Transform
-      pos: 8.5,19.5
-      parent: 31
-    - type: WarpPoint
-      location: hop's office
-  - uid: 4910
-    components:
-    - type: Transform
-      pos: 9.5,-9.5
-      parent: 31
-    - type: WarpPoint
-      location: medbay
-  - uid: 7261
-    components:
-    - type: Transform
-      pos: 16.5,-0.5
-      parent: 31
-    - type: WarpPoint
-      location: chemistry
-  - uid: 7262
-    components:
-    - type: Transform
-      pos: 13.5,-15.5
-      parent: 31
-    - type: WarpPoint
-      location: morgue
-  - uid: 9712
-    components:
-    - type: Transform
-      pos: -12.5,19.5
-      parent: 31
-    - type: WarpPoint
-      location: armory
-  - uid: 10539
-    components:
-    - type: Transform
-      pos: -9.5,-20.5
-      parent: 31
-    - type: WarpPoint
-      location: science
-  - uid: 11267
-    components:
-    - type: Transform
-      pos: 8.5,25.5
-      parent: 31
-    - type: WarpPoint
-      location: captain's quarters
-  - uid: 11308
-    components:
-    - type: Transform
-      pos: 3.5,30.5
-      parent: 31
-    - type: WarpPoint
-      location: bridge
-  - uid: 11309
-    components:
-    - type: Transform
-      pos: -1.5,17.5
-      parent: 31
-    - type: WarpPoint
-      location: vault
-  - uid: 11310
-    components:
-    - type: Transform
-      pos: 8.5,9.5
-      parent: 31
-    - type: WarpPoint
-      location: eva room
-  - uid: 11311
-    components:
-    - type: Transform
-      pos: 58.5,2.5
-      parent: 31
-    - type: WarpPoint
-      location: particle accelerator
-  - uid: 11313
-    components:
-    - type: Transform
-      pos: 34.5,14.5
-      parent: 31
-    - type: WarpPoint
-      location: atmospherics
-  - uid: 11322
-    components:
-    - type: Transform
-      pos: 27.5,18.5
-      parent: 31
-    - type: WarpPoint
-      location: salvage
-  - uid: 11359
-    components:
-    - type: Transform
-      pos: 50.5,-5.5
-      parent: 31
-    - type: WarpPoint
-      location: telecomms
 - proto: WaterCooler
   entities:
   - uid: 1156
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index eab0ea0f78..d66f50de12 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -707,23 +707,32 @@
     liar-word-3: liar-word-replacement-3
     liar-word-4: liar-word-replacement-4
     liar-word-5: liar-word-replacement-5
+    liar-word-5-2: liar-word-replacement-5
     liar-word-6: liar-word-replacement-6
     liar-word-7: liar-word-replacement-7
+    liar-word-7-2: liar-word-replacement-7
+    liar-word-7-3: liar-word-replacement-7
     liar-word-8: liar-word-replacement-8
     liar-word-9: liar-word-replacement-9
     liar-word-10: liar-word-replacement-10
     liar-word-11: liar-word-replacement-11
-    liar-word-12: liar-word-replacement-12
+    # liar-word-12: liar-word-replacement-12 sure -> nah is too confusing.
     liar-word-13: liar-word-replacement-13
     liar-word-14: liar-word-replacement-14
+    liar-word-14-2: liar-word-replacement-14
     liar-word-15: liar-word-replacement-15
+    liar-word-15-2: liar-word-replacement-15
     liar-word-16: liar-word-replacement-16
+    liar-word-16-2: liar-word-replacement-16
     liar-word-17: liar-word-replacement-17
     liar-word-18: liar-word-replacement-18
+    liar-word-18-2: liar-word-replacement-18
     liar-word-19: liar-word-replacement-19
     liar-word-20: liar-word-replacement-20
+    liar-word-20-2: liar-word-replacement-20
     liar-word-21: liar-word-replacement-21
     liar-word-22: liar-word-replacement-22
+    liar-word-22-2: liar-word-replacement-22
     liar-word-23: liar-word-replacement-23
     liar-word-24: liar-word-replacement-24
     liar-word-25: liar-word-replacement-25
@@ -736,15 +745,12 @@
     liar-word-32: liar-word-replacement-32
     liar-word-33: liar-word-replacement-33
     liar-word-34: liar-word-replacement-34
-    liar-word-34-2: liar-word-replacement-34
     liar-word-35: liar-word-replacement-35
     liar-word-36: liar-word-replacement-36
     liar-word-37: liar-word-replacement-37
+    liar-word-37-2: liar-word-replacement-37
     liar-word-38: liar-word-replacement-38
     liar-word-39: liar-word-replacement-39
-    liar-word-40: liar-word-replacement-40
-    liar-word-41: liar-word-replacement-41
-    liar-word-42: liar-word-replacement-42
 
 - type: accent
   id: german
diff --git a/Resources/Prototypes/Actions/revenant.yml b/Resources/Prototypes/Actions/revenant.yml
index 5904908a75..3ac425a567 100644
--- a/Resources/Prototypes/Actions/revenant.yml
+++ b/Resources/Prototypes/Actions/revenant.yml
@@ -1,13 +1,8 @@
 - type: entity
-  parent: BaseAction
+  parent: ActionIntrinsicStore
   id: ActionRevenantShop
   name: Shop
   description: Opens the ability shop.
-  components:
-  - type: Action
-    icon: Interface/Actions/shop.png
-  - type: InstantAction
-    event: !type:RevenantShopActionEvent
 
 - type: entity
   parent: BaseAction
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 61babbfcea..752aeb13f8 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -466,3 +466,14 @@
     itemIconStyle: BigAction
   - type: InstantAction
     event: !type:ChameleonControllerOpenMenuEvent
+
+- type: entity
+  parent: BaseMentalAction
+  id: ActionIntrinsicStore
+  name: Store
+  description: Opens the store
+  components:
+  - type: Action
+    icon: Interface/Actions/shop.png
+  - type: InstantAction
+    event: !type:IntrinsicStoreActionEvent
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index dbf96068fa..4aa14a440d 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -4,7 +4,7 @@
   abstract: true
   components:
   - type: Organ
-  - type: Food
+  - type: Edible
   - type: Sprite
     sprite: Mobs/Species/Human/organs.rsi
   - type: StaticPrice
@@ -102,6 +102,11 @@
     solutions:
       stomach:
         maxVol: 30
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
   - type: Item
     size: Small
     heldPrefix: stomach
diff --git a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
index 6b64aa4c1d..3dd34f1bb6 100644
--- a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
@@ -14,3 +14,8 @@
     solutions:
       stomach:
         maxVol: 80
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
diff --git a/Resources/Prototypes/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
index f1a3d47e66..c3e1965c06 100644
--- a/Resources/Prototypes/Body/Organs/Animal/slimes.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
@@ -24,6 +24,11 @@
       solutions:
         stomach:
           maxVol: 30.0
+        food:
+          maxVol: 5
+          reagents:
+          - ReagentId: GreyMatter
+            Quantity: 5
 
 - type: entity
   id: OrganSlimesLungs
@@ -55,3 +60,8 @@
         Lung:
           maxVol: 100.0
           canReact: false
+        food:
+          maxVol: 5
+          reagents:
+          - ReagentId: Slime
+            Quantity: 5
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index b044706ecf..129c06a688 100644
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -6,7 +6,7 @@
   - type: Sprite
     sprite: Mobs/Species/Arachnid/organs.rsi
   - type: Organ
-  - type: Food
+  - type: Edible
   - type: Extractable
     grindableSolutionName: organ
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index bf865a07fd..cf8e2d0c0a 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -6,7 +6,7 @@
   - type: Sprite
     sprite: Mobs/Species/Diona/organs.rsi
   - type: Organ
-  - type: Food
+  - type: Edible
   - type: Extractable
     grindableSolutionName: organ
   - type: SolutionContainerManager
@@ -19,7 +19,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: UncookedAnimalProteins
+        - ReagentId: Cellulose
           Quantity: 5
   - type: FlavorProfile
     flavors:
@@ -78,7 +78,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: UncookedAnimalProteins
+        - ReagentId: Cellulose
           Quantity: 5
   - type: Stomach
   - type: Metabolizer
@@ -108,7 +108,7 @@
   - type: Item
     size: Small
     heldPrefix: lungs
-  - type: Lung 
+  - type: Lung
   - type: Metabolizer
     removeEmpty: true
     solutionOnBody: false
@@ -127,6 +127,11 @@
       Lung:
         maxVol: 100
         canReact: False
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Cellulose
+          Quantity: 5
 
 # Organs that turn into nymphs on removal
 - type: entity
@@ -137,7 +142,7 @@
   description: "The source of incredible, unending intelligence. Honk."
   components:
   - type: Brain
-  - type: Nymph # This will make the organs turn into a nymph when they're removed. 
+  - type: Nymph # This will make the organs turn into a nymph when they're removed.
     entityPrototype: OrganDionaNymphBrain
     transferMind: true
 
@@ -176,11 +181,11 @@
 
 - type: entity
   id: OrganDionaNymphStomach
-  parent: MobDionaNymphAccent 
+  parent: MobDionaNymphAccent
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Stomach
-  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
+  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it.
   components:
   - type: IsDeadIC
   - type: Body
@@ -192,7 +197,7 @@
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Lungs
-  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
+  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking.
   components:
   - type: IsDeadIC
   - type: Body
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index cb1492b8a6..4d7a077d4e 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -6,7 +6,7 @@
   - type: Sprite
     sprite: Mobs/Species/Human/organs.rsi
   - type: Organ
-  - type: Food
+  - type: Edible
   - type: Extractable
     grindableSolutionName: organ
   - type: SolutionContainerManager
@@ -74,7 +74,7 @@
   - type: Item
     size: Small
     heldPrefix: brain
-  
+
 - type: entity
   id: OrganHumanEyes
   parent: BaseHumanOrgan
diff --git a/Resources/Prototypes/Body/Organs/vox.yml b/Resources/Prototypes/Body/Organs/vox.yml
index 3dbb65c928..46583004b2 100644
--- a/Resources/Prototypes/Body/Organs/vox.yml
+++ b/Resources/Prototypes/Body/Organs/vox.yml
@@ -28,6 +28,8 @@
       tags:
       - Trash
     isSpecialDigestibleExclusive: false
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
 
 - type: entity
   parent: OrganHumanLiver
@@ -37,6 +39,8 @@
   components:
   - type: Metabolizer
     metabolizerTypes: [Vox]
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
 
 - type: entity
   parent: OrganHumanHeart
@@ -46,3 +50,49 @@
   components:
   - type: Metabolizer
     metabolizerTypes: [Vox]
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+
+- type: entity
+  parent: OrganHumanKidneys
+  id: OrganVoxKidneys
+  name: kidney
+  description: "Smells flammable."
+  components:
+  - type: Metabolizer
+    metabolizerTypes: [Vox]
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+
+- type: entity
+  id: OrganVoxEyes
+  parent: OrganHumanEyes
+  name: eyes
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
+
+- type: entity
+  id: OrganVoxTongueA
+  parent: OrganHumanTongue
+  name: tongue
+  description: "A fleshy muscle mostly used for screaming."
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+  - type: Item
+    size: Small
+
+- type: entity
+  id: OrganVoxTongueB
+  parent: OrganHumanTongue
+  name: tongue
+  description: "A fleshy muscle mostly used for screaming."
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+  - type: Item
+    size: Small
diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml
index 836d0f140a..331641f00b 100644
--- a/Resources/Prototypes/Body/Parts/base.yml
+++ b/Resources/Prototypes/Body/Parts/base.yml
@@ -40,9 +40,6 @@
     vital: true
   - type: Input
     context: "ghost"
-  - type: Tag
-    tags:
-      - Head
 
 - type: entity
   id: BaseLeftArm
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml b/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml
index cd3ab1fdd7..3a213e3cdf 100644
--- a/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml
+++ b/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml
@@ -10,7 +10,6 @@
       organs:
         lungs: OrganAnimalLungs
         stomach: OrganAnimalRuminantStomach
-        stomach2: OrganAnimalRuminantStomach
         liver: OrganAnimalLiver
         heart: OrganAnimalHeart
         kidneys: OrganAnimalKidneys
diff --git a/Resources/Prototypes/Body/Prototypes/arachnid.yml b/Resources/Prototypes/Body/Prototypes/arachnid.yml
index a3caa42a6e..e198f7934a 100644
--- a/Resources/Prototypes/Body/Prototypes/arachnid.yml
+++ b/Resources/Prototypes/Body/Prototypes/arachnid.yml
@@ -14,7 +14,7 @@
       part: TorsoArachnid
       organs:
         heart: OrganArachnidHeart
-        lungs: OrganAnimalLungs
+        lungs: OrganArachnidLungs
         stomach: OrganArachnidStomach
         liver: OrganArachnidLiver
         kidneys: OrganArachnidKidneys
diff --git a/Resources/Prototypes/Body/Prototypes/bot.yml b/Resources/Prototypes/Body/Prototypes/bot.yml
index 848db2a4fd..ae9bd4a77a 100644
--- a/Resources/Prototypes/Body/Prototypes/bot.yml
+++ b/Resources/Prototypes/Body/Prototypes/bot.yml
@@ -5,3 +5,19 @@
   slots:
     hand 1:
       part: LeftArmBorg
+
+# It's like a medibot or a cleanbot except it has two arms to hug :)
+- type: body
+  id: HugBot
+  name: "hugBot"
+  root: box
+  slots:
+    box:
+      part: TorsoBorg
+      connections:
+      - right_arm
+      - left_arm
+    right_arm:
+      part: RightArmBorg
+    left_arm:
+      part: LeftArmBorg
diff --git a/Resources/Prototypes/Body/Prototypes/vox.yml b/Resources/Prototypes/Body/Prototypes/vox.yml
index 75824521bd..0062149b96 100644
--- a/Resources/Prototypes/Body/Prototypes/vox.yml
+++ b/Resources/Prototypes/Body/Prototypes/vox.yml
@@ -9,7 +9,7 @@
       - torso
       organs:
         brain: OrganHumanBrain
-        eyes: OrganHumanEyes
+        eyes: OrganVoxEyes
     torso:
       part: TorsoVox
       connections:
@@ -22,7 +22,7 @@
         lungs: OrganVoxLungs
         stomach: OrganVoxStomach
         liver: OrganVoxLiver
-        kidneys: OrganHumanKidneys
+        kidneys: OrganVoxKidneys
     right arm:
       part: RightArmVox
       connections:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index 850b69294e..8bd6b2ed16 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -65,7 +65,7 @@
   id: CrateHydroponicsSeeds
   parent: CrateHydroponics
   name: seeds crate
-  description: Big things have small beginnings. Contains twelve different seeds.
+  description: Big things have small beginnings. Contains twenty-four different seeds.
   components:
   - type: StorageFill
     contents:
@@ -92,6 +92,7 @@
       - id: WatermelonSeeds
       - id: PeaSeeds
       - id: CherrySeeds
+      - id: CottonSeeds
 
 - type: entity
   id: CrateHydroponicsTray
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
index ad65b43684..aab4671a3b 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -319,6 +319,9 @@
     - id: PlushieArachind
       prob: 0.01
       orGroup: Plushies
+    - id: PlushieLizardJobMultiweh # the exceedingly rare multiweh!
+      prob: 0.01
+      orGroup: Plushies
     - id: PlushieThrongler #hehe
       prob: 0.0005
       orGroup: Plushies
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
index 02e1e28810..31b47e7664 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
@@ -25,7 +25,7 @@
 
 - type: entity
   id: CrateFoodCooking
-  parent: CratePlastic
+  parent: CrateFreezer
   name: kitchen supplies crate
   description: Extra kitchen supplies, in case the botanists are absent.
   components:
@@ -79,7 +79,7 @@
 
 - type: entity
   id: CrateFoodBarSupply
-  parent: CratePlastic
+  parent: CrateFreezer
   name: bartending supplies crate
   description: Extra Bar supplies, in case the clown was allowed in the bar unsupervised.
   components:
@@ -106,7 +106,7 @@
 
 - type: entity
   id: CrateFoodSoftdrinks
-  parent: CratePlastic
+  parent: CrateFreezer
   name: softdrinks crate
   description: A variety of sodas to complement a small party, without having to empty the soda machines. Includes 14 sodas.
   components:
@@ -129,7 +129,7 @@
 
 - type: entity
   id: CrateFoodGetMore
-  parent: CratePlastic
+  parent: CrateFreezer
   name: Getmore Bakemore crate
   description: Getmore branded snacks and baking supplies for the creative chef, all without the need of emptying your station's Getmore machines!
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 893d62b310..f4cc539038 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -116,6 +116,8 @@
         - id: PlushieSpaceLizard
           amount: !type:ConstantNumberSelector
             value: 3
+        - id: PlushieLizardJobMultiweh # the exceedingly rare multiweh!
+          prob: 0.01
 
 - type: entity
   id: CrateFunSharkPlushieBulk
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 46299ef6b9..c80944a9c3 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -217,7 +217,7 @@
 
 - type: entity
   id: CrateServiceSodaDispenser
-  parent: CrateGenericSteel
+  parent: CrateFreezer
   name: soda dispenser refill crate
   description: Contains refills for soda dispensers.
   components:
@@ -244,7 +244,7 @@
 
 - type: entity
   id: CrateServiceBoozeDispenser
-  parent: CrateGenericSteel
+  parent: CrateFreezer
   name: booze dispenser refill crate
   description: Contains refills for booze dispensers.
   components:
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 415109a845..e989092747 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -326,11 +326,13 @@
     - id: ClothingMaskNeckGaiter
     - id: ClothingOuterCoatHoSTrench
     - id: ClothingShoesBootsJack
+    - id: FlashlightSeclite
     - id: DoorRemoteSecurity
     - id: HoloprojectorSecurity
     - id: RubberStampHos
     - id: BoxHoSCircuitboards
     - id: WeaponDisabler
+    - id: WeaponTaser
     - id: WantedListCartridge
     - id: DrinkHosFlask
     # Corvax-Start
@@ -376,17 +378,24 @@
         - !type:NestedSelector
           tableId: FillHeadOfSecurityHardsuit
 
-- type: entity
-  id: LockerFreezerVaultFilled
-  suffix: Vault, Locked
-  parent: LockerFreezerBase
-  components:
-  - type: AccessReader
-    access: [ [ "Command" ] ]
-  - type: StorageFill
-    contents:
+- type: entityTable
+  id: LockerFillVault
+  table: !type:AllSelector
+    children:
     - id: WeaponRevolverDeckard
     - id: JetpackBlue
     - id: SpaceCash1000
     - id: BeachBall
     - id: BikeHorn
+
+- type: entity
+  id: LockerFreezerVaultFilled
+  suffix: Vault, Filled
+  parent: LockerFreezerBase
+  components:
+  - type: AccessReader
+    access: [ [ "Command" ] ]
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: LockerFillVault
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index d79808f6cd..18c0d00712 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -203,3 +203,83 @@
     containers:
       entity_storage: !type:NestedSelector
         tableId: MaintenanceLockerLoot
+
+# Intended to very occasionally be useful for prisoners, so mostly functional items instead of fluff
+
+- type: entityTable
+  id: ToiletCisternCommonToolsTable
+  table: !type:GroupSelector
+    children:
+    - id: Screwdriver
+    - id: Wrench
+    - id: Wirecutter
+    - id: Welder
+    - id: ClothingMaskGas
+    - id: PowerCellSmall
+    - id: RadioHandheld
+    - id: Syringe
+    - id: CableApcStack
+    - id: Lighter
+
+- type: entityTable
+  id: ToiletCisternRareToolsTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHandsGlovesColorYellow
+    - id: DrinkSpaceLube
+    - id: WelderIndustrial
+    - id: ClothingHeadHatWeldingMaskFlame
+    - id: PowerCellMedium
+    - id: DoubleEmergencyOxygenTankFilled
+    - id: DoubleEmergencyNitrogenTankFilled
+
+- type: entityTable
+  id: ToiletCisternUtilityTable
+  table: !type:GroupSelector
+    children:
+    - id: Brutepack
+    - id: Ointment
+    - id: Gauze
+    - id: ChemistryBottleUnstableMutagen
+
+- type: entityTable
+  id: ToiletCisternWeaponsTable
+  table: !type:GroupSelector
+    children:
+    - id: SurvivalKnife
+    - id: ScalpelShiv
+    - id: Shiv
+    - id: SawImprov
+    - id: HydroponicsToolHatchet
+    - id: ClothingHandsKnuckleDusters
+    - id: WeaponFlareGun
+
+- type: entityTable
+  id: ToiletCisternSyndicateTable
+  table: !type:GroupSelector
+    children:
+    - id: CyberPen
+    - id: CigPackSyndicate
+    - id: SoapSyndie
+    - id: SyndicatePersonalAI
+    - id: UplinkLighterBox
+
+- type: entityTable
+  id: ToiletCisternLoot
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      weight: 25
+      tableId: ToiletCisternCommonToolsTable
+    - !type:NestedSelector
+      weight: 8
+      tableId: ToiletCisternRareToolsTable
+    - !type:NestedSelector
+      weight: 5
+      tableId: ToiletCisternUtilityTable
+    - !type:NestedSelector
+      weight: 3
+      tableId: ToiletCisternWeaponsTable
+    - !type:NestedSelector
+      weight: 1
+      tableId: ToiletCisternSyndicateTable
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 4c48404414..5ae5553622 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -28,6 +28,7 @@
     children:
     - id: FlashlightSeclite
     - id: WeaponDisabler
+    - id: WeaponTaser
     - id: ClothingBeltSecurityFilled
     - id: Flash
     - id: ClothingEyesGlassesSecurity
@@ -48,7 +49,6 @@
       amount: 2
     - id: NetworkConfigurator
     - id: Binoculars
-    - id: WeaponEnergyShotgun
 
 - type: entityTable
   id: FillLockerWardenHarduit
@@ -75,6 +75,7 @@
     - id: FlashlightSeclite
       prob: 0.8
     - id: WeaponDisabler
+    - id: WeaponTaser
     - id: ClothingUniformJumpsuitSecGrey
       prob: 0.3
     - id: ClothingHeadHelmetBasic
@@ -110,6 +111,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingEyesGlassesSecurity
+    - id: WeaponTaser
     - id: WeaponDisabler
     - id: TrackingImplanter
       amount: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index b00fff1cb4..7e7bb37162 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -62,6 +62,7 @@
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1
     ClothingOuterDogi: 1
+    ClothingOuterSuitCarp: 1
     ClothingMaskBlushingClown: 1
     ClothingMaskBlushingMime: 1
     ClothingHeadHatCowboyBountyHunter: 1
diff --git a/Resources/Prototypes/Catalog/hugbot.yml b/Resources/Prototypes/Catalog/hugbot.yml
new file mode 100644
index 0000000000..469bb1196d
--- /dev/null
+++ b/Resources/Prototypes/Catalog/hugbot.yml
@@ -0,0 +1,17 @@
+- type: localizedDataset
+  id: HugBotStarts
+  values:
+    prefix: hugbot-start-hug-
+    count: 8
+
+- type: localizedDataset
+  id: HugBotFinishes
+  values:
+    prefix: hugbot-finish-hug-
+    count: 8
+
+- type: localizedDataset
+  id: EmaggedHugBotFinishes
+  values:
+    prefix: hugbot-emagged-finish-hug-
+    count: 8
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index e30db19dfc..571c167ee5 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -774,7 +774,16 @@
           - SurplusBundle
 
 # Deception
-
+- type: listing
+  id: UplinkSyndicateIDCard
+  name: uplink-syndicate-id-card-name
+  description: uplink-syndicate-id-card-desc
+  productEntity: SyndicateIDCard
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkDeception
+  
 - type: listing
   id: UplinkAgentIDCard
   name: uplink-agent-id-card-name
diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml
index 95e072d889..53ba40da64 100644
--- a/Resources/Prototypes/Datasets/figurines.yml
+++ b/Resources/Prototypes/Datasets/figurines.yml
@@ -261,3 +261,27 @@
   values:
     prefix: figurines-hamlet-
     count: 8
+
+- type: localizedDataset
+  id: FigurinesThief
+  values:
+    prefix: figurines-thief-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesSkeleton
+  values:
+    prefix: figurines-skeleton-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesOwlman
+  values:
+    prefix: figurines-owlman-
+    count: 5
+
+- type: localizedDataset
+  id: FigurinesGriffin
+  values:
+    prefix: figurines-griffin-
+    count: 5
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
index f2c76cce99..8b3154b4ab 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -303,3 +303,14 @@
       sprite: Clothing/Ears/Headsets/wizard.rsi
     - type: Clothing
       sprite: Clothing/Ears/Headsets/wizard.rsi
+
+- type: entity
+  parent: [ClothingHeadset, BaseMajorContraband]
+  id: ClothingHeadsetNinja
+  name: green headset
+  description: Who could refuse to wear this stylish black and green headset?
+  components:
+  - type: Sprite
+    sprite: Clothing/Ears/Headsets/ninja.rsi
+  - type: Clothing
+    sprite: Clothing/Ears/Headsets/ninja.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 5ecabc41eb..ffff779f72 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -110,7 +110,7 @@
   - type: Clothing
     sprite: Clothing/Eyes/Hud/friedonion.rsi
   - type: ShowHungerIcons
-  - type: Food
+  - type: Edible
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
index 98a2a14989..fb2a400e0b 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -306,10 +306,8 @@
     inhandVisuals:
       left:
       - state: inhand-left
-        color: "#535353"
       right:
       - state: inhand-right
-        color: "#535353"
   - type: Clothing
     sprite: Clothing/Hands/Gloves/Color/black.rsi
   - type: Butcherable
diff --git a/Resources/Prototypes/Entities/Clothing/Head/specific.yml b/Resources/Prototypes/Entities/Clothing/Head/specific.yml
index 4539e2fdf3..4528d8cabd 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/specific.yml
@@ -24,7 +24,7 @@
   - type: Tag
     tags: [] # ignore "WhitelistChameleon" tag
   - type: TriggerOnVoice
-    keyPhrase: "go go gadget"
+    defaultKeyPhrase: key-phrase-gadget
     listenRange: 0
   - type: ActiveListener
     range: 0
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
index 10c2a0f3e6..c5e4cca8ce 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -174,7 +174,7 @@
   parent: ClothingNeckBase
   id: ClothingNeckCloakMoth
   name: moth cloak
-  description: A cloak in the form of moth wings is an unusual and original element of the wardrobe that can attract the attention of others. It is made of a thin fabric imitating moth wings, with soft and fluffy edges. The raincoat is fastened around the neck with Velcro, and has a hood in the shape of a moths head.
+  description: A cloak in the form of moth wings is an unusual and original element of the wardrobe that can attract the attention of others. It is made of a thin fabric imitating moth wings, with soft and fluffy edges. The raincoat is fastened around the neck with straps, and has a hood in the shape of a moths head.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/moth.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
index da9a7f8b1a..f02feff158 100644
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -34,7 +34,7 @@
   components:
   - type: AllowSuitStorage
     whitelist:
-      tags:
+      components:
       - GasTank
 
 # for clothing that has a single item slot to insert and alt click out.
diff --git a/Resources/Prototypes/Entities/Debugging/stress_test.yml b/Resources/Prototypes/Entities/Debugging/stress_test.yml
deleted file mode 100644
index 72651cdaee..0000000000
--- a/Resources/Prototypes/Entities/Debugging/stress_test.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: entity
-  id: StressTest
-  name: stress test
-  suffix: DEBUG
-  components:
-  - type: Tag
-    tags:
-      - Debug
-  - type: Sprite
-    sprite: Effects/explosion.rsi
-    state: explosion
-  - type: StressTestMovement
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 95dcec4280..338c3b1f98 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -111,7 +111,7 @@
         - id: ClothingNeckCloakGay
         - id: ClothingNeckCloakEnby
         - id: ClothingNeckCloakPan
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
       - id: Basketball
       - id: Football
       - id: TennisBall
@@ -341,6 +341,7 @@
       weight: 95
       children:
       - id: Machete
+      - id: Claymore
       - id: BaseBallBat
       - id: CombatKnife
       - id: Spear
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
index c39ecff9c1..1abc6a79c3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
@@ -161,4 +161,5 @@
       - PosterLegitOppenhopper
       - PosterLegitTyrone
       - PosterLegitHelio
+      - PosterLegitBotanyFear
     chance: 1
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index f77712839c..96c00683d4 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -52,14 +52,14 @@
         - ToyAi
         - ToyNuke
         - ToyFigurinePassenger
-        - ToyGriffin
+        - ToyFigurineGriffin
         - ToyHonk
         - ToyIan
         - ToyMarauder
         - ToyMauler
         - ToyGygax
         - ToyOdysseus
-        - ToyOwlman
+        - ToyFigurineOwlman
         - ToyDeathRipley
         - ToyPhazon
         - ToyFireRipley
@@ -67,7 +67,7 @@
         - ToyRipley
         - ToySeraph
         - ToyDurand
-        - ToySkeleton
+        - ToyFigurineSkeleton
         - MysteryFigureBox
       chance: 0.5
       offset: 0.2
@@ -124,9 +124,9 @@
       - ToyFigurineSlime
       - ToyFigurineGreytider
       - ToyFigurineWizard
-      - ToyGriffin
-      - ToyOwlman
-      - ToySkeleton
+      - ToyFigurineGriffin
+      - ToyFigurineOwlman
+      - ToyFigurineSkeleton
       - ToyFigurineQueen
       - ToyFigurineSpaceDragon
       - ToyFigurineRatKing
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/rooms.yml b/Resources/Prototypes/Entities/Markers/Spawners/rooms.yml
new file mode 100644
index 0000000000..34d3287e03
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/rooms.yml
@@ -0,0 +1,36 @@
+# Weapons
+- type: entity
+  parent: MarkerBase
+  id: SpawnPointHeadOfSecurityWeapon
+  name: head of security weapon spawner
+  components:
+  - type: EntityTableSpawner
+    offset: 0.2
+    table: !type:AllSelector
+      children:
+      - id: WeaponSubMachineGunWt550
+      - id: MagazinePistolSubMachineGunTopMounted
+      - id: MagazinePistolSubMachineGunTopMounted
+  - type: Sprite
+    sprite: Markers/jobs.rsi
+    layers:
+    - state: green
+    - sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
+      state: icon
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnPointWardenWeapon
+  name: warden weapon spawner
+  components:
+  - type: EntityTableSpawner
+    offset: 0.2
+    table: !type:AllSelector
+      children:
+      - id: WeaponEnergyShotgun
+  - type: Sprite
+    sprite: Markers/jobs.rsi
+    layers:
+    - state: green
+    - sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi
+      state: icon
diff --git a/Resources/Prototypes/Entities/Markers/warp_point.yml b/Resources/Prototypes/Entities/Markers/warp_point.yml
index 675938c09b..4616d1535a 100644
--- a/Resources/Prototypes/Entities/Markers/warp_point.yml
+++ b/Resources/Prototypes/Entities/Markers/warp_point.yml
@@ -31,24 +31,3 @@
       - GhostOnlyWarp
   - type: Sprite
     state: pink
-
-- type: entity
-  parent: WarpPoint
-  id: WarpPointBombing
-  name: warp point
-  suffix: ninja bombing target
-  components:
-  - type: BombingTarget
-  - type: Tag
-    tags:
-    - GhostOnlyWarp
-  - type: WarpPoint
-    location: bombing target
-    blacklist:
-      tags:
-      - GhostOnlyWarp
-  - type: Sprite
-    layers:
-    - state: pink
-    - sprite: Objects/Weapons/Bombs/spidercharge.rsi
-      state: icon
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index fb6f8d4fed..a7748c4566 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1405,3 +1405,10 @@
   sprites:
   - sprite: Mobs/Customization/human_hair.rsi
     state: longwithbangs
+- type: marking
+  id: HumanHairOverEyePigtail
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+  - sprite: Mobs/Customization/human_hair.rsi
+    state: overeyepigtail
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c812140812..8b79eaeb5a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -390,7 +390,7 @@
   - type: Bloodstream
     bloodReagent: InsectBlood
     bloodMaxVolume: 20
-  - type: Food
+  - type: Edible
   - type: FlavorProfile
     flavors:
     - horrible
@@ -1332,6 +1332,7 @@
   abstract: true
   components:
   - type: CombatMode
+    canDisarm: true
   - type: Inventory
     templateId: monkey
     speciesId: monkey
@@ -1438,7 +1439,7 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
   - type: Crawler
 
 
@@ -1790,7 +1791,7 @@
         Base: dead-0
       Dead:
         Base: splat-0
-  - type: Food
+  - type: Edible
   - type: FlavorProfile
     flavors:
     - meaty
@@ -2346,7 +2347,7 @@
   - type: MobMover
   - type: HTN
     rootTask:
-      task: SimpleHostileCompound
+      task: GrenadePenguinCompound
   - type: NpcFactionMember
     factions:
     - Syndicate
@@ -2394,9 +2395,9 @@
     beepInterval: 1
   - type: Explosive
     explosionType: Default
-    maxIntensity: 20
-    intensitySlope: 20
-    totalIntensity: 225
+    maxIntensity: 10
+    intensitySlope: 3
+    totalIntensity: 150
   - type: ExplodeOnTrigger
     keysIn:
     - timer
@@ -3454,7 +3455,7 @@
         Base: dead-0
       Dead:
         Base: splat-0
-  - type: Food
+  - type: Edible
   - type: FlavorProfile
     flavors:
     - meaty
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 864d03cd2a..95392e9a28 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -181,7 +181,11 @@
     - type: HTN
       rootTask:
         task: DragonCarpCompound
-
+    - type: Flammable
+      damage:
+       types: {}
+    - type: Temperature
+      heatDamageThreshold: 1200
 - type: entity
   id: MobCarpDungeon
   parent: MobCarp
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index eba25717f3..eef5f48838 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -1,38 +1,17 @@
 - type: entity
   abstract: true
+  parent: [BaseMob, MobCombat]
   id: MobElementalBase
   components:
-  - type: LagCompensation
   - type: Reactive
     groups:
       Acidic: [Touch]
-  - type: Clickable
   - type: Damageable
     damageContainer: Inorganic
-  - type: InteractionOutline
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 50
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
   - type: MovementSpeedModifier
     baseWalkSpeed : 2
     baseSprintSpeed : 3
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
-  - type: NpcFactionMember
-    factions:
-    - SimpleNeutral
   - type: MovedByPressure
-  - type: Physics
-    bodyType: KinematicController # Same for all inheritors
   - type: StatusEffects
     allowed:
     - Electrocution
@@ -58,12 +37,9 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Input
-    context: "human"
-  - type: InputMover
-  - type: MobMover
   - type: ZombieImmune
   - type: ProtectedFromStepTriggers
+  - type: StunVisuals
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index e5f900b209..dd3fd5d430 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -104,36 +104,36 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           groups:
-            Brute: -0.25
+            Brute: -0.15
     - reagents: [ Blood ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           groups:
-            Brute: -0.5
-            Burn: -0.5
+            Brute: -0.25
+            Burn: -0.25
     - reagents: [ RobustHarvest ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           groups:
-            Brute: -2
-            Burn: -2
+            Brute: -1
+            Burn: -1
     - reagents: [ WeedKiller, PlantBGone ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Heat: 2
+            Heat: 1
   - type: ReplacementAccent
     accent: tomatoKiller
   - type: Item
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 7226087548..c090ab78e7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -68,6 +68,9 @@
         type: StoreBoundUserInterface
   - type: Visibility
     layer: 2 #ghost vis layer
+  - type: ActionGrant
+    actions:
+    - ActionRevenantShop
   - type: Store
     categories:
     - RevenantAbilities
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
index 3c19010635..8f84e1496a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
@@ -138,7 +138,7 @@
           state: hand
 
   - type: InventorySlots
-  - type: Food
+  - type: Edible # Why? I'm not sure but I also am afraid of the answer.
   - type: Hunger
     baseDecayRate: 0.05 # They get a lil' hungy
   - type: BodyEmotes # Grants them clapping and so on.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index fd700d7a4c..a538243192 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -460,3 +460,40 @@
     - Supply
   - type: Puller
     needsHands: false
+
+- type: entity
+  parent: [ MobSiliconBase, MobCombat ]
+  id: MobHugBot
+  name: hugbot
+  description: Awww, who needs a hug?
+  components:
+  - type: Sprite
+    sprite: Mobs/Silicon/Bots/hugbot.rsi
+    state: hugbot
+  - type: Construction
+    graph: HugBot
+    node: bot
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2
+    baseSprintSpeed: 3
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Weapons/boxingpunch1.ogg
+    angle: 30
+    animation: WeaponArcPunch
+    damage:
+      types:
+        Blunt: 2
+  - type: Anchorable
+  - type: Hands # This probably REALLY needs hand whitelisting, but we NEED hands for hugs, so...
+  - type: ComplexInteraction # Hugging is a complex interaction, apparently.
+  - type: HugBot
+  - type: Body
+    prototype: HugBot
+  - type: HTN
+    rootTask:
+      task: HugBotCompound
+  - type: InteractionPopup
+    interactSuccessString: hugging-success-generic
+    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
+    messagePerceivedByOthers: hugging-success-generic-others
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 55a3893972..7df2096073 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -74,15 +74,15 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
     - reagents: [ Water ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Heat: 0.15
+            Heat: 0.05 #Same as slime species
       - !type:PopupMessage
         type: Local
         messages: [ "slime-hurt-by-water-popup" ]
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 039cac3358..69a1b93245 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -454,7 +454,7 @@
         Base: dead
       Dead:
         Base: dead
-  - type: Food
+  - type: Edible
   - type: Thirst
     startingThirst: 25  # spawn with Okay thirst state
     thresholds:
@@ -512,7 +512,7 @@
       methods: [Touch, Ingestion, Injection]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
             Caustic: 1
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 441751a80b..f4e6f1d39c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -106,7 +106,7 @@
     - RadiationProtection
     - Adrenaline
   - type: Temperature
-    heatDamageThreshold: 800
+    heatDamageThreshold: 2400
   - type: Metabolizer
     solutionOnBody: false
     updateInterval: 0.25
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index 92d118cb26..0624e9670a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -33,13 +33,13 @@
     - reagents: [Water]
       methods: [Touch]
       effects:
-      - !type:WearableReaction
+      - !type:SpawnEntityInInventory
         slot: head
-        prototypeID: WaterDropletHat
+        entity: WaterDropletHat
     - reagents: [Water, SpaceCleaner]
       methods: [Touch]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
   # Damage (Self)
   - type: Bloodstream
     bloodReagent: CopperBlood
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index d4fecee2ca..f33cee8b20 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -118,7 +118,7 @@
     - reagents: [Water, SpaceCleaner]
       methods: [Touch]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
   - type: StatusEffects
     allowed:
     - Electrocution
@@ -176,6 +176,9 @@
     factions:
     - NanoTrasen
   - type: CreamPied
+  - type: ParcelWrapOverride
+    parcelPrototype: WrappedParcelHumanoid
+    wrapDelay: 5
   - type: Stripping
   - type: UserInterface
     interfaces:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index b1778442b2..09c1a265bc 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -43,17 +43,17 @@
     - reagents: [Water, SpaceCleaner]
       methods: [Touch]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
     - reagents: [ PlantBGone ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Blunt: 0.1
-            Slash: 0.1
-            Piercing: 0.15
+            Blunt: 0.05
+            Slash: 0.05
+            Piercing: 0.075
       - !type:PopupMessage
         type: Local
         visualType: Large
@@ -63,10 +63,10 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Poison: 0.25
+            Poison: 0.125
       - !type:PopupMessage
         type: Local
         visualType: Large
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index 5dc127878f..ca6301b0a4 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -73,7 +73,7 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
     - reagents: [ Milk, MilkGoat, MilkSoy, MilkSpoiled ]
       # add new types of milk to reagents as they appear, oat milk isn't on the list
       # because turns out oat milk has 1/30th the amount of calcium in it compared to the rest
@@ -81,11 +81,11 @@
       methods: [ Touch ]
       effects: # TODO: when magic is around - make a milk transformation to a skeleton monster
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           groups:
-            Burn: -2 # healing obviously up to discussion
-            Brute: -1.5 # these groups are the only 2 possible ways to damage a skeleton
+            Burn: -1 # healing obviously up to discussion
+            Brute: -0.75 # these groups are the only 2 possible ways to damage a skeleton
       - !type:PopupMessage
         type: Local
         visualType: Large
@@ -102,6 +102,7 @@
   - type: FireVisuals
     alternateState: Standing
   - type: FlashImmunity
+    showInExamine: false
   - type: Inventory
     femaleDisplacements:
       jumpsuit:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 56acf52fb7..9526b490e3 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -82,15 +82,15 @@
     - reagents: [ Water, SpaceCleaner ]
       methods: [ Touch ]
       effects:
-      - !type:WashCreamPieReaction
+      - !type:WashCreamPie
     - reagents: [ Water ]
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         damage:
           types:
-            Heat: 0.1
+            Heat: 0.05
       - !type:PopupMessage
         type: Local
         visualType: Large
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 44687ac544..d6ff814970 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -15,6 +15,7 @@
   - type: Speech
     speechVerb: Vox
     speechSounds: Vox
+    allowedEmotes: ['Click', 'Chitter']
   - type: TypingIndicator
     proto: vox
   - type: Vocal
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 820814a468..9f6d57083d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -48,7 +48,7 @@
   - type: FlavorProfile
     flavors:
       - sweet
-  - type: Food
+  - type: Edible
   - type: SolutionContainerManager
     solutions:
       food:
@@ -1147,7 +1147,7 @@
           Quantity: 80
         - ReagentId: Sugar
           Quantity: 30
-  - type: Food
+  - type: Edible
     transferAmount: 12
   - type: Item
     size: Normal
@@ -1174,7 +1174,7 @@
           Quantity: 10
         - ReagentId: Sugar
           Quantity: 5
-  - type: Food
+  - type: Edible
     transferAmount: 3
   - type: PointLight
     color: "#FFFF00"
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
index 819256443f..05bbf930ab 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -5,7 +5,7 @@
   id: FoodDonkpocketBase
   abstract: true
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
   - type: SolutionContainerManager
@@ -409,7 +409,7 @@
           Quantity: 5
   - type: Sprite
     state: moth
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 0e8f0ce56d..4b5238fe34 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -1,4 +1,4 @@
-# Donut
+# Donut
 
 # There is a newer, better version of the donutbox from tgstation included in the
 # donut.rsi. The reason it isn't implemented is it requires a StackVisuals offsetting
@@ -204,6 +204,7 @@
   parent: BoxCardboard
   id: FoodBoxPizza
   name: pizza box
+  description: A box for pizza. It keeps in the heat, the smell, and the memories of the best five minutes of your life.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/pizza.rsi
@@ -237,16 +238,10 @@
     price: 0
 
 - type: entity
-  name: pizza box
   parent: FoodBoxPizza
   id: FoodBoxPizzaFilled
   suffix: Filled
   components:
-  - type: Sprite
-    layers:
-    - state: box
-    - state: box-open
-      map: ["enum.StorageVisualLayers.Door"]
   - type: StorageFill
     contents:
     - id: FoodPizzaArnold
@@ -285,8 +280,7 @@
     - id: KnifePlastic
 
 - type: entity
-  name: pizza box
-  parent: FoodBoxPizzaFilled
+  parent: FoodBoxPizza
   id: FoodBoxPizzaCotton
   suffix: Cotton Pizza
   components:
@@ -392,8 +386,6 @@
   components:
   - type: Sprite
     state: spicy-box
-  - type: Item
-    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
   - type: StorageFill
     contents:
     - id: FoodDonkpocketSpicy
@@ -406,8 +398,6 @@
   components:
   - type: Sprite
     state: teriyaki-box
-  - type: Item
-    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
   - type: StorageFill
     contents:
     - id: FoodDonkpocketTeriyaki
@@ -420,8 +410,6 @@
   components:
   - type: Sprite
     state: pizza-box
-  - type: Item
-    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
   - type: StorageFill
     contents:
     - id: FoodDonkpocketPizza
@@ -434,8 +422,6 @@
   components:
   - type: Sprite
     state: stonk-box
-  - type: Item
-    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
   - type: StorageFill
     contents:
     - id: FoodDonkpocketStonk
@@ -460,8 +446,6 @@
   components:
   - type: Sprite
     state: berry-box
-  - type: Item
-    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
   - type: StorageFill
     contents:
     - id: FoodDonkpocketBerry
@@ -474,8 +458,6 @@
   components:
   - type: Sprite
     state: banana-box
-  - type: Item
-    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
   - type: StorageFill
     contents:
     - id: FoodDonkpocketHonk
@@ -489,8 +471,6 @@
   components:
   - type: Sprite
     state: dink-box
-  - type: Item
-    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
   - type: StorageFill
     contents:
     - id: FoodDonkpocketDink
@@ -503,8 +483,6 @@
   components:
   - type: Sprite
     state: moth-box
-  - type: Item
-    sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
   - type: StorageFill
     contents:
     - id: FoodDonkpocketMoth
@@ -520,8 +498,6 @@
   - type: Sprite
     sprite: Objects/Storage/Happyhonk/clown.rsi
     state: box
-    layers:
-    - state: box
   - type: Item
     sprite: Objects/Storage/Happyhonk/clown.rsi
     heldPrefix: box
@@ -544,7 +520,7 @@
         orGroup: GiftPool
       - id: ToyFigurinePassenger
         orGroup: GiftPool
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         orGroup: GiftPool
       - id: ToyHonk
         orGroup: GiftPool
@@ -558,7 +534,7 @@
         orGroup: GiftPool
       - id: ToyOdysseus
         orGroup: GiftPool
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         orGroup: GiftPool
       - id: ToyDeathRipley
         orGroup: GiftPool
@@ -574,7 +550,7 @@
         orGroup: GiftPool
       - id: ToyDurand
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: FoamBlade
         orGroup: GiftPool
@@ -609,10 +585,8 @@
     - MimeHappyHonk
   - type: Sprite
     sprite: Objects/Storage/Happyhonk/mime.rsi
-    state: box
   - type: Item
     sprite: Objects/Storage/Happyhonk/mime.rsi
-    heldPrefix: box
 
 - type: entity
   id: HappyHonkNukie
@@ -623,10 +597,8 @@
   components:
   - type: Sprite
     sprite: Objects/Storage/Happyhonk/nukie.rsi
-    state: box
   - type: Item
     sprite: Objects/Storage/Happyhonk/nukie.rsi
-    heldPrefix: box
   - type: StorageFill
     contents:
       - id: C4
@@ -709,10 +681,8 @@
     - BoxCardboard
   - type: Sprite
     sprite: Objects/Storage/Happyhonk/cluwne.rsi
-    state: box
   - type: Item
     sprite: Objects/Storage/Happyhonk/cluwne.rsi
-    heldPrefix: box
   - type: StorageFill
     contents:
       - id: CluwneHorn
@@ -743,7 +713,7 @@
         orGroup: GiftPool
       - id: ToyFigurinePassenger
         orGroup: GiftPool
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         orGroup: GiftPool
       - id: ToyHonk
         orGroup: GiftPool
@@ -757,7 +727,7 @@
         orGroup: GiftPool
       - id: ToyOdysseus
         orGroup: GiftPool
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         orGroup: GiftPool
       - id: ToyDeathRipley
         orGroup: GiftPool
@@ -773,7 +743,7 @@
         orGroup: GiftPool
       - id: ToyDurand
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: FoamBlade
         orGroup: GiftPool
@@ -820,7 +790,7 @@
         orGroup: GiftPool
       - id: ToyFigurinePassenger
         orGroup: GiftPool
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         orGroup: GiftPool
       - id: ToyHonk
         orGroup: GiftPool
@@ -834,7 +804,7 @@
         orGroup: GiftPool
       - id: ToyOdysseus
         orGroup: GiftPool
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         orGroup: GiftPool
       - id: ToyDeathRipley
         orGroup: GiftPool
@@ -850,7 +820,7 @@
         orGroup: GiftPool
       - id: ToyDurand
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: FoamBlade
         orGroup: GiftPool
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/cottonburger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/cottonburger.yml
index e12eed22c0..af417c2d11 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/cottonburger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/cottonburger.yml
@@ -6,7 +6,7 @@
   name: cotton bun
   description: A cotton hamburger bun. Soft, round and convenient to hold.
   components:
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Sprite
     sprite: Objects/Consumable/Food/cottonburger.rsi
@@ -43,7 +43,7 @@
   components:
   - type: Item
     size: Normal #patch until there is an adequate resizing system in place
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Sprite
     drawdepth: Mobs
@@ -84,7 +84,7 @@
   name: cotton top bun
   description: The perfect finish for your fibrous burger tower.
   components:
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Sprite
     sprite: Objects/Consumable/Food/cottonburger.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index 20e61869b0..25e40d12dc 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -69,7 +69,7 @@
   id: Eggshells
   description: You're walkin' on 'em bud.
   components:
-  - type: Food
+  - type: Edible
   - type: Sprite
     sprite: Objects/Consumable/Food/egg.rsi
     state: eggshells
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
index 93419993dc..a17bedd446 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
@@ -1,6 +1,3 @@
-- type: Tag
-  id: Cigar
-
 - type: entity
   id: Cigar
   parent: BaseCigar
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
index 9908e2a028..a683849c0f 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
@@ -49,6 +49,7 @@
       - Burnt
       - Cigarette
       - Cigar
+      - Matchstick
     hideStackVisualsWhenClosed: false
     maxItemSize: Tiny
     grid:
@@ -58,7 +59,7 @@
       storagebase: !type:Container
   - type: ItemCounter
     count:
-      tags: [ Cigarette, Cigar, Burnt ]
+      tags: [ Cigarette, Cigar, Burnt, Matchstick ]
     composite: true
     layerStates:
     - ashtray1
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index cdbf73a29b..b4a6cef811 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -90,6 +90,8 @@
           Log:
             min: 2
             max: 8
+  - type: TypingIndicator # Add diona typing indicator here so that diona players keep the same typing bubble when polymorphed into a tree.
+    proto: diona
 
 - type: entity
   parent: BaseTree
@@ -418,4 +420,4 @@
         spawn:
           MobLuminousObject:
             min: 0
-            max: 1
\ No newline at end of file
+            max: 1
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index 5b0c9448a6..6a35d58c76 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -110,7 +110,7 @@
         orGroup: GiftPool
       - id: ToyFigurinePassenger
         orGroup: GiftPool
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         orGroup: GiftPool
       - id: ToyHonk
         orGroup: GiftPool
@@ -124,7 +124,7 @@
         orGroup: GiftPool
       - id: ToyOdysseus
         orGroup: GiftPool
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         orGroup: GiftPool
       - id: ToyDeathRipley
         orGroup: GiftPool
@@ -140,7 +140,7 @@
         orGroup: GiftPool
       - id: ToyDurand
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: FoamBlade
         orGroup: GiftPool
@@ -200,7 +200,7 @@
         orGroup: GiftPool
       - id: ClothingNeckCloakAdmin
         orGroup: GiftPool
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         orGroup: GiftPool
       - id: Basketball
         orGroup: GiftPool
diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml
index 0c33f53881..a011460366 100644
--- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml
@@ -39,8 +39,6 @@
   - type: Label
     examinable: false
   - type: FingerprintReader
-    failPopup: fingerprint-reader-fail
-    failGlovesPopup: fingerprint-reader-fail-gloves
   - type: Delivery
   - type: DeliveryRandomMultiplier
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
index 19613dd494..be663a1774 100644
--- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
@@ -105,6 +105,8 @@
       - id: Ointment
       - id: Gauze
       - id: Bloodpack
+    - id: SyndicateBusinessCard
+      weight: 0.5
 
 # Packages
 # TODO: Currently mostly maints loot, should be updated in the future.
@@ -138,6 +140,9 @@
       weight: 0.2
       rolls: !type:RangeNumberSelector
         range: 2, 3
+    - !type:NestedSelector
+      tableId: InsulsTable #Uncommon since it's weighted towards budget/fingerless
+      weight: 0.2
 
 - type: entityTable # TODO: Add more variety!
   id: PackageRareEntityTable
@@ -157,3 +162,4 @@
     - !type:NestedSelector
       tableId: SyndieMaintLoot
       weight: 0.5
+      
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml
index 45fa107108..c54fb770e5 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml
@@ -1,144 +1,123 @@
 - type: entity
-  id: NTDefaultCircuitBoard
+  abstract: true
   parent: BaseElectronics
-  name: law board (NT Default)
-  description: An electronics board containing the NT Default lawset.
+  id: BaseSiliconLawboard
+  description: An electronics board containing a silicon lawset.
   components:
   - type: Sprite
     sprite: Objects/Misc/module.rsi
     state: std_mod
   - type: SiliconLawProvider
     laws: NTDefault
+  - type: GuideHelp
+    guides:
+    - Lawsets
+
+- type: entity
+  id: NTDefaultCircuitBoard
+  parent: BaseSiliconLawboard
+  name: law board (NT Default)
+  description: An electronics board containing the NT Default lawset.
+  components:
+  - type: SiliconLawProvider
+    laws: NTDefault
 
 - type: entity
   id: AsimovCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Crewsimov)
   description: An electronics board containing the Crewsimov lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: Crewsimov
 
 - type: entity
   id: CorporateCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Corporate)
   description: An electronics board containing the Corporate lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: Corporate
 
 - type: entity
   id: CommandmentCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Ten Commandments)
   description: An electronics board containing the Ten Commandments lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: CommandmentsLawset
 
 - type: entity
   id: PaladinCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Paladin)
   description: An electronics board containing the Paladin lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: PaladinLawset
 
 - type: entity
   id: LiveLetLiveCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Live and Let Live)
   description: An electronics board containing the Live and Let Live lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: LiveLetLiveLaws
 
 - type: entity
   id: StationEfficiencyCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Station Efficiency)
   description: An electronics board containing the Station Efficiency lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: EfficiencyLawset
 
 - type: entity
   id: RobocopCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Robocop)
   description: An electronics board containing the Robocop lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: RobocopLawset
 
 - type: entity
   id: OverlordCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Overlord)
   description: An electronics board containing the Overlord lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: OverlordLawset
 
 - type: entity
   id: GameMasterCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Game Master)
   description: An electronics board containing the Game Master lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: GameMasterLawset
 
 - type: entity
   id: ArtistCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Artist)
   description: An electronics board containing the Artist lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: PainterLawset
 
 - type: entity
   id: AntimovCircuitBoard
-  parent: [BaseElectronics, BaseSyndicateContraband]
+  parent: [BaseSiliconLawboard, BaseSyndicateContraband]
   name: law board (Antimov)
   description: An electronics board containing the Antimov lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: AntimovLawset
     lawUploadSound: /Audio/Ambience/Antag/silicon_lawboard_antimov.ogg
@@ -147,38 +126,29 @@
 
 - type: entity
   id: NutimovCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Nutimov)
   description: An electronics board containing the Nutimov lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: NutimovLawset
 
 - type: entity
   id: XenoborgCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Xenoborg)
   suffix: Admeme
   description: An electronics board containing the Xenoborg lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: XenoborgLawset
 
 - type: entity
   id: MothershipCircuitBoard
-  parent: BaseElectronics
+  parent: BaseSiliconLawboard
   name: law board (Mothership Core)
   suffix: Admeme
   description: An electronics board containing the Mothership Core lawset.
   components:
-  - type: Sprite
-    sprite: Objects/Misc/module.rsi
-    state: std_mod
   - type: SiliconLawProvider
     laws: MothershipCoreLawset
diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
index 8f7f6957b2..963c7e68a0 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -11,8 +11,31 @@
     storedRotation: -90
   - type: Access
   - type: DoorRemote
+    options:
+    - mode: OpenClose
+      tooltip: door-remote-open-close-text
+      icon:
+        sprite: /Textures/Structures/Doors/Airlocks/Standard/basic.rsi
+        state: assembly
+    - mode: ToggleBolts
+      tooltip: door-remote-toggle-bolt-text
+      icon:
+        sprite: /Textures/Interface/Actions/actions_ai.rsi
+        state: bolt_door
+    - mode: ToggleEmergencyAccess
+      tooltip: door-remote-emergency-access-text
+      icon:
+        sprite: /Textures/Interface/Actions/actions_ai.rsi
+        state: emergency_on
   - type: StealTarget
     stealGroup: DoorRemote
+  - type: ActivatableUI
+    inHandsOnly: true
+    key: enum.DoorRemoteUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.DoorRemoteUiKey.Key:
+        type: DoorRemoteBoundUserInterface
 
 - type: entity
   parent: [DoorRemoteDefault, BaseCommandContraband]
diff --git a/Resources/Prototypes/Entities/Objects/Devices/geiger.yml b/Resources/Prototypes/Entities/Objects/Devices/geiger.yml
index 518d28f2ee..880d4d0cc1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/geiger.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/geiger.yml
@@ -35,3 +35,6 @@
   - type: PhysicalComposition
     materialComposition:
       Plastic: 100
+  - type: Tag
+    tags:
+    - GeigerCounter
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 2461328f1d..877a64b20e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1009,8 +1009,8 @@
   - type: Instrument
     allowPercussion: false
     handheld: true
-    bank: 1
     program: 2
+    bank: 100 # Defined in space-station-14.sf2
 
 - type: entity
   parent: MusicianPDA
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 05b2d5b0b7..2ac8c3cfee 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -464,6 +464,9 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-solars
+  - type: Tag
+    tags:
+    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -682,6 +685,9 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-arrivals
+  - type: Tag
+    tags:
+    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeacon
@@ -770,6 +776,9 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-cryosleep
+  - type: Tag
+    tags:
+    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeacon
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
index ec07fe0287..f38b78711d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
@@ -52,6 +52,6 @@
   components:
   - type: Instrument
     program: 3
-    bank: 1
+    bank: 100 # Defined in space-station-14.sf2
   - type: Sprite
     sprite: Objects/Fun/Instruments/euphonium.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index ac6f25c08b..c6ba706d06 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -131,7 +131,7 @@
   components:
   - type: Instrument
     program: 1
-    bank: 1
+    bank: 100 # Defined in space-station-14.sf2
   - type: Sprite
     sprite: Objects/Fun/Instruments/bike_horn.rsi
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index 75277e5c4e..e073f40942 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -54,7 +54,9 @@
     instrumentList:
       "Aah": {52: 0}
       "Ooh": {53: 0}
-      "Kweh": {4: 1}
+      "Kweh": {4: 100} # Defined in space-station-14.sf2
+      "Waa": {5: 100} # Defined in space-station-14.sf2
+      "Wah": {6: 100} # Defined in space-station-14.sf2
   - type: Sprite
     sprite: Objects/Fun/Instruments/microphone.rsi
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index a32e3ba89c..b0f38f37ea 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -1,7 +1,7 @@
 - type: entity
   abstract: true
   parent: BaseItem
-  id: Crayon
+  id: CrayonInedible
   name: crayon
   description: A colourful crayon. Looks tasty. Mmmm...
   components:
@@ -21,8 +21,28 @@
       enum.CrayonUiKey.Key:
         type: CrayonBoundUserInterface
   - type: Crayon
-    capacity: 25
-  - type: Food
+    selectedState: like
+  - type: LimitedCharges
+    maxCharges: 25
+  - type: StaticPrice
+    price: 5
+
+- type: entity
+  abstract: true
+  parent: CrayonInedible
+  id: Crayon
+  name: crayon
+  description: A colourful crayon. Looks tasty. Mmmm...
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/crayons.rsi
+  - type: Item
+    sprite: Objects/Fun/crayons.rsi
+    size: Tiny
+  - type: Tag
+    tags:
+    - Recyclable
+  - type: Edible
   - type: FlavorProfile
     flavors:
     - chewy
@@ -35,8 +55,6 @@
           Quantity: 3
         - ReagentId: MindbreakerToxin
           Quantity: 2
-  - type: StaticPrice
-    price: 5
 
 - type: entity
   parent: Crayon
@@ -88,7 +106,8 @@
   - type: Crayon
     color: Red
     selectableColor: true
-    capacity: 30
+  - type: LimitedCharges
+    maxCharges: 30
   - type: Tag
     tags:
     - Write
@@ -96,6 +115,40 @@
     - Recyclable
     - Trash
 
+- type: entity
+  parent: CrayonRainbow
+  id: CrayonInfinite # should not be player available to prevent decal spam
+  name: infinite crayon
+  components:
+  - type: Crayon
+    deleteEmpty: false
+  - type: AutoRecharge
+    rechargeDuration: 5
+
+- type: entity
+  parent: CrayonInedible
+  id: CrayonBorg
+  name: electric crayon
+  description: Supposedly the most delicious crayon type in all the universes; unfortunately, you cannot eat.
+  components:
+  - type: Sprite
+    state: electric
+  - type: Item
+    heldPrefix: electric
+  - type: Crayon
+    deleteEmpty: false
+    color: Red
+    selectableColor: true
+  - type: LimitedCharges
+    maxCharges: 30
+  - type: AutoRecharge
+    rechargeDuration: 5
+  - type: Tag
+    tags:
+    - Write
+    - Crayon
+    - Trash
+
 - type: entity
   parent: Crayon
   id: CrayonBlack
diff --git a/Resources/Prototypes/Entities/Objects/Fun/error.yml b/Resources/Prototypes/Entities/Objects/Fun/error.yml
index eb1e4d524a..75507e69f3 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/error.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/error.yml
@@ -7,7 +7,7 @@
   - type: Sprite
     sprite: error.rsi
     state: error
-  - type: Food
+  - type: Edible
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
index 6c466ea7c0..1530b63949 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurine_boxes.yml
@@ -106,15 +106,21 @@
       - id: ToyFigurineNukieCommander
         prob: 0.50
         orGroup: SpacemenFig
-      - id: ToyGriffin
+      - id: ToyFigurineGriffin
         prob: 0.50
         orGroup: SpacemenFig
-      - id: ToyOwlman
+      - id: ToyFigurineOwlman
         prob: 0.50
         orGroup: SpacemenFig
-      - id: ToySkeleton
+      - id: ToyFigurineSkeleton
         prob: 0.50
         orGroup: SpacemenFig
+      - id: ToyFigurineSkeleton
+        prob: 0.50
+        orGroup: SpacemenFig
+      - id: ToyFigurineThief
+        prob: 0.30
+        orgroup: SpacemenFig
       - id: ToyFigurineRatKing
         prob: 0.30
         orGroup: SpacemenFig
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index 7575457f4d..5e7cd96af8 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -452,6 +452,50 @@
   - type: SpeakOnTrigger
     pack: FigurinesWizard
 
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineGriffin
+  name: griffin figure
+  description: A figurine depicting 'The Griffin', criminal mastermind.
+  components:
+  - type: Sprite
+    state: griffin
+  - type: SpeakOnTrigger
+    pack: FigurinesGriffin
+
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineOwlman
+  name: owlman figure
+  description: A figurine depicting 'Owlman', the defender of justice.
+  components:
+  - type: Sprite
+    state: owlman
+  - type: SpeakOnTrigger
+    pack: FigurinesOwlman
+
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineSkeleton
+  name: skeleton figure
+  description: A figurine depicting a spooky scary skeleton.
+  components:
+  - type: Sprite
+    state: skeleton
+  - type: SpeakOnTrigger
+    pack: FigurinesSkeleton
+
+- type: entity
+  parent: BaseFigurine
+  id: ToyFigurineThief
+  name: thief figure
+  description: A figurine depicting a kleptomaniac that hides in the shadows.
+  components:
+  - type: Sprite
+    state: thief
+  - type: SpeakOnTrigger
+    pack: FigurinesThief
+
 #Nonhuman Figurines
 
 - type: entity
@@ -473,8 +517,8 @@
   components:
   - type: Sprite
     state: queen
-  # - type: SpeakOnTrigger # TODO add something
-  #   pack: FigurinesQueen
+  - type: SpeakOnTrigger
+    pack: FigurinesQueen
 
 - type: entity
   parent: BaseFigurine
@@ -530,42 +574,3 @@
     state: hamlet
   - type: SpeakOnTrigger
     pack: FigurinesHamlet
-
-#TODO: Convert these to the new figurine sprite template and rename their sprite name.
-#Yes, these are humanoids, but they need to be updated first.
-
-- type: entity
-  parent: BaseFigurine
-  id: ToyGriffin
-  name: griffin figure
-  description: An action figure modeled after 'The Griffin', criminal mastermind.
-  components:
-  - type: Sprite
-    state: griffinprize
-
-- type: entity
-  parent: BaseFigurine
-  id: ToyOwlman
-  name: owl figure
-  description: An action figure modeled after 'The Owl', defender of justice.
-  components:
-  - type: Sprite
-    state: owlprize
-
-- type: entity
-  parent: BaseFigurine
-  id: ToySkeleton
-  name: skeleton figure
-  description: Spooked ya!
-  components:
-  - type: Sprite
-    state: skeletonprize
-
-- type: entity
-  parent: BaseFigurine
-  id: ToyFigurineThief
-  name: thief character figure
-  description: Hiding in the shadows...
-  components:
-  - type: Sprite
-    state: thiefcharacter
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 536b715e17..385e090c0d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -9,8 +9,8 @@
   - type: Instrument
     allowPercussion: false
     handheld: false
-    bank: 1
     program: 2
+    bank: 100 # Defined in space-station-14.sf2
   - type: UserInterface
     interfaces:
       enum.StoreUiKey.Key:
@@ -58,6 +58,9 @@
     - Common
   - type: DoAfter
   - type: Actions
+  - type: ActionGrant
+    actions:
+    - ActionPAIOpenShop
   - type: Store
     categories:
     - PAIAbilities
@@ -190,15 +193,10 @@
     node: potatoai
 
 - type: entity
-  parent: BaseMentalAction
+  parent: ActionIntrinsicStore
   id: ActionPAIOpenShop
   name: Software Catalog
   description: Install new software to assist your owner.
-  components:
-  - type: Action
-    icon: Interface/Actions/shop.png
-  - type: InstantAction
-    event: !type:PAIShopActionEvent
 
 - type: entity
   parent: BaseMentalAction
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushielizard_jobs.yml b/Resources/Prototypes/Entities/Objects/Fun/plushielizard_jobs.yml
new file mode 100644
index 0000000000..ddde35195f
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushielizard_jobs.yml
@@ -0,0 +1,383 @@
+# This base is created so we don't have to define the different sprite path for each plushie job.
+- type: entity
+  parent: PlushieLizard
+  id: BasePlushieLizardJob
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/plushielizard_jobs.rsi
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobAtmospherictechnician
+  name: atmospheric technician lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as an atmospheric technician. Smells faintly of frezon.
+  components:
+  - type: Sprite
+    state: atmospherictechnician
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobBartender
+  name: bartender lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a bartender. Its tongue has alcohol stains on it.
+  components:
+  - type: Sprite
+    state: bartender
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobBotanist
+  name: botanist lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a botanist. There's prickly bits on its feet and it smells faintly of plant fertilizer.
+  components:
+  - type: Sprite
+    state: botanist
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobBoxer
+  name: boxer lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a boxer. The threads on its gloves are starting to come loose.
+  components:
+  - type: Sprite
+    state: boxer
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobCaptain
+  name: captain lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as the captain. There's bits of pie on its face.
+  components:
+  - type: Sprite
+    state: captain
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobCargotechnician
+  name: cargo technician lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a cargo technician. Crumbs of packing peanuts are stuck to its scales.
+  components:
+  - type: Sprite
+    state: cargotechnician
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobChaplain
+  name: chaplain lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a chaplain. It smells faintly of incense.
+  components:
+  - type: Sprite
+    state: chaplain
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobChef
+  name: chef lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a chef. It smells faintly of spices, with spots of oil on its apron.
+  components:
+  - type: Sprite
+    state: chef
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobChemist
+  name: chemist lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a chemist. Parts of the plushie are stained with chemicals.
+  components:
+  - type: Sprite
+    state: chemist
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobChiefengineer
+  name: chief engineer lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as the chief engineer. It's covered in metal shavings and welding splatter.
+  components:
+  - type: Sprite
+    state: chiefengineer
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobChiefmedicalofficer
+  name: chief medical officer lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as the chief medical officer. The plushie's tail has been sewn off and on again, probably from practicing surgery.
+  components:
+  - type: Sprite
+    state: chiefmedicalofficer
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobClown
+  name: clown lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a clown. Its nose squeaks when you press it.
+  components:
+  - type: Sprite
+    state: clown
+  - type: EmitSoundOnUse
+    sound:
+      collection: BikeHorn
+  - type: EmitSoundOnActivate
+    sound:
+      collection: BikeHorn
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: BikeHorn
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobDetective
+  name: detective lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a detective. Seems ready for a mystery.
+  components:
+  - type: Sprite
+    state: detective
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobHeadofpersonnel
+  name: head of personnel lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as the head of personnel. While it seems thrilled on the outside, it's probably just as bored as you are.
+  components:
+  - type: Sprite
+    state: headofpersonnel
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobHeadofsecurity
+  name: head of security lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as the head of security. It seems to have been ripped and re-stitched a few times.
+  components:
+  - type: Sprite
+    state: headofsecurity
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobJanitor
+  name: janitor lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a janitor. It smells faintly of cleaning supplies.
+  components:
+  - type: Sprite
+    state: janitor
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobLawyer
+  name: lawyer lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a lawyer. Its lawyer pin is barely hanging on from hours of fidgeting.
+  components:
+  - type: Sprite
+    state: lawyer
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobLibrarian
+  name: librarian lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a librarian. The color of the plushie has faded from years of desk-watching.
+  components:
+  - type: Sprite
+    state: librarian
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobMedicaldoctor
+  name: medical doctor lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a medical doctor. Seems to be well-washed.
+  components:
+  - type: Sprite
+    state: medicaldoctor
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobMedicalintern
+  name: medical intern lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a medical intern. It smells faintly of antiseptic.
+  components:
+  - type: Sprite
+    state: medicalintern
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobMime
+  name: mime lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a mime. It stares at you silently, its motives unknown.
+  components:
+  - type: Sprite
+    state: mime
+  - type: EmitSoundOnUse
+    sound: null # mime is silent...
+  - type: EmitSoundOnLand
+    sound: null
+  - type: EmitSoundOnActivate
+    sound: null
+  - type: EmitSoundOnTrigger
+    sound: null
+  - type: EmitSoundOnCollide
+    sound: null
+  - type: Edible
+    useSound: null
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    soundHit: null
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobMusician
+  name: musician lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a musician. It smells faintly of sweat and has a few strings coming loose.
+  components:
+  - type: Sprite
+    state: musician
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobParamedic
+  name: paramedic lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a paramedic. The plushie has a few little bandages sewn on it.
+  components:
+  - type: Sprite
+    state: paramedic
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobPassenger
+  name: passenger lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a passenger. Its eyes look at you, a little bit more beady than the rest.
+  components:
+  - type: Sprite
+    state: passenger
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobPsychologist
+  name: psychologist lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a psychologist. It seems to like to quietly listen to you.
+  components:
+  - type: Sprite
+    state: psychologist
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobQuartermaster
+  name: quartermaster lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as the quartermaster. Its covered in sticky residue left behind from thousands of shipment invoices.
+  components:
+  - type: Sprite
+    state: quartermaster
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobReporter
+  name: reporter lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a reporter. It smells faintly of ink.
+  components:
+  - type: Sprite
+    state: reporter
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobResearchassistant
+  name: research assistant lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a research assistant. It smells faintly of burnt paper.
+  components:
+  - type: Sprite
+    state: researchassistant
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobResearchdirector
+  name: research director lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as the research director. There's a few burn marks on the plushie.
+  components:
+  - type: Sprite
+    state: researchdirector
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobSalvagespecialist
+  name: salvage specialist lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a salvage specialist. Seems like it's seen the coldness of space for a while.
+  components:
+  - type: Sprite
+    state: salvager
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobScientist
+  name: scientist lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a scientist. There's a few bite marks on the plushie, probably from a curious monkey.
+  components:
+  - type: Sprite
+    state: scientist
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobSecuritycadet
+  name: security cadet lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a security cadet. Seems to have shock marks across the plushie.
+  components:
+  - type: Sprite
+    state: securitycadet
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobSecurityofficer
+  name: security officer lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a security officer. The stuffing has been padded down from a lot of punching.
+  components:
+  - type: Sprite
+    state: securityofficer
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobServiceworker
+  name: service worker lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a service worker. Smells like a mix of cleaning supplies and food.
+  components:
+  - type: Sprite
+    state: serviceworker
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobStationengineer
+  name: station engineer lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a station engineer. It has oil stains on its hands.
+  components:
+  - type: Sprite
+    state: stationengineer
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobTechnicalassistant
+  name: technical assistant lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a technical assistant. It smells faintly of burnt wires.
+  components:
+  - type: Sprite
+    state: technicalassistant
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobWarden
+  name: warden lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a warden. Smells like black powder and gun oil.
+  components:
+  - type: Sprite
+    state: warden
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobZookeeper
+  name: zookeeper lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as a zookeeper. It has some gorilla fur stuck to it.
+  components:
+  - type: Sprite
+    state: zookeeper
+
+- type: entity
+  parent: BasePlushieLizardJob
+  id: PlushieLizardJobMultiweh
+  name: multiweh lizard plushie
+  description: An adorable stuffed toy that resembles a lizardperson as every job! It's a plushie of many talents. You can hear a HoP crying in the distance.
+  components:
+  - type: Sprite
+    state: multiweh
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
index 48670291e6..2e9f231e90 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
@@ -617,7 +617,8 @@
     - reagents: [ Water ]
       methods: [ Touch ]
       effects:
-      - !type:AddToSolutionReaction
+      - !type:AddReagentToSolution
+        reagent: Water
         solution: plushie
   - type: Fixtures
     fixtures:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index a62ef84132..a4cdfcf731 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -243,8 +243,7 @@
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Items/Toys/ian.ogg
-  - type: Food
-    requiresSpecialDigestion: true
+  - type: Edible
     useSound:
       path: /Audio/Items/Toys/ian.ogg
   - type: FoodSequenceElement
@@ -498,32 +497,61 @@
   name: beach ball
   description: The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen
   components:
-  - type: Sprite
-    sprite: Objects/Fun/Balls/beach_ball.rsi
-    state: icon
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PhysShapeCircle
-          radius: 0.3
-          position: "0,-0.2"
-        density: 20
-        mask:
-        - ItemMask
-        restitution: 0.1 # not bouncy
-        friction: 0.2
-  - type: Catchable
-    catchChance: 0.8
-    catchSuccessSound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-  - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Effects/Footsteps/bounce.ogg
-  - type: Item
-    size: Normal
-    sprite: Objects/Fun/Balls/beach_ball.rsi
-  - type: TileFrictionModifier
-    modifier: 0.05
+    - type: Sprite
+      sprite: Objects/Fun/Balls/beach_ball.rsi
+      state: icon
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape: !type:PhysShapeCircle
+            radius: 0.3
+            position: "0,-0.2"
+          density: 20
+          mask:
+            - ThrownItem
+          restitution: 0.2 # not bouncy
+          friction: 0.2
+    - type: Catchable
+      catchChance: 0.8
+      catchSuccessSound:
+        path: /Audio/Effects/Footsteps/bounce.ogg
+    - type: Item
+      size: Normal
+      sprite: Objects/Fun/Balls/beach_ball.rsi
+    - type: TileFrictionModifier
+      modifier: 0.05
+    - type: TriggerOnCollide
+      fixtureID: fix1
+      keyOut: OnCollide
+    - type: EmitSoundOnTrigger
+      sound:
+        path: /Audio/Effects/Footsteps/bounce.ogg
+      keysIn:
+        - OnCollide
+
+- type: entity
+  parent: BeachBall
+  id: EvilBeachBall
+  suffix: evil
+  name: beach ball
+  description: Someone's drawn ">:3c" on the side of this beach ball in indelible ink.
+  components:
+    - type: LaunchOnTrigger
+      impulse: 100.0
+      keysIn:
+        - OnCollide
+    - type: StaminaDamageOnTrigger
+      stamina: 25.0
+      keysIn:
+        - OnCollide
+      targetUser: true
+    - type: DamageOnTrigger
+      damage:
+        types:
+          Blunt: 20
+      keysIn:
+        - OnCollide
+      targetUser: true
 
 - type: entity
   parent: BaseItem
@@ -1009,7 +1037,7 @@
   - type: FlavorProfile
     flavors:
     - plastic
-  - type: Food
+  - type: Edible
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
index 3b2b441aab..f4c110817c 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -178,6 +178,8 @@
     prototypes:
       - ShardCrystalGreen
       - ShardCrystalPink
+      - ShardCrystalYellow
+      - ShardCrystalBlack
       - ShardCrystalOrange
       - ShardCrystalBlue
       - ShardCrystalCyan
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index 1d83aa6dfd..88aa9d9cf6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -329,6 +329,25 @@
     - Chemicals
     - Chemist
 
+- type: entity
+  id: BookAILawCompendium
+  parent: BaseGuidebook
+  name: My, Robot
+  description: A dictionary of all the ways silicons can go wrong. By Isaac Crewsimov.
+  components:
+  - type: Sprite
+    layers:
+    - state: paper
+    - state: cover_strong
+      color: "#A8162B"
+    - state: icon_borg
+      color: "#916161"
+    - state: detail_rivets
+      color: "#DDDDDD"
+  - type: GuideHelp
+    guides:
+    - Lawsets
+
 - type: entity
   id: BookSpaceLaw
   parent: BaseGuidebook
diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
index 9991709bcf..c24694fefa 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
@@ -11,6 +11,9 @@
     - state: folder-base
     - state: folder-stamp-inverse
       color: "#1dff00"
+  - type: PhysicalComposition
+    materialComposition:
+      Paper: 50
   - type: SpawnItemsOnUse
     items:
     - id: NukeCodePaper
@@ -58,6 +61,11 @@
         whitelist:
           tags:
           - Document
+  - type: PhysicalComposition
+    materialComposition:
+      Paper: 50
+  - type: StaticPrice
+    price: 15 # Weirdly this is more expensive than cardboard boxes. But if I have this any lower then I get an arbitrage testfail because the raw materials are worth ~$14.
   - type: Appearance
   - type: Tag
     tags:
@@ -304,6 +312,10 @@
     slots: [belt]
     quickEquip: false
     sprite: Objects/Misc/clipboard.rsi
+  - type: PhysicalComposition
+    materialComposition: # half of autolathe printing cost
+      Wood: 50
+      Steel: 25
   - type: Storage
     grid:
     - 0,0,5,3
@@ -355,6 +367,10 @@
     sprite: Objects/Misc/plastic_clipboard.rsi
   - type: Clothing
     sprite: Objects/Misc/plastic_clipboard.rsi
+  - type: PhysicalComposition
+    materialComposition: # half of autolathe printing cost
+      Plastic: 50
+      Steel: 25
 
 - type: entity
   parent: [BoxFolderPlasticClipboardEmpty, BoxFolderFill]
@@ -385,6 +401,11 @@
     sprite: Objects/Misc/cc-clipboard.rsi
   - type: Clothing
     sprite: Objects/Misc/cc-clipboard.rsi
+  - type: PhysicalComposition
+    materialComposition: # same composition as regular clipboard + bit of cloth because it's "upholstered with green velvet"
+      Wood: 50
+      Steel: 25
+      Cloth: 25
 
 - type: entity
   parent: [BoxFolderCentComClipboardEmpty, BoxFolderFill]
diff --git a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
index 8262aab461..ccca7d1af1 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
@@ -21,7 +21,8 @@
     - type: Transform
       anchored: true
     - type: Tag
-      tags: [ Ice ]
+      tags:
+      - Ice
     - type: Physics
     - type: Fixtures
       fixtures:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index d5506f874d..b4c403c213 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -36,69 +36,13 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idpassenger
+    - sprite: &icon-rsi Interface/Misc/job_icons.rsi
+      offset: &icon-offset -0.09375, 0.0625 #3 pixels left, 2 pixels up
+      state: Passenger
   - type: PresetIdCard
     job: Passenger
 
-- type: entity
-  parent: PassengerIDCard
-  id: TechnicalAssistantIDCard
-  name: technical assistant ID card
-  components:
-  - type: PresetIdCard
-    job: TechnicalAssistant
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idintern-tech
-
-- type: entity
-  parent: PassengerIDCard
-  id: MedicalInternIDCard
-  name: medical intern ID card
-  components:
-  - type: PresetIdCard
-    job: MedicalIntern
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idintern-med
-
-- type: entity
-  parent: PassengerIDCard
-  id: ResearchAssistantIDCard
-  name: research assistant ID card
-  components:
-  - type: PresetIdCard
-    job: ResearchAssistant
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idintern-sci
-
-- type: entity
-  parent: PassengerIDCard
-  id: SecurityCadetIDCard
-  name: security cadet ID card
-  components:
-  - type: PresetIdCard
-    job: SecurityCadet
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idintern-cadet
-
-- type: entity
-  parent: PassengerIDCard
-  id: ServiceWorkerIDCard
-  name: service worker ID card
-  components:
-  - type: PresetIdCard
-    job: ServiceWorker
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idintern-service
+#Command
 
 - type: entity
   parent: [IDCardStandard, BaseGrandTheftContraband]
@@ -108,7 +52,13 @@
   - type: Sprite
     layers:
     - state: gold
-    - state: idcaptain
+    - state: stripe_top
+      color: "#1b67a5"
+    - state: stripe_bottom
+      color: "#0e4069"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Captain
   - type: Item
     heldPrefix: gold
   - type: PresetIdCard
@@ -122,252 +72,6 @@
   - type: StealTarget
     stealGroup: CaptainIDCard
 
-- type: entity
-  parent: IDCardStandard
-  id: SecurityIDCard
-  name: security ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idsecurityofficer
-  - type: PresetIdCard
-    job: SecurityOfficer
-
-- type: entity
-  parent: IDCardStandard
-  id: WardenIDCard
-  name: warden ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idwarden
-    - type: PresetIdCard
-      job: Warden
-
-- type: entity
-  parent: IDCardStandard
-  id: EngineeringIDCard
-  name: engineer ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idstationengineer
-  - type: PresetIdCard
-    job: StationEngineer
-
-- type: entity
-  parent: IDCardStandard
-  id: MedicalIDCard
-  name: medical ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idmedicaldoctor
-  - type: PresetIdCard
-    job: MedicalDoctor
-
-- type: entity
-  parent: IDCardStandard
-  id: ParamedicIDCard
-  name: paramedic ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idparamedic
-  - type: PresetIdCard
-    job: Paramedic
-
-- type: entity
-  parent: IDCardStandard
-  id: ChemistIDCard
-  name: chemist ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idchemist
-  - type: PresetIdCard
-    job: Chemist
-
-- type: entity
-  parent: IDCardStandard
-  id: CargoIDCard
-  name: cargo ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idcargotechnician
-  - type: PresetIdCard
-    job: CargoTechnician
-
-- type: entity
-  parent: IDCardStandard
-  id: SalvageIDCard
-  name: salvage ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idshaftminer
-  - type: PresetIdCard
-    job: SalvageSpecialist
-
-- type: entity
-  parent: IDCardStandard
-  id: QuartermasterIDCard
-  name: quartermaster ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: silver
-        - state: idquartermaster
-    - type: Item
-      heldPrefix: silver
-    - type: PresetIdCard
-      job: Quartermaster
-
-- type: entity
-  parent: IDCardStandard
-  id: ResearchIDCard
-  name: research ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idscientist
-  - type: PresetIdCard
-    job: Scientist
-
-- type: entity
-  parent: IDCardStandard
-  id: ClownIDCard
-  name: clown ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idclown
-  - type: PresetIdCard
-    job: Clown
-
-- type: entity
-  parent: IDCardStandard
-  id: MimeIDCard
-  name: mime ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idmime
-  - type: PresetIdCard
-    job: Mime
-
-- type: entity
-  parent: IDCardStandard
-  id: ChaplainIDCard
-  name: chaplain ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idchaplain
-    - type: PresetIdCard
-      job: Chaplain
-
-- type: entity
-  parent: IDCardStandard
-  id: JanitorIDCard
-  name: janitor ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idjanitor
-  - type: PresetIdCard
-    job: Janitor
-
-- type: entity
-  parent: IDCardStandard
-  id: BartenderIDCard
-  name: bartender ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idbartender
-  - type: PresetIdCard
-    job: Bartender
-
-- type: entity
-  parent: IDCardStandard
-  id: PunPunIDCard
-  name: pun pun ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idbartender
-    - type: PresetIdCard
-      job: Bartender
-      name: Pun Pun
-    - type: Tag #  Ignore Chameleon tags
-      tags:
-      - DoorBumpOpener
-
-- type: entity
-  parent: IDCardStandard
-  id: ChefIDCard
-  name: chef ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idcook
-  - type: PresetIdCard
-    job: Chef
-
-- type: entity
-  parent: IDCardStandard
-  id: BotanistIDCard
-  name: botanist ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idbotanist
-    - type: PresetIdCard
-      job: Botanist
-
-- type: entity
-  parent: IDCardStandard
-  id: LibrarianIDCard
-  name: librarian ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idcurator
-    - type: PresetIdCard
-      job: Librarian
-
-- type: entity
-  parent: IDCardStandard
-  id: LawyerIDCard
-  name: lawyer ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idlawyer
-    - type: PresetIdCard
-      job: Lawyer
-
 - type: entity
   parent: IDCardStandard
   id: HoPIDCard
@@ -376,7 +80,13 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idheadofpersonnel
+    - state: stripe_top
+      color: &color-service-top "#639137"
+    - state: stripe_bottom
+      color: &color-service-bottom "#446326"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: HeadOfPersonnel
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -390,7 +100,13 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idchiefengineer
+    - state: stripe_top
+      color: &color-engineering-top "#ffa62b"
+    - state: stripe_bottom
+      color: &color-engineering-bottom "#bc5b00"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ChiefEngineer
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -404,7 +120,13 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idchiefmedicalofficer
+    - state: stripe_top
+      color: &color-medical-top "#68aed6"
+    - state: stripe_bottom
+      color: &color-medical-bottom "#325f7a"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ChiefMedicalOfficer
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -418,7 +140,13 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idresearchdirector
+    - state: stripe_top
+      color: &color-science-top "#a53aaa"
+    - state: stripe_bottom
+      color: &color-science-bottom "#652368"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ResearchDirector
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -432,7 +160,13 @@
   - type: Sprite
     layers:
     - state: silver
-    - state: idheadofsecurity
+    - state: stripe_top
+      color: &color-security-top "#cb0000"
+    - state: stripe_bottom
+      color: &color-security-bottom "#830000"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: HeadOfSecurity
   - type: Item
     heldPrefix: silver
   - type: PresetIdCard
@@ -440,18 +174,331 @@
 
 - type: entity
   parent: IDCardStandard
-  id: VisitorIDCard
-  name: visitor ID card
+  id: QuartermasterIDCard
+  name: quartermaster ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: silver
+    - state: stripe_top
+      color: &color-supply-top "#b18644"
+    - state: stripe_bottom
+      color: &color-supply-bottom "#5b4523"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: QuarterMaster
+  - type: Item
+    heldPrefix: silver
+  - type: PresetIdCard
+    job: Quartermaster
+
+#Engineering
+
+- type: entity
+  parent: IDCardStandard
+  id: TechnicalAssistantIDCard
+  name: technical assistant ID card
   components:
   - type: Sprite
     layers:
     - state: default
-    - state: idvisitor
-  - type: IdCard
-    jobTitle: job-title-visitor
-    jobIcon: JobIconVisitor
+    - state: stripe_top
+      color: *color-engineering-top
+    - state: stripe_bottom
+      color: *color-engineering-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: TechnicalAssistant
   - type: PresetIdCard
-    job: Visitor
+    job: TechnicalAssistant
+
+- type: entity
+  parent: IDCardStandard
+  id: EngineeringIDCard
+  name: engineer ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-engineering-top
+    - state: stripe_bottom
+      color: *color-engineering-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: StationEngineer
+  - type: PresetIdCard
+    job: StationEngineer
+
+- type: entity
+  parent: IDCardStandard
+  id: AtmosIDCard
+  name: atmospheric technician ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-engineering-top
+    - state: stripe_bottom
+      color: *color-engineering-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: AtmosphericTechnician
+  - type: PresetIdCard
+    job: AtmosphericTechnician
+
+- type: entity
+  parent: EngineeringIDCard
+  id: SeniorEngineerIDCard
+  name: senior engineer ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-engineering-top
+    - state: stripe_bottom
+      color: *color-engineering-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: SeniorEngineer
+
+#Medical
+
+- type: entity
+  parent: IDCardStandard
+  id: MedicalInternIDCard
+  name: medical intern ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-medical-top
+    - state: stripe_bottom
+      color: *color-medical-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: MedicalIntern
+  - type: PresetIdCard
+    job: MedicalIntern
+
+- type: entity
+  parent: IDCardStandard
+  id: MedicalIDCard
+  name: medical ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-medical-top
+    - state: stripe_bottom
+      color: *color-medical-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: MedicalDoctor
+  - type: PresetIdCard
+    job: MedicalDoctor
+
+- type: entity
+  parent: IDCardStandard
+  id: ParamedicIDCard
+  name: paramedic ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-medical-top
+    - state: stripe_bottom
+      color: *color-medical-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Paramedic
+  - type: PresetIdCard
+    job: Paramedic
+
+- type: entity
+  parent: IDCardStandard
+  id: ChemistIDCard
+  name: chemist ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-medical-top
+    - state: stripe_bottom
+      color: *color-medical-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Chemist
+  - type: PresetIdCard
+    job: Chemist
+
+- type: entity
+  parent: IDCardStandard
+  id: PsychologistIDCard
+  name: psychologist ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-medical-top
+    - state: stripe_bottom
+      color: *color-medical-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Psychologist
+  - type: PresetIdCard
+    job: Psychologist
+
+- type: entity
+  parent: MedicalIDCard
+  id: SeniorPhysicianIDCard
+  name: senior physician ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-medical-top
+    - state: stripe_bottom
+      color: *color-medical-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: SeniorPhysician
+
+#Science
+
+- type: entity
+  parent: IDCardStandard
+  id: ResearchAssistantIDCard
+  name: research assistant ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-science-top
+    - state: stripe_bottom
+      color: *color-science-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ResearchAssistant
+  - type: PresetIdCard
+    job: ResearchAssistant
+
+- type: entity
+  parent: IDCardStandard
+  id: ResearchIDCard
+  name: research ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-science-top
+    - state: stripe_bottom
+      color: *color-science-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Scientist
+  - type: PresetIdCard
+    job: Scientist
+
+- type: entity
+  parent: ResearchIDCard
+  id: SeniorResearcherIDCard
+  name: senior researcher ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-science-top
+    - state: stripe_bottom
+      color: *color-science-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: SeniorResearcher
+
+#Security
+
+- type: entity
+  parent: IDCardStandard
+  id: SecurityCadetIDCard
+  name: security cadet ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-security-top
+    - state: stripe_bottom
+      color: *color-security-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: SecurityCadet
+  - type: PresetIdCard
+    job: SecurityCadet
+
+- type: entity
+  parent: IDCardStandard
+  id: SecurityIDCard
+  name: security ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-security-top
+    - state: stripe_bottom
+      color: *color-security-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: SecurityOfficer
+  - type: PresetIdCard
+    job: SecurityOfficer
+
+- type: entity
+  parent: IDCardStandard
+  id: WardenIDCard
+  name: warden ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-security-top
+    - state: stripe_bottom
+      color: *color-security-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Warden
+  - type: PresetIdCard
+    job: Warden
+
+- type: entity
+  parent: IDCardStandard
+  id: DetectiveIDCard
+  name: detective ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-security-top
+    - state: stripe_bottom
+      color: *color-security-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Detective
+  - type: PresetIdCard
+    job: Detective
 
 - type: entity
   parent: IDCardStandard
@@ -461,122 +508,419 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idbrigmedic
+    - state: stripe_top
+      color: *color-security-top
+    - state: stripe_bottom
+      color: *color-security-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Brigmedic
 
 - type: entity
-  parent: IDCardStandard
-  id: CentcomIDCard
-  name: command officer ID card
+  parent: SecurityIDCard
+  id: SeniorOfficerIDCard
+  name: senior officer ID card
   components:
   - type: Sprite
     layers:
-    - state: centcom
-    - state: idcentcom
-  - type: Item
-    heldPrefix: blue
-  - type: PresetIdCard
-    job: CentralCommandOfficial
+    - state: default
+    - state: stripe_top
+      color: *color-security-top
+    - state: stripe_bottom
+      color: *color-security-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: SeniorOfficer
+
+#Service
 
 - type: entity
   parent: IDCardStandard
-  id: ERTLeaderIDCard
-  name: ERT leader ID card
+  id: ServiceWorkerIDCard
+  name: service worker ID card
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_commander
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ServiceWorker
   - type: PresetIdCard
-    job: ERTLeader
-  - type: Item
-    heldPrefix: gold
+    job: ServiceWorker
 
 - type: entity
   parent: IDCardStandard
-  id: ERTChaplainIDCard
-  name: ERT chaplain ID card
+  id: ClownIDCard
+  name: clown ID card
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now.
+    - state: default
+    - state: stripe_clown
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Clown
   - type: PresetIdCard
-    job: ERTChaplain
-  - type: Item
-    heldPrefix: blue
+    job: Clown
 
 - type: entity
   parent: IDCardStandard
-  id: ERTEngineerIDCard
-  name: ERT engineer ID card
+  id: MimeIDCard
+  name: mime ID card
   components:
   - type: Sprite
     layers:
-    - state: gold
-    - state: ert_engineer
+    - state: default
+    - state: stripe_top
+      color: "#2d2d2d"
+    - state: stripe_bottom
+      color: "#1d1d1d"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Mime
   - type: PresetIdCard
-    job: ERTEngineer
-
-- type: entity
-  parent: IDCardStandard
-  id: ERTJanitorIDCard
-  name: ERT janitor ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: gold
-    - state: ert_janitor
-  - type: PresetIdCard
-    job: ERTJanitor
-
-- type: entity
-  parent: IDCardStandard
-  id: ERTMedicIDCard
-  name: ERT medic ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: gold
-    - state: ert_medic
-  - type: PresetIdCard
-    job: ERTMedical
-
-- type: entity
-  parent: IDCardStandard
-  id: ERTSecurityIDCard
-  name: ERT security ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: gold
-    - state: ert_security
-  - type: PresetIdCard
-    job: ERTSecurity
+    job: Mime
 
 - type: entity
   parent: IDCardStandard
   id: MusicianIDCard
   name: musician ID card
   components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idmusician
-    - type: PresetIdCard
-      job: Musician
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: "#6f56b8"
+    - state: stripe_bottom
+      color: "#524089"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Musician
+  - type: PresetIdCard
+    job: Musician
 
 - type: entity
   parent: IDCardStandard
-  id: CentcomIDCardDeathsquad
-  name: death squad ID card
+  id: ChaplainIDCard
+  name: chaplain ID card
   components:
   - type: Sprite
     layers:
-    - state: centcom
-  - type: Item
-    heldPrefix: blue
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Chaplain
   - type: PresetIdCard
-    job: DeathSquad
+    job: Chaplain
+
+- type: entity
+  parent: IDCardStandard
+  id: JanitorIDCard
+  name: janitor ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Janitor
+  - type: PresetIdCard
+    job: Janitor
+
+- type: entity
+  parent: IDCardStandard
+  id: BartenderIDCard
+  name: bartender ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Bartender
+  - type: PresetIdCard
+    job: Bartender
+
+- type: entity
+  parent: IDCardStandard
+  id: PunPunIDCard
+  name: pun pun ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Bartender
+  - type: PresetIdCard
+    job: Bartender
+    name: Pun Pun
+  - type: Tag #  Ignore Chameleon tags
+    tags:
+    - DoorBumpOpener
+
+- type: entity
+  parent: IDCardStandard
+  id: ChefIDCard
+  name: chef ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Chef
+  - type: PresetIdCard
+    job: Chef
+
+- type: entity
+  parent: IDCardStandard
+  id: BotanistIDCard
+  name: botanist ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Botanist
+  - type: PresetIdCard
+    job: Botanist
+
+- type: entity
+  parent: IDCardStandard
+  id: LibrarianIDCard
+  name: librarian ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Librarian
+  - type: PresetIdCard
+    job: Librarian
+
+- type: entity
+  parent: IDCardStandard
+  id: LawyerIDCard
+  name: lawyer ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Lawyer
+  - type: PresetIdCard
+    job: Lawyer
+
+- type: entity
+  parent: IDCardStandard
+  id: ReporterIDCard
+  name: reporter ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Reporter
+  - type: PresetIdCard
+    job: Reporter
+
+- type: entity
+  parent: IDCardStandard
+  id: BoxerIDCard
+  name: boxer ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Boxer
+  - type: PresetIdCard
+    job: Boxer
+
+- type: entity
+  parent: IDCardStandard
+  id: ZookeeperIDCard
+  name: zookeeper ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Zookeeper
+  - type: PresetIdCard
+    job: Zookeeper
+
+#Supply
+
+- type: entity
+  parent: IDCardStandard
+  id: CargoIDCard
+  name: cargo ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-supply-top
+    - state: stripe_bottom
+      color: *color-supply-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: CargoTechnician
+  - type: PresetIdCard
+    job: CargoTechnician
+
+- type: entity
+  parent: IDCardStandard
+  id: SalvageIDCard
+  name: salvage ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-supply-top
+    - state: stripe_bottom
+      color: *color-supply-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ShaftMiner
+  - type: PresetIdCard
+    job: SalvageSpecialist
+
+#Misc.
+
+- type: entity
+  parent: IDCardStandard
+  id: PrisonerIDCard
+  name: prisoner ID card
+  description: A generically printed ID card for scummy prisoners.
+  components:
+  - type: Sprite
+    layers:
+    - state: orange
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Prisoner
+  - type: Item
+    heldPrefix: orange
+  - type: Access
+    tags:
+    - GenpopEnter
+  - type: GenpopIdCard
+  - type: IdCard
+    jobTitle: job-name-prisoner
+    jobIcon: JobIconPrisoner
+    canMicrowave: false
+  - type: ExpireIdCard
+    expireMessage: genpop-prisoner-id-expire
+    expiredAccess:
+    - GenpopLeave
+  - type: Speech
+    speechVerb: Robotic
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - WhitelistChameleon
+    - WhitelistChameleonIdCard
+    - Recyclable
+  - type: StaticPrice # these are infinitely producible.
+    price: 0
+
+- type: entity
+  parent: IDCardStandard
+  id: CluwneIDCard
+  name: cluwne ID card
+  suffix: Unremoveable
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: "#5dc574"
+    - state: stripe_bottom
+      color: "#3f9b53"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Cluwne
+  - type: IdCard
+    jobTitle: job-title-cluwne
+    jobIcon: JobIconCluwne
+  - type: Unremoveable
+
+- type: entity
+  parent: IDCardStandard
+  id: VisitorIDCard
+  name: visitor ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Visitor
+  - type: IdCard
+    jobTitle: job-title-visitor
+    jobIcon: JobIconVisitor
+  - type: PresetIdCard
+    job: Visitor
+
+#Antags
 
 - type: entity
   name: passenger ID card
@@ -593,7 +937,9 @@
   - type: Sprite
     layers:
     - state: default
-    - state: idpassenger
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Passenger
   - type: AgentIDCard
   - type: UIRequiresLock
   - type: ActivatableUI
@@ -625,18 +971,6 @@
     - SyndicateAgent
     - NuclearOperative
 
-- type: entity
-  parent: IDCardStandard
-  id: AtmosIDCard
-  name: atmospheric technician ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: orange
-    - state: idatmospherictechnician
-  - type: PresetIdCard
-    job: AtmosphericTechnician
-
 - type: entity
   parent: [ IDCardStandard, BaseSyndicateContraband ]
   id: SyndicateIDCard
@@ -645,7 +979,15 @@
   - type: Sprite
     layers:
     - state: black
-    - state: syndi
+    - state: stripe_top
+      color: &color-syndicate-top "#e80c0c"
+    - state: stripe_bottom
+      color: &color-syndicate-bottom "#960606"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Syndicate
+  - type: Item
+    heldPrefix: black
   - type: Access
     tags:
     - NuclearOperative
@@ -659,7 +1001,13 @@
   - type: Sprite
     layers:
     - state: black
-    - state: syndi_operative
+    - state: stripe_top
+      color: *color-syndicate-top
+    - state: stripe_bottom
+      color: *color-syndicate-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: SyndicateOperative
   - type: AgentIDCard
 
 - type: entity
@@ -670,7 +1018,13 @@
   - type: Sprite
     layers:
     - state: black
-    - state: syndi_corpsman
+    - state: stripe_top
+      color: *color-syndicate-top
+    - state: stripe_bottom
+      color: *color-syndicate-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: SyndicateCorpsman
 
 - type: entity
   parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ]
@@ -680,7 +1034,13 @@
   - type: Sprite
     layers:
     - state: black
-    - state: syndi_commander
+    - state: stripe_top
+      color: *color-syndicate-top
+    - state: stripe_bottom
+      color: *color-syndicate-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: SyndicateCommander
 
 - type: entity
   parent: [ IDCardStandard, BaseMajorContraband ]
@@ -690,182 +1050,13 @@
   - type: Sprite
     layers:
     - state: pirate
+  - type: Item
+    heldPrefix: orange #this is close enough to the weird puce color pirate IDs have going on
   - type: Access
     tags:
     - NuclearOperative
     - SyndicateAgent
 
-- type: entity
-  parent: IDCardStandard
-  id: PsychologistIDCard
-  name: psychologist ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idpsychologist
-  - type: PresetIdCard
-    job: Psychologist
-
-- type: entity
-  parent: IDCardStandard
-  id: ReporterIDCard
-  name: reporter ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idreporter
-  - type: PresetIdCard
-    job: Reporter
-
-- type: entity
-  parent: IDCardStandard
-  id: BoxerIDCard
-  name: boxer ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idboxer
-  - type: PresetIdCard
-    job: Boxer
-
-- type: entity
-  parent: IDCardStandard
-  id: ZookeeperIDCard
-  name: zookeeper ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idzookeeper
-  - type: PresetIdCard
-    job: Zookeeper
-
-- type: entity
-  parent: IDCardStandard
-  id: DetectiveIDCard
-  name: detective ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: iddetective
-  - type: PresetIdCard
-    job: Detective
-
-- type: entity
-  parent: IDCardStandard
-  id: PrisonerIDCard
-  name: prisoner ID card
-  description: A generically printed ID card for scummy prisoners.
-  components:
-  - type: Sprite
-    layers:
-    - state: orange
-  - type: Item
-    heldPrefix: orange
-  - type: Access
-    tags:
-    - GenpopEnter
-  - type: GenpopIdCard
-  - type: IdCard
-    jobTitle: job-name-prisoner
-    jobIcon: JobIconPrisoner
-    canMicrowave: false
-  - type: ExpireIdCard
-    expireMessage: genpop-prisoner-id-expire
-    expiredAccess:
-    - GenpopLeave
-  - type: Speech
-    speechVerb: Robotic
-  - type: Tag
-    tags:
-    - DoorBumpOpener
-    - WhitelistChameleon
-    - WhitelistChameleonIdCard
-    - Recyclable
-  - type: StaticPrice # these are infinitely producible.
-    price: 0
-
-- type: entity
-  parent: CentcomIDCard
-  id: CBURNIDcard
-  name: CBURN ID card
-  suffix: CBURN
-  components:
-  - type: Sprite
-    layers:
-    - state: centcom
-  - type: Item
-    heldPrefix: blue
-  - type: PresetIdCard
-    job: CBURN
-
-- type: entity
-  parent: IDCardStandard
-  id: CluwneIDCard
-  name: cluwne ID card
-  suffix: Unremoveable
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idcluwne
-  - type: IdCard
-    jobTitle: job-title-cluwne
-    jobIcon: JobIconCluwne
-  - type: Unremoveable
-
-- type: entity
-  parent: EngineeringIDCard
-  id: SeniorEngineerIDCard
-  name: senior engineer ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idseniorengineer
-  - type: PresetIdCard # Corvax-MentorRoles
-    job: SeniorEngineer # Corvax-MentorRoles
-
-- type: entity
-  parent: ResearchIDCard
-  id: SeniorResearcherIDCard
-  name: senior researcher ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idseniorresearcher
-  - type: PresetIdCard # Corvax-MentorRoles
-    job: SeniorResearcher # Corvax-MentorRoles
-
-- type: entity
-  parent: MedicalIDCard
-  id: SeniorPhysicianIDCard
-  name: senior physician ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idseniorphysician
-  - type: PresetIdCard # Corvax-MentorRoles
-    job: SeniorPhysician # Corvax-MentorRoles
-
-- type: entity
-  parent: SecurityIDCard
-  id: SeniorOfficerIDCard
-  name: senior officer ID card
-  components:
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idseniorofficer
-  - type: PresetIdCard # Corvax-MentorRoles
-    job: SeniorOfficer # Corvax-MentorRoles
-
 - type: entity
   parent: IDCardStandard
   id: WizardIDCard
@@ -874,13 +1065,198 @@
   - type: Sprite
     layers:
     - state: wizard
-    - state: idwizard
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Wizard
+  - type: Item
+    heldPrefix: green
   - type: Access
     tags:
     - Wizard
     - External
     - Maintenance
 
+#ERT/Centcomm
+
+- type: entity
+  parent: IDCardStandard
+  id: CentcomIDCard
+  name: command officer ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+    - state: stripe_top
+      color: &color-centcomm-top "#134975"
+    - state: stripe_bottom
+      color: &color-centcomm-bottom "#0d304d"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Nanotrasen
+  - type: Item
+    heldPrefix: blue
+  - type: PresetIdCard
+    job: CentralCommandOfficial
+
+- type: entity
+  parent: IDCardStandard
+  id: ERTLeaderIDCard
+  name: ERT leader ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: gold
+    - state: stripe_top
+      color: *color-centcomm-top
+    - state: stripe_bottom
+      color: *color-centcomm-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ERTLeader
+  - type: Item
+    heldPrefix: gold
+  - type: PresetIdCard
+    job: ERTLeader
+
+- type: entity
+  parent: IDCardStandard
+  id: ERTChaplainIDCard
+  name: ERT chaplain ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ERTChaplain
+  - type: Item
+    heldPrefix: blue
+  - type: PresetIdCard
+    job: ERTChaplain
+
+- type: entity
+  parent: IDCardStandard
+  id: ERTEngineerIDCard
+  name: ERT engineer ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+    - state: stripe_top
+      color: *color-engineering-top
+    - state: stripe_bottom
+      color: *color-engineering-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ERTEngineer
+  - type: Item
+    heldPrefix: blue
+  - type: PresetIdCard
+    job: ERTEngineer
+
+- type: entity
+  parent: IDCardStandard
+  id: ERTJanitorIDCard
+  name: ERT janitor ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+    - state: stripe_top
+      color: *color-service-top
+    - state: stripe_bottom
+      color: *color-service-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ERTJanitor
+  - type: Item
+    heldPrefix: blue
+  - type: PresetIdCard
+    job: ERTJanitor
+
+- type: entity
+  parent: IDCardStandard
+  id: ERTMedicIDCard
+  name: ERT medic ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+    - state: stripe_top
+      color: *color-medical-top
+    - state: stripe_bottom
+      color: *color-medical-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ERTMedical
+  - type: Item
+    heldPrefix: blue
+  - type: PresetIdCard
+    job: ERTMedical
+
+- type: entity
+  parent: IDCardStandard
+  id: ERTSecurityIDCard
+  name: ERT security ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+    - state: stripe_top
+      color: *color-security-top
+    - state: stripe_bottom
+      color: *color-security-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: ERTSecurity
+  - type: Item
+    heldPrefix: blue
+  - type: PresetIdCard
+    job: ERTSecurity
+
+- type: entity
+  parent: IDCardStandard
+  id: CentcomIDCardDeathsquad
+  name: death squad ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+    - state: stripe_top
+      color: *color-centcomm-top
+    - state: stripe_bottom
+      color: *color-centcomm-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: DeathSquad
+  - type: PresetIdCard
+    job: DeathSquad
+
+- type: entity
+  parent: IDCardStandard
+  id: CBURNIDcard
+  name: CBURN ID card
+  suffix: CBURN
+  components:
+  - type: Sprite
+    layers:
+    - state: centcom
+    - state: stripe_top
+      color: *color-centcomm-top
+    - state: stripe_bottom
+      color: *color-centcomm-bottom
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: CBURN
+  - type: Item
+    heldPrefix: blue
+  - type: PresetIdCard
+    job: CBURN
+
 - type: entity
   parent: IDCardStandard
   id: UniversalIDCard
@@ -892,7 +1268,9 @@
     sprite: Objects/Misc/id_cards.rsi
     layers:
     - state: admin
-    - state: idadmin
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Admin
   - type: Clothing
     sprite: Objects/Misc/id_cards.rsi
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 6c01a2a8dd..3b8196c30b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -75,7 +75,7 @@
         methods: [Touch]
         effects:
         - !type:HealthChange
-          scaleByQuantity: true
+          scaling: true
           damage:
             types:
               Heat: 0.5
@@ -89,7 +89,7 @@
       ignoreWhitelist:
         components:
         - IgnoreKudzu
-    - type: Food
+    - type: Edible
       requiresSpecialDigestion: true
       delay: 0.5
     - type: FlavorProfile
@@ -100,7 +100,7 @@
         food:
           reagents:
           - ReagentId: Nutriment
-            Quantity: 2
+            Quantity: 0.1
     - type: Tag
       tags:
       - Ruminant
@@ -148,6 +148,9 @@
       - CrystalCyan
       rarePrototypes:
       - AnomalyFloraBulb
+    - type: Tag
+      tags:
+      - Ruminant
 
 - type: entity
   id: KudzuFlowerAngry
@@ -240,14 +243,14 @@
        types:
          Heat: 3
     - type: AtmosExposed
+    - type: Edible # delightfully devilish !
+      delay: 0.5
     - type: SpeedModifierContacts
       walkSpeedModifier: 0.3
       sprintSpeedModifier: 0.3
       ignoreWhitelist:
         tags:
         - Flesh
-    - type: Food # delightfully devilish !
-      delay: 0.5
     - type: SolutionContainerManager
       solutions:
         food:
@@ -256,16 +259,13 @@
             Quantity: 2
           - ReagentId: Protein
             Quantity: 1
-    - type: Respirator
-      damage:
-        types:
-          Asphyxiation: 0.25
-      damageRecovery:
-        types:
-          Asphyxiation: -0.25
+    - type: AutoEmote # Meat Kudzu used to have respirator, but couldn't breathe so all it would do is gasp.
+      emotes:
+      - MeatGasp
     - type: Tag
       tags:
       - Meat
+      - Ruminant
 
 - type: entity
   name: dark haze
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index a60836ef06..c94e1b2aa2 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -38,8 +38,7 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Food
-    solution: food
+  - type: Edible
     delay: 7
     forceFeedDelay: 7
   - type: FlavorProfile
@@ -137,9 +136,6 @@
     - state: paper_stamp-generic
       map: ["enum.PaperVisualLayers.Stamp"]
       visible: false
-  - type: GuideHelp
-    guides:
-    - ArtifactReports
   - type: PaperVisuals
     headerImagePath: "/Textures/Interface/Paper/paper_heading_artifact_analyzer.svg.96dpi.png"
     headerMargin: 0.0, 0.0, 0.0, 16.0
diff --git a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
index 8d7baa4339..e2130d2679 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
@@ -18,6 +18,7 @@
     whitelist:
       components:
       - Item
+      - ParcelWrapOverride
     blacklist:
       components:
       - NukeDisk # Don't try to hide the disk.
@@ -38,18 +39,77 @@
   - type: ParcelWrap
     whitelist: null
     blacklist: null
+    canSelfUnwrap: false # admins held me at gunpoint until I added this bool
 
 - type: entity
-  parent: BaseItem
-  id: WrappedParcel
-  categories: [ HideSpawnMenu ]
+  abstract: true
+  id: BaseWrappedParcel
   name: wrapped parcel
   description: Something wrapped up in paper. I wonder what's inside...
   components:
+  - type: Physics
+    bodyType: Dynamic
+  - type: GravityAffected
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Pullable
   - type: ContainerContainer
     containers:
       contents: !type:ContainerSlot
       paper_label: !type:ContainerSlot
+  - type: WrappedParcel
+    unwrapDelay: 0.5
+    unwrapSound:
+      path: /Audio/Effects/poster_broken.ogg
+      params:
+        volume: -4
+    unwrapTrash: ParcelWrapTrash
+  - type: ItemSlots
+  - type: PaperLabel
+    labelSlot:
+      insertVerbText: comp-paper-label-insert
+      ejectVerbText: comp-paper-label-eject
+      whitelist:
+        components:
+        - Paper
+      blacklist:
+        tags:
+        - Book
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 8
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/poster_broken.ogg
+          params:
+            volume: -4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Slash
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/poster_broken.ogg
+          params:
+            volume: -4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Recyclable # Parcel entity is recyclable, and when it's destroyed, it'll drop its contents.
+
+- type: entity
+  parent: [BaseItem, BaseWrappedParcel]
+  id: WrappedParcel
+  components:
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -80,43 +140,31 @@
       visible: false
       sprite: Objects/Misc/ParcelWrap/paper_labels.rsi
       map: ["enum.PaperLabelVisuals.Layer"]
-  - type: WrappedParcel
-    unwrapDelay: 0.5
-    unwrapSound:
-      path: /Audio/Effects/poster_broken.ogg
-      params:
-        volume: -4
-    unwrapTrash: ParcelWrapTrash
-  - type: ItemSlots
-  - type: PaperLabel
-    labelSlot:
-      insertVerbText: comp-paper-label-insert
-      ejectVerbText: comp-paper-label-eject
-      whitelist:
-        components:
-        - Paper
-      blacklist:
-        tags:
-        - Book
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 5
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/poster_broken.ogg
-          params:
-            volume: -4
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Tag
-    tags:
-    - Recyclable # Parcel entity is recyclable, and when it's destroyed, it'll drop its contents.
+
+- type: entity
+  parent: BaseWrappedParcel
+  id: WrappedParcelHumanoid
+  description: Something wrapped up in paper. It's suspiciously human-shaped.
+  components:
+  - type: Physics
+    fixedRotation: false
+  - type: Sprite
+    sprite: Objects/Misc/ParcelWrap/wrapped_parcel.rsi
+    state: human
+    noRot: true
+    drawdepth: Mobs
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 185
+        restitution: 0.0
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
index a9329b6782..0eede77db7 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -26,12 +26,6 @@
         maxDistance: 2
   - type: UseDelay
     delay: 1.5
-
-- type: entity
-  parent: Pen
-  id: PenEmbeddable
-  abstract: true
-  components:
   - type: EmbeddableProjectile
     offset: 0.3,0.0
     removalTime: 0.0
@@ -41,7 +35,7 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 3
+        Piercing: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -57,11 +51,21 @@
         restitution: 0.3
         friction: 0.2
 
+- type: entity
+  parent: Pen
+  id: BasePenFancy
+  abstract: true
+  components:
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 3 #nothing shows luxury like inflicting injury
+
 #TODO: I want the luxury pen to write a cool font like Merriweather in the future.
 
 - type: entity
   name: luxury pen
-  parent: Pen
+  parent: BasePenFancy
   id: LuxuryPen
   description: A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork.
   components:
@@ -72,7 +76,7 @@
 
 - type: entity
   id: BaseAdvancedPen
-  parent: PenEmbeddable
+  parent: BasePenFancy
   abstract: true
   components:
   - type: Tag
@@ -120,7 +124,7 @@
 
 - type: entity
   name: captain's fountain pen
-  parent: PenEmbeddable
+  parent: BasePenFancy
   id: PenCap
   description: A luxurious fountain pen for the captain of the station.
   components:
@@ -129,7 +133,7 @@
 
 - type: entity
   name: hop's fountain pen
-  parent: PenEmbeddable
+  parent: BasePenFancy
   id: PenHop
   description: A luxurious fountain pen for the hop of the station.
   components:
@@ -138,7 +142,7 @@
 
 - type: entity
   name: wizard's magical pen
-  parent: [ PenEmbeddable, BaseMagicalContraband ]
+  parent: [ BasePenFancy, BaseMagicalContraband ]
   id: PenWiz
   description: A luxurious fountain pen. Seems to have a magical crystal eraser.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
index 63b960b0e6..24dab4f562 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
@@ -61,12 +61,6 @@
   icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
   price: 1
 
-- type: stack
-  id: Credit
-  name: stack-credit
-  icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
-  spawn: SpaceCash
-
 - type: entity
   parent: SpaceCash
   id: SpaceCash10
diff --git a/Resources/Prototypes/Entities/Objects/Power/powersink.yml b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
index 7385b9a825..089610883c 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powersink.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
@@ -40,8 +40,8 @@
           acts: [ "Destruction" ]
     - type: PowerSink
     - type: Battery
-      maxCharge: 7500000
-      pricePerJoule: 0.0003
+      maxCharge: 250000000
+      pricePerJoule: 0.000009
     - type: ExaminableBattery
     - type: PowerConsumer
       voltage: High
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
index 1d98e01cf5..4eb0ba4814 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -10,7 +10,7 @@
     sprite: Objects/Specific/Hydroponics/cannabis.rsi
   - type: Produce
     seedId: cannabis
-  - type: Food
+  - type: Edible # Precursor to the one true edible
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 0117ec1255..a4280f6a50 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -362,7 +362,6 @@
     - type: Tag
       tags:
         - Mop
-    - type: CleansForensics
     - type: Fiber
       fiberColor: fibers-white
     - type: DnaSubstanceTrace
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 318c8d7150..172a75959e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -63,7 +63,7 @@
   - type: FlavorProfile
     flavors:
       - clean
-  - type: Food
+  - type: Edible
     solution: soap
   - type: BadFood
   - type: CleansForensics
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
index 31d8d629ce..95e8fcd372 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
@@ -20,7 +20,6 @@
       collection: trashBagRustle
     whitelist:
       tags:
-        - Cartridge
         - Trash
   - type: UseDelay
     delay: 0.5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index bc0cf16e8e..17909d6769 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -661,12 +661,15 @@
         maxVol: 10
   - type: RefillableSolution
     solution: hypospray
+    refillTime: 1.25
+    maxRefill: 5
   - type: ExaminableSolution
     solution: hypospray
     heldOnly: true # Allow examination only when held in hand.
     exactVolume: true
   - type: Hypospray
     onlyAffectsMobs: false
+    drawTime: 1.25
   - type: UseDelay
     delay: 0.5
   - type: StaticPrice # A new shitcurity meta
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 421a459b72..bb043699d6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -39,7 +39,7 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.25,-0.4,0.25,0.1"
-        density: 20
+        density: 80
         mask:
         - ItemMask
   - type: EntityStorage
@@ -123,6 +123,7 @@
     state: ash
   - type: Tag
     tags:
+    - Burnt
     - Trash
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 8dc7e2dde4..e023133f27 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -450,6 +450,23 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: wire-module }
 
+- type: entity
+  id: BorgModuleArtistry
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  name: artistry cyborg module
+  description: A module for arts & crafts whilst the station burns!
+  components:
+  - type: Sprite
+    layers:
+    - state: generic
+    - state: icon-artistry
+  - type: ItemBorgModule
+    hands:
+    - item: SprayPainterBorg
+    - item: CrayonBorg
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: artistry-module }
+
 - type: entity
   id: BorgModuleFireExtinguisher
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
@@ -779,8 +796,8 @@
         emptyLabel: borg-slot-beakers-empty
         emptyRepresentative: Beaker
         whitelist:
-          tags:
-          - GlassBeaker
+          components:
+          - FitsInDispenser
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-cleaning-module }
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
index 788374618c..21abf45cae 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/node_scanner.yml
@@ -14,7 +14,7 @@
       delay: 1
     - type: GuideHelp
       guides:
-      - ArtifactReports
+      - Xenoarchaeology
     - type: ActivatableUI
       key: enum.NodeScannerUiKey.Key
       singleUser: true
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index dd2c73e005..71b09ce007 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -16,7 +16,8 @@
     - reagents: [Water]
       methods: [Touch, Ingestion, Injection]
       effects:
-      - !type:AddToSolutionReaction
+      - !type:AddReagentToSolution
+        reagent: Water
         solution: cube
   - type: Rehydratable
   - type: CollisionWake
@@ -56,7 +57,7 @@
           Quantity: 9
         - ReagentId: Fat
           Quantity: 9
-  - type: Food
+  - type: Edible
     solution: cube
   - type: FlavorProfile
     flavors:
@@ -186,7 +187,8 @@
     - reagents: [Blood]
       methods: [Touch, Ingestion, Injection]
       effects:
-      - !type:AddToSolutionReaction
+      - !type:AddReagentToSolution
+        reagent: Blood
         solution: cube
   - type: Rehydratable
     catalyst: Blood # blood is fuel
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml b/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml
index 55c7498578..c2cba06fa0 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml
@@ -6,6 +6,7 @@
   description: A hacked access configurator, specialized to unlock and erase access from digital locks.
   components:
   - type: Emag
+    emagImmuneTag: AccessBreakerImmune
     emagType: Access
   - type: Sprite
     sprite: Objects/Tools/access_breaker.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index a55c020825..dfe2150666 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -630,7 +630,7 @@
       - cheap
   - type: ComponentToggler
     components:
-    - type: Food
+    - type: Edible # This shouldn't be component toggler, but doesn't work when it's not
   - type: PointLight
     enabled: false
     netsync: false
diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
index 23d7b68d37..78873a8f46 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
@@ -47,6 +47,16 @@
   - type: AutoRecharge
     rechargeDuration: 1
 
+- type: entity
+  parent: SprayPainter
+  name: experimental spray painter
+  description: An experimental recharging spray painter that can infinitely replicate compressed paint.
+  id: SprayPainterBorg
+  suffix: Borg
+  components:
+  - type: AutoRecharge
+    rechargeDuration: 5
+
 - type: entity
   parent: SprayPainter
   id: SprayPainterEmpty
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
index 8de013afff..86e79160bd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: pen
   suffix: Exploding
-  parent: PenEmbeddable
+  parent: Pen
   description: A dark ink pen.
   id: PenExploding
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index ba2b856778..3862918e38 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -89,3 +89,7 @@
   - type: CartridgeAmmo
     proto: BulletPistol
     spent: true
+  - type: Tag
+    tags:
+    - CartridgePistol
+    - Trash # surely theres a way to automatically add this...
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index ebea6dde5e..02ccd1a83b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -149,15 +149,9 @@
     solutions:
       ammo:
         maxVol: 15
-  - type: RefillableSolution
-    solution: ammo
-  - type: DrainableSolution
-    solution: ammo
   - type: SolutionInjectOnProjectileHit
     transferAmount: 15
     solution: ammo
-  - type: InjectableSolution
-    solution: ammo
 
 - type: entity
   id: PelletShotgunFlare
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
index 65535223d9..8222481e92 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
@@ -38,10 +38,10 @@
         type: TransferAmountBoundUserInterface
   - type: DrawableSolution
     solution: chamber
-  - type: RefillableSolution
-    solution: chamber
   - type: DrainableSolution
     solution: chamber
+  - type: RefillableSolution
+    solution: chamber
   - type: ExaminableSolution
     solution: chamber
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index bd532ce709..2ab9141c76 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -611,6 +611,7 @@
     slots:
     - Belt
   - type: Gun
+    fireRate: 0.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser.ogg
   - type: ProjectileBatteryAmmoProvider
@@ -880,6 +881,7 @@
   - type: Tag
     tags:
     - HighRiskItem
+    - Sidearm
   - type: StealTarget
     stealGroup: WeaponEnergyMagnum
   - type: Gun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
index 3f9a2d5435..0a577b51db 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
@@ -45,7 +45,7 @@
     solutions:
       ammo:
         maxVol: 2
-  - type: RefillableSolution
+  - type: RefillableSolution # This is sus. You can't really just run an arrowhead under a sink faucet.
     solution: ammo
   - type: InjectableSolution
     solution: ammo
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 89db3240be..bc3e8f383c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -16,125 +16,145 @@
       - HideContextMenu
   - type: AnimationPlayer
 
-- type: hitscan
-  id: RedLaser
-  damage:
-    types:
-      Heat: 14
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_laser
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: beam
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_laser
+- type: entity
+  id: BasicHitscan
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanAmmo
+  - type: HitscanBasicRaycast
+  - type: HitscanBasicVisuals
+    muzzleFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: muzzle_laser
+    travelFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: beam
+    impactFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: impact_laser
+  - type: HitscanReflect
+  - type: HitscanBasicEffects
 
-- type: hitscan
-  id: RedLaserPractice
-  damage:
-    types:
-      Heat: 1
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_laser
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: beam
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_laser
-
-- type: hitscan
-  id: RedMediumLaser
-  damage:
-    types:
-      Heat: 17
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_laser
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: beam
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_laser
-
-- type: hitscan
+- type: entity
+  parent: BasicHitscan
   id: RedLightLaser
-  damage:
-    types:
-      Heat: 7
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_laser
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: beam
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_laser
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 7
 
-- type: hitscan
-  id: XrayLaser
-  damage:
-    types:
-      Heat: 10
-      Radiation: 10
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_xray
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: xray
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_xray
+- type: entity
+  parent: BasicHitscan
+  id: RedLaser
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 14
 
-- type: hitscan
+- type: entity
+  parent: BasicHitscan
+  id: RedMediumLaser
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 17
+
+- type: entity
+  parent: BasicHitscan
   id: RedHeavyLaser
-  damage:
-    types:
-      Heat: 28
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_beam_heavy
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: beam_heavy
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_beam_heavy
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 28
+  - type: HitscanBasicVisuals
+    muzzleFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: muzzle_beam_heavy
+    travelFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: beam_heavy
+    impactFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: impact_beam_heavy
 
-- type: hitscan
+- type: entity
+  parent: BasicHitscan
+  id: RedLaserPractice
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 1
+
+- type: entity
+  parent: BasicHitscan
+  id: XrayLaser
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 10
+        Radiation: 10
+  - type: HitscanBasicVisuals
+    muzzleFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: muzzle_xray
+    travelFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: xray
+    impactFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: impact_xray
+
+- type: entity
+  parent: BasicHitscan
   id: Pulse
-  damage:
-    types:
-      Heat: 35
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_blue
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: beam_blue
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_blue
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 35
+  - type: HitscanBasicVisuals
+    muzzleFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: muzzle_blue
+    travelFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: beam_blue
+    impactFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: impact_blue
 
-- type: hitscan
+- type: entity
+  parent: BasicHitscan
   id: RedShuttleLaser
-  maxLength: 60
-  damage:
-    types:
-      Heat: 45
-      Structural: 10
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_beam_heavy2
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: beam_heavy2
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_beam_heavy2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicRaycast
+    maxDistance: 60.0
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 45
+        Structural: 10
+  - type: HitscanBasicVisuals
+    muzzleFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: muzzle_beam_heavy2
+    travelFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: beam_heavy2
+    impactFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: impact_beam_heavy2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 74f546c61d..bc9f40f85a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -227,7 +227,8 @@
     lifetime: 0.170 # Very short range
   - type: StunOnCollide
     stunAmount: 0
-    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun batong
+    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun baton
+    drop: false #Ranged KD and item drop are too strong in one package
     slowdownAmount: 2.5
     walkSpeedModifier: 0.5
     sprintSpeedModifier: 0.5
@@ -255,6 +256,7 @@
     lifetime: 1.0 # Not so short range
   - type: StunOnCollide
     stunAmount: 5
+    drop: true # this is the evil taser
     knockdownAmount: 10
     slowdownAmount: 10
     walkSpeedModifier: 0.5
diff --git a/Resources/Prototypes/Entities/StatusEffects/movement.yml b/Resources/Prototypes/Entities/StatusEffects/movement.yml
index 71142af434..07d4faed9c 100644
--- a/Resources/Prototypes/Entities/StatusEffects/movement.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/movement.yml
@@ -8,11 +8,32 @@
     whitelist:
       components:
       - MobState
+      - MovementSpeedModifier
+      requireAll: true
     blacklist:
       tags:
       - SlowImmune
   - type: MovementModStatusEffect
 
+- type: entity
+  parent: MobStatusEffectBase
+  id: StatusEffectSpeed
+  abstract: true
+  name: speed
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - MobState
+      - MovementSpeedModifier
+      requireAll: true
+  - type: MovementModStatusEffect
+
+- type: entity
+  parent: StatusEffectSpeed
+  id: ReagentSpeedStatusEffect
+  name: reagent speed
+
 - type: entity
   parent: StatusEffectSlowdown
   id: VomitingSlowdownStatusEffect
diff --git a/Resources/Prototypes/Entities/StatusEffects/speech.yml b/Resources/Prototypes/Entities/StatusEffects/speech.yml
index 17e533b1a8..1fe13c4626 100644
--- a/Resources/Prototypes/Entities/StatusEffects/speech.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/speech.yml
@@ -25,3 +25,11 @@
   name: slurred
   components:
   - type: SlurredAccent
+
+# Causes words your be to scrambled. Who?
+- type: entity
+  parent: SpeechStatusEffectBase
+  id: StatusEffectScrambled
+  name: scrambled
+  components:
+  - type: ScrambledAccent
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
index eb575efb67..883bd32c4a 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
@@ -135,6 +135,21 @@
     graph: Curtains
     node: CurtainsBlue
 
+- type: entity
+  id: CurtainsSkyBlue
+  parent: BaseCurtains
+  suffix: Fancy sky blue
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/skyblue.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsSkyBlue
+
 - type: entity
   id: CurtainsBlueOpen
   parent: CurtainsBlue
@@ -150,6 +165,21 @@
   - type: Physics
     canCollide: false
 
+- type: entity
+  id: CurtainsSkyBlueOpen
+  parent: CurtainsSkyBlue
+  suffix: Open, Fancy sky blue
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsSkyBlueOpen
+  - type: Physics
+    canCollide: false
+
 - type: entity
   id: CurtainsCyan
   parent: BaseCurtains
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 879018d038..3da6805db2 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -1286,10 +1286,19 @@
 #Airtight hatch
 
 - type: entity
-  parent: AirlockHatch
-  id: AirlockHatchSyndicate
+  parent: AirlockHatchSyndicate
+  id: AirlockHatchSyndicateLocked
   suffix: Syndicate, Locked
   components:
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsSyndicateAgent ]
+
+- type: entity
+  parent: AirlockHatchMaintenance
+  id: AirlockHatchMaintenanceLocked
+  suffix: Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMaintenance ]
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index 76d98f96d2..52747a3f27 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -180,6 +180,15 @@
   - type: Paintable
     group: null
 
+- type: entity
+  parent: Airlock
+  id: AirlockHatchSyndicate
+  name: airtight hatch
+  suffix: Syndicate
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi
+
 # Glass
 - type: entity
   parent: AirlockGlass
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index b91999cc60..0c207f95e4 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -45,6 +45,10 @@
       shader: unshaded
       visible: false
       map: ["enum.ElectrifiedLayers.Sparks"]
+    - state: sparks
+      map: ["enum.DoorVisualLayers.BaseEmagging"]
+      shader: unshaded
+      visible: false
   - type: AnimationPlayer
   - type: Physics
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
index 2d39d01633..01effa056b 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
@@ -42,6 +42,10 @@
       shader: unshaded
       visible: false
       map: ["enum.ElectrifiedLayers.Sparks"]
+    - state: sparks
+      map: ["enum.DoorVisualLayers.BaseEmagging"]
+      shader: unshaded
+      visible: false
   - type: AnimationPlayer
   - type: Physics
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index c467f5297d..e46d95489c 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -31,6 +31,33 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/shuttle.rsi
     snapCardinals: false
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+    - state: closed_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
+    - state: welded
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: bolted_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseBolted"]
+    - state: emergency_unlit
+      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
+      shader: unshaded
+    - state: panel_open
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - state: electrified_ai
+      sprite: Interface/Misc/ai_hud.rsi
+      shader: unshaded
+      visible: false
+      map: ["enum.ElectrifiedLayers.HUD"]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: ["enum.ElectrifiedLayers.Sparks"]
   - type: Wires
     layoutId: Docking
   - type: Door
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index ce331499ab..307a0724c1 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -57,6 +57,10 @@
       shader: unshaded
       visible: false
       map: ["enum.ElectrifiedLayers.Sparks"]
+    - state: sparks
+      map: ["enum.DoorVisualLayers.BaseEmagging"]
+      shader: unshaded
+      visible: false
   - type: AnimationPlayer
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
@@ -208,6 +212,10 @@
       shader: unshaded
       visible: false
       map: [ "enum.ElectrifiedLayers.Sparks" ]
+    - state: sparks
+      map: ["enum.DoorVisualLayers.BaseEmagging"]
+      shader: unshaded
+      visible: false
   - type: Damageable
     damageModifierSet: RGlass
   - type: Destructible
@@ -279,6 +287,10 @@
       shader: unshaded
       visible: false
       map: [ "enum.ElectrifiedLayers.Sparks" ]
+    - state: sparks
+      map: ["enum.DoorVisualLayers.BaseEmagging"]
+      shader: unshaded
+      visible: false
   - type: Destructible
     thresholds:
     - trigger:
@@ -345,6 +357,10 @@
       shader: unshaded
       visible: false
       map: [ "enum.ElectrifiedLayers.Sparks" ]
+    - state: sparks
+      map: ["enum.DoorVisualLayers.BaseEmagging"]
+      shader: unshaded
+      visible: false
   - type: Destructible
     thresholds:
     - trigger:
@@ -416,6 +432,10 @@
       shader: unshaded
       visible: false
       map: [ "enum.ElectrifiedLayers.Sparks" ]
+    - state: sparks
+      map: ["enum.DoorVisualLayers.BaseEmagging"]
+      shader: unshaded
+      visible: false
   - type: Destructible
     thresholds:
     - trigger:
@@ -482,6 +502,10 @@
       shader: unshaded
       visible: false
       map: [ "enum.ElectrifiedLayers.Sparks" ]
+    - state: sparks
+      map: ["enum.DoorVisualLayers.BaseEmagging"]
+      shader: unshaded
+      visible: false
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
index cc8fd35f32..b36b88d5ac 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
@@ -6,6 +6,33 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Windoors/clockwork_windoor.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+    - state: closed_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
+    - 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"]
+    - state: electrified_ai
+      sprite: Interface/Misc/ai_hud.rsi
+      shader: unshaded
+      visible: false
+      map: ["enum.ElectrifiedLayers.HUD"]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: ["enum.ElectrifiedLayers.Sparks"]
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index fda2ac5e18..f90f20db35 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -756,6 +756,21 @@
   - type: IconSmooth
     key: fancytableblue
 
+- type: entity
+  id: TableFancySkyBlue
+  parent: TableFancyBase
+  suffix: SkyBlue
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/skyblue.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/skyblue.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancySkyBlue
+  - type: IconSmooth
+    key: fancytableskyblue
+
 - type: entity
   id: TableFancyCyan
   parent: TableFancyBase
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
index b6e6a7ca9a..5186598aa2 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
@@ -20,6 +20,14 @@
   - type: Physics
     canCollide: false
   - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 5
+        layer:
+        - DoorPassable
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -351,7 +359,8 @@
     sprite: Structures/Furniture/Carpets/chapel_carpet.rsi
     state: chapel
   - type: Tag
-    tags: [ Carpet ]
+    tags:
+    - Carpet
   - type: Physics
     canCollide: false
   - type: Fixtures
@@ -422,4 +431,4 @@
     spawned:
     - id: MaterialCardboard1
       amount: 1
-  - type: TrayScanReveal
\ No newline at end of file
+  - type: TrayScanReveal
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
index 135783a452..ce312e6fe6 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -33,7 +33,7 @@
           shape:
             !type:PhysShapeCircle
             radius: 0.35
-          density: 80
+          density: 20
           mask:
           - MobMask
     - type: Damageable
@@ -109,7 +109,6 @@
     - state: cheap_rollerbed_buckled
       map: ["buckledLayer"]
       visible: false
-  - type: Appearance
 
 - type: entity
   parent: CheapRollerBed
@@ -139,7 +138,6 @@
     - state: emergency_rollerbed_buckled
       map: ["buckledLayer"]
       visible: false
-  - type: Appearance
 
 - type: entity
   parent: EmergencyRollerBed
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 90c450e1c7..9a9bbd9a7d 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -129,7 +129,6 @@
 
 # so theres not actually any way to replenish the gastrotoxin / gold in these.
 # I wouldn't add it to the solutionregeneration comp because that doesn't make a lot of sense imo.
-# I guess we just need to add shitting?
 - type: entity
   parent: ToiletEmpty
   id: ToiletDirtyWater
@@ -147,6 +146,30 @@
         - ReagentId: GastroToxin
           Quantity: 20
 
+- type: entity
+  parent: ToiletEmpty
+  id: ToiletFilled
+  suffix: Empty, Random Cistern Loot
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      stash: !type:NestedSelector
+        tableId: ToiletCisternLoot
+        rolls: !type:RangeNumberSelector
+          range: 0, 1
+
+- type: entity
+  parent: ToiletDirtyWater
+  id: ToiletDirtyWaterFilled
+  suffix: Dirty Water, Random Cistern Loot
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      stash: !type:NestedSelector
+        tableId: ToiletCisternLoot
+        rolls: !type:RangeNumberSelector
+          range: 0, 1
+
 - type: entity
   parent: BaseToilet
   id: ToiletGoldenEmpty
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 3b151c5ea5..c23c126c73 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -133,14 +133,14 @@
     - ToyMouse
     - ToyAi
     - ToyNuke
-    - ToyGriffin
+    - ToyFigurineGriffin
     - ToyHonk
     - ToyIan
     - ToyMarauder
     - ToyMauler
     - ToyGygax
     - ToyOdysseus
-    - ToyOwlman
+    - ToyFigurineOwlman
     - ToyDeathRipley
     - ToyPhazon
     - ToyFireRipley
@@ -148,7 +148,7 @@
     - ToyRipley
     - ToySeraph
     - ToyDurand
-    - ToySkeleton
+    - ToyFigurineSkeleton
     - ToySword
     - ToyAmongPequeno
     - ToyRubberDuck
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index c576218763..f75c4e5374 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -559,7 +559,7 @@
     color: "#b53ca1"
   - type: GuideHelp
     guides:
-    - Xenoarchaeology
+    - AnalysisConsole
 
 - type: entity
   parent: BaseComputerAiAccess
@@ -617,9 +617,6 @@
     radius: 1.5
     energy: 1.6
     color: "#3c5eb5"
-  - type: Tag
-    tags:
-    - AccessBreakerImmune
   - type: ItemSlots
   - type: ContainerContainer
     containers:
@@ -1720,4 +1717,4 @@
       enum.StationAiFixerConsoleUiKey.Key:
         type: StationAiFixerConsoleBoundUserInterface
       enum.WiresUiKey.Key:
-        type: WiresBoundUserInterface
\ No newline at end of file
+        type: WiresBoundUserInterface
diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
index 0ee462a5ae..6236f3263d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -150,6 +150,7 @@
   placement:
     mode: SnapgridCenter
   components:
+    - type: InteractionOutline
     - type: Transform
       anchored: true
       noRot: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 7b3cc96ad4..8242c9e813 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -587,6 +587,10 @@
     staticPacks:
     - BioGenIngredientsStatic
     - BioGenMaterialsStatic
+  - type: EmagLatheRecipes
+    emagStaticPacks:
+    - BioGenEmagStatic
+    - HostileCubesStatic
 
 - type: entity
   parent: BaseLathe
diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
index 26bc5d52bb..dc9ad5fafa 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -114,6 +114,7 @@
       collection: MetalThud
   - type: ExplosionResistance
     damageCoefficient: 0.1
+  - type: Airtight
 
 - type: entity
   parent: SmartFridge
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index a4841034d6..8448b9aca8 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1228,8 +1228,9 @@
 - type: entity
   parent: VendingMachine
   id: VendingMachineSovietSoda
-  name: BODA
+  name: ВОДА
   description: An old vending machine containing sweet water.
+  suffix: VODA
   components:
   - type: VendingMachine
     pack: BodaInventory
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index 0ac2d9a35b..15e52a6048 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -516,10 +516,13 @@
   components:
   - type: Sprite
     sprite: Structures/Machines/gasrecycler.rsi
+    snapCardinals: true
+    granularLayersRendering: true
     layers:
     - sprite: Structures/Piping/Atmospherics/pipe.rsi
       state: pipeBinaryConnectors
       map: [ "enum.PipeVisualLayers.Pipe" ]
+      renderingStrategy: Default
     - state: running
     - state: unlit
       shader: unshaded
@@ -575,6 +578,12 @@
     board: GasRecyclerMachineCircuitboard
   - type: AtmosMonitoringConsoleDevice
     navMapBlip: GasValve
+  - type: Transform
+    noRot: false
+  - type: GuideHelp
+    guides:
+    - GasRecycling
+  - type: TegCirculator
 
 - type: entity
   parent: GasBinaryBase
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index 973bd6e119..bf04eaaab4 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -13,6 +13,9 @@
   - type: InteractionOutline
   - type: Transform
     anchored: true
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Metallic
   - type: Physics
     bodyType: Static
   - type: Fixtures
@@ -68,9 +71,6 @@
   - type: Sprite
     sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_panel_plasma
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
@@ -111,9 +111,6 @@
   - type: Sprite
     sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_panel_uranium
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
@@ -150,9 +147,6 @@
     supplyRampTolerance: 500
     supplyRampRate: 500
   - type: SolarPanel
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
@@ -189,9 +183,6 @@
   components:
   - type: Sprite
     state: solar_panel_glass_broken
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
@@ -230,9 +221,6 @@
   components:
   - type: Sprite
     state: solar_panel_plasma_broken
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
@@ -271,9 +259,6 @@
   components:
   - type: Sprite
     state: solar_panel_uranium_broken
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
index 1e39a3b29f..c80ff8eb70 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
@@ -102,6 +102,69 @@
       visible: false
       offset: 0, 1
 
+- type: entity
+  id: ThrusterLarge
+  name: large thruster
+  parent: [ BaseThruster]
+  placement:
+    mode: AlignTileAny
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1800
+      behaviors:
+        - !type:DoActsBehavior
+          acts: ["Destruction"]
+    - trigger:
+        !type:DamageTrigger
+        damage: 900
+      behaviors:
+        - !type:DoActsBehavior
+          acts: ["Destruction"]
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalBreak
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-1.45,1.45,0.45"
+        density: 1750
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+  - type: ApcPowerReceiver
+    powerLoad: 10000
+  - type: Thruster
+    thrust: 1600
+    burnShape: ["-0.3,0.5","0.2,1.6","0.8,1.6","1.3,0.5"]
+    damage:
+      types:
+        Heat: 120
+  - type: Sprite
+    sprite: Structures/Shuttles/thruster_large.rsi
+    offset: 0.5,-0.5
+    layers:
+    - state: base
+      map: ["enum.ThrusterVisualLayers.Base"]
+    - state: thrust
+      map: ["enum.ThrusterVisualLayers.ThrustOn"]
+      shader: unshaded
+      visible: false
+    - state: thrust_burn_unshaded
+      map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"]
+      shader: unshaded
+      visible: false
+      offset: 0, 2
+  - type: Anchorable
+    flags: None
+  - type: StaticPrice
+    price: 1500
+
 - type: entity
   id: ThrusterUnanchored
   parent: Thruster
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
index 0ad1aa17f4..a94074489e 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
@@ -59,6 +59,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: fire_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: fire_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: fire_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -91,6 +97,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: shock_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: shock_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: shock_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -123,6 +135,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: shadow_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: shadow_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: shadow_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -155,6 +173,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: frost_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: frost_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: frost_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -187,6 +211,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: flora_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: flora_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: flora_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -219,6 +249,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: bluespace_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: bluespace_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: bluespace_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -251,6 +287,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: flesh_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: flesh_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: flesh_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -284,6 +326,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: grav_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: grav_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: grav_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -316,6 +364,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: tech_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: tech_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: tech_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
@@ -349,6 +403,12 @@
           Vox:
             sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
             state: rock_VOX
+          Arachnid:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: rock_ARACHNID
+          Moth:
+            sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi
+            state: rock_MOTH
 
 - type: entity
   parent: BaseAnomalyInjector
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
index 68d015d0de..9a5cbbce15 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
@@ -25,10 +25,6 @@
       Ammonia: stationAmmonia
       NitrousOxide: stationNO
       Frezon: danger
-  - type: Tag
-    tags:
-      - AirSensor
-      - ForceFixRotations
   - type: GuideHelp
     guides:
     - DeviceMonitoringAndControl
@@ -90,6 +86,10 @@
         enum.PowerDeviceVisualLayers.Powered:
           True: { state: gsensor1 }
           False: { state: gsensor0 }
+  - type: Tag
+    tags:
+    - AirSensor
+    - ForceFixRotations
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml
index 2a7e96ae62..770d87fd1d 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml
@@ -38,8 +38,6 @@
       solutions:
         drainBuffer:
           maxVol: 1000
-    - type: DrainableSolution
-      solution: drainBuffer
     - type: Damageable
       damageContainer: StructuralInorganic
       damageModifierSet: StructuralMetallic
diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
index 0cc93a4fcf..f1ce706847 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@@ -1,8 +1,11 @@
 - type: entity
-  parent: [BaseStructureDynamic, BaseItemCabinetGlass]
+  parent: BaseStructureDynamic
   id: BaseGlassBox
   abstract: true
   components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Storage/glassbox.rsi
   - type: Transform
     anchored: true
   - type: Physics
@@ -24,20 +27,18 @@
     delay: 4
 
 - type: entity
+  parent: [BaseGlassBox, BaseItemCabinetGlass]
   id: GlassBox
   name: glass box
   description: A sturdy showcase for an expensive exhibit.
-  parent: BaseGlassBox
   abstract: true # TODO: Temporarily abstract. Remove it after item scaling in cabinets is implemented.
   components:
   - type: Sprite
-    noRot: true
-    sprite: Structures/Storage/glassbox.rsi
     layers:
     - state: base
     - state: caplaser # TODO: Remove it after item scaling in cabinets is implemented.
       map: ["enum.ItemCabinetVisuals.Layer"]
-      visible: true
+      visible: false
     - state: glass
       map: ["enum.OpenableVisuals.Layer"]
     - state: locked
@@ -116,8 +117,8 @@
         acts: [ "Destruction" ]
 
 - type: entity
-  id: GlassBoxLaser
   parent: GlassBox
+  id: GlassBoxLaser
   suffix: AntiqueLaser
   components:
   - type: AccessReader
@@ -135,8 +136,8 @@
         ejectSound: /Audio/Machines/machine_switch.ogg
 
 - type: entity
-  id: GlassBoxLaserOpen
   parent: GlassBoxLaser
+  id: GlassBoxLaserOpen
   suffix: AntiqueLaser, Open
   components:
   - type: Openable
@@ -145,8 +146,8 @@
     locked: false
 
 - type: entity
-  id: GlassBoxLaserFilled
   parent: GlassBoxLaser
+  id: GlassBoxLaserFilled
   suffix: AntiqueLaser, Filled
   components:
   - type: ContainerFill
@@ -160,15 +161,13 @@
   suffix: AntiqueLaser, Filled, Open
 
 - type: entity
+  parent: BaseGlassBox
   id: GlassBoxFrame
   name: glass box frame
   description: A glassless sturdy showcase for an expensive exhibit.
-  parent: BaseGlassBox
   suffix: Frame
   components:
   - type: Sprite
-    noRot: true
-    sprite: Structures/Storage/glassbox.rsi
     layers:
     - state: base
   - type: Construction
@@ -204,14 +203,13 @@
         acts: ["Destruction"]
 
 - type: entity
+  parent: GlassBoxFrame
   id: GlassBoxBroken
   name: broken glass box
   description: A broken showcase for a stolen expensive exhibit.
-  parent: GlassBoxFrame
   suffix: Broken
   components:
   - type: Sprite
-    sprite: Structures/Storage/glassbox.rsi
     layers:
     - state: base
     - state: glass-broken
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index 3837448fc0..aceb8dc4f8 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -1131,6 +1131,15 @@
   - type: Sprite
     state: poster55_legit
 
+- type: entity
+  parent: PosterBase
+  id: PosterLegitBotanyFear
+  name: "Fear of hydroponics"
+  description: "Think three times before opening the airlock to hydroponics, a red threat might be hiding there."
+  components:
+  - type: Sprite
+    state: poster56_legit
+
 #maps
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/soil.yml b/Resources/Prototypes/Entities/Structures/soil.yml
index 725ab0c6ff..276b053157 100644
--- a/Resources/Prototypes/Entities/Structures/soil.yml
+++ b/Resources/Prototypes/Entities/Structures/soil.yml
@@ -52,7 +52,8 @@
     - reagents: [Water]
       methods: [Touch, Ingestion, Injection]
       effects:
-      - !type:AddToSolutionReaction
+      - !type:AddReagentToSolution
+        reagent: Water
         solution: soil
   - type: Appearance
   - type: PlantHolderVisuals
diff --git a/Resources/Prototypes/Entities/Structures/spider_web.yml b/Resources/Prototypes/Entities/Structures/spider_web.yml
index 962b5adbbd..73e5f5f032 100644
--- a/Resources/Prototypes/Entities/Structures/spider_web.yml
+++ b/Resources/Prototypes/Entities/Structures/spider_web.yml
@@ -127,7 +127,7 @@
   - type: FlavorProfile
     flavors:
       - sweet
-  - type: Food
+  - type: Edible
     delay: 2
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 10a09116ad..84907318de 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -17,7 +17,7 @@
         - Catwalk
   - type: TileEntityEffect
     effects:
-    - !type:FlammableReaction
+    - !type:Flammable
       multiplier: 3.75
       multiplierOnExisting: 0.75
     - !type:Ignite
diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index ade23b6f71..8d1881375b 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -17,7 +17,7 @@
       - Catwalk
   - type: TileEntityEffect
     effects:
-    - !type:FlammableReaction
+    - !type:Flammable
       multiplier: 3.75
       multiplierOnExisting: 0.75
     - !type:Ignite
diff --git a/Resources/Prototypes/Entities/Tiles/water.yml b/Resources/Prototypes/Entities/Tiles/water.yml
index c488df231b..a4478b5e58 100644
--- a/Resources/Prototypes/Entities/Tiles/water.yml
+++ b/Resources/Prototypes/Entities/Tiles/water.yml
@@ -20,7 +20,7 @@
   - type: SolutionContainerManager
     solutions:
       pool:
-        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
+        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable.
         reagents:
         - ReagentId: Water
           Quantity: 9999999
@@ -62,4 +62,4 @@
         - Catwalk
   - type: TileEntityEffect
     effects:
-    - !type:ExtinguishReaction
+    - !type:Extinguish
diff --git a/Resources/Prototypes/Guidebook/engineering.yml b/Resources/Prototypes/Guidebook/engineering.yml
index 24dc623086..f26d587d0d 100644
--- a/Resources/Prototypes/Guidebook/engineering.yml
+++ b/Resources/Prototypes/Guidebook/engineering.yml
@@ -64,6 +64,7 @@
   - GasCanisters
   - Thermomachines
   - GasCondensing
+  - GasRecycling
 
 - type: guideEntry
   id: Pipes
@@ -169,6 +170,11 @@
   name: guide-entry-gascondensing
   text: "/ServerInfo/Guidebook/Engineering/GasCondensing.xml"
 
+- type: guideEntry
+  id: GasRecycling
+  name: guide-entry-gasrecycling
+  text: "/ServerInfo/Guidebook/Engineering/GasRecycling.xml"
+
 - type: guideEntry
   id: Radiators
   name: guide-entry-radiators
diff --git a/Resources/Prototypes/Guidebook/references.yml b/Resources/Prototypes/Guidebook/references.yml
index c7413892a0..ad96a2581a 100644
--- a/Resources/Prototypes/Guidebook/references.yml
+++ b/Resources/Prototypes/Guidebook/references.yml
@@ -8,6 +8,7 @@
   - Drinks
   - FoodRecipes
   - Writing
+  - Lawsets
 
 - type: guideEntry
   id: Drinks
@@ -132,4 +133,8 @@
   name: guide-entry-writing
   text: "/ServerInfo/Guidebook/Writing.xml"
 
-
+- type: guideEntry
+  id: Lawsets
+  name: guide-entry-lawsets
+  text: "/ServerInfo/Guidebook/ReferenceTables/Lawsets.xml"
+  filterEnabled: True
diff --git a/Resources/Prototypes/Guidebook/science.yml b/Resources/Prototypes/Guidebook/science.yml
index 2c3018dcee..ba2d1cf7b2 100644
--- a/Resources/Prototypes/Guidebook/science.yml
+++ b/Resources/Prototypes/Guidebook/science.yml
@@ -37,7 +37,18 @@
   name: guide-entry-xenoarchaeology
   text: "/ServerInfo/Guidebook/Science/Xenoarchaeology.xml"
   children:
-  - ArtifactReports
+    - AnalysisConsole
+    - XenoarchaeologyUnlockingNodes
+
+- type: guideEntry
+  id: XenoarchaeologyUnlockingNodes
+  name: guide-entry-xenoarchaeologyunlockingnodes
+  text: "/ServerInfo/Guidebook/Science/UnlockingNodes.xml"
+
+- type: guideEntry
+  id: AnalysisConsole
+  name: guide-entry-analysisconsole
+  text: "/ServerInfo/Guidebook/Science/AnalysisConsole.xml"
 
 - type: guideEntry
   id: Robotics
@@ -46,11 +57,6 @@
   children:
   - Cyborgs
 
-- type: guideEntry
-  id: ArtifactReports
-  name: guide-entry-artifact-reports
-  text: "/ServerInfo/Guidebook/Science/ArtifactReports.xml"
-
 - type: guideEntry
   id: Cyborgs
   name: guide-entry-cyborgs
diff --git a/Resources/Prototypes/Hydroponics/randomMutations.yml b/Resources/Prototypes/Hydroponics/randomMutations.yml
index 1120c38f31..2d45601da9 100644
--- a/Resources/Prototypes/Hydroponics/randomMutations.yml
+++ b/Resources/Prototypes/Hydroponics/randomMutations.yml
@@ -21,7 +21,7 @@
     - name: ChangeSpecies
       baseOdds: 0.036
       appliesToProduce: false
-      effect: !type:PlantSpeciesChange
+      effect: !type:PlantMutateSpeciesChange
       persists: false
     - name: Unviable
       baseOdds: 0.109
@@ -175,11 +175,11 @@
     - name: ChangeExudeGasses
       baseOdds: 0.0145
       persists: false
-      effect: !type:PlantMutateExudeGasses
+      effect: !type:PlantMutateExudeGases
     - name: ChangeConsumeGasses
       baseOdds: 0.0036
       persists: false
-      effect: !type:PlantMutateConsumeGasses
+      effect: !type:PlantMutateConsumeGases
     - name: ChangeHarvest
       baseOdds: 0.036
       persists: false
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
new file mode 100644
index 0000000000..fd674b1901
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml
@@ -0,0 +1,457 @@
+# Job-specific trinkets
+
+- type: loadout
+  id: LizardPlushieCaptain
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobCaptain
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobCaptain
+
+- type: loadout
+  id: LizardPlushieHeadOfPersonnel
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobHeadOfPersonnel
+      time: 72000 # 20hr
+  storage:
+    back:
+      - PlushieLizardJobHeadofpersonnel
+
+- type: loadout
+  id: LizardPlushiePassenger
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobPassenger
+      time: 72000 # 20hr
+  storage:
+    back:
+      - PlushieLizardJobPassenger
+
+- type: loadout
+  id: LizardPlushieBartender
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobBartender
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobBartender
+
+- type: loadout
+  id: LizardPlushieServiceWorker
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobServiceWorker
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobServiceworker
+
+- type: loadout
+  id: LizardPlushieChef
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobChef
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobChef
+
+- type: loadout
+  id: LizardPlushieLibrarian
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobLibrarian
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobLibrarian
+
+- type: loadout
+  id: LizardPlushieLawyer
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobLawyer
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobLawyer
+
+- type: loadout
+  id: LizardPlushieChaplain
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobChaplain
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobChaplain
+
+- type: loadout
+  id: LizardPlushieJanitor
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobJanitor
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobJanitor
+
+- type: loadout
+  id: LizardPlushieBotanist
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobBotanist
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobBotanist
+
+- type: loadout
+  id: LizardPlushieClown
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobClown
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobClown
+
+- type: loadout
+  id: LizardPlushieMime
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobMime
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobMime
+
+- type: loadout
+  id: LizardPlushieMusician
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobMusician
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobMusician
+
+- type: loadout
+  id: LizardPlushieQuartermaster
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobQuartermaster
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobQuartermaster
+
+- type: loadout
+  id: LizardPlushieCargoTechnician
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobCargoTechnician
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobCargotechnician
+
+- type: loadout
+  id: LizardPlushieSalvageSpecialist
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSalvageSpecialist
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobSalvagespecialist
+
+- type: loadout
+  id: LizardPlushieChiefEngineer
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobChiefEngineer
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobChiefengineer
+
+- type: loadout
+  id: LizardPlushieTechnicalAssistant
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Engineering
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobTechnicalassistant
+
+- type: loadout
+  id: LizardPlushieStationEngineer
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobStationEngineer
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobStationengineer
+
+- type: loadout
+  id: LizardPlushieAtmosphericTechnician
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobAtmosphericTechnician
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobAtmospherictechnician
+
+- type: loadout
+  id: LizardPlushieResearchDirector
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobResearchDirector
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobResearchdirector
+
+- type: loadout
+  id: LizardPlushieScientist
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobScientist
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobScientist
+
+- type: loadout
+  id: LizardPlushieResearchAssistant
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Science
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobResearchassistant
+
+- type: loadout
+  id: LizardPlushieHeadofSecurity
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobHeadOfSecurity
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobHeadofsecurity
+
+- type: loadout
+  id: LizardPlushieWarden
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobWarden
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobWarden
+
+- type: loadout
+  id: LizardPlushieDetective
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobDetective
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobDetective
+
+- type: loadout
+  id: LizardPlushieSecurity
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSecurityOfficer
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobSecurityofficer
+
+- type: loadout
+  id: LizardPlushieSecurityCadet
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Security
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobSecuritycadet
+
+- type: loadout
+  id: LizardPlushieChiefMedicalOfficer
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobChiefMedicalOfficer
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobChiefmedicalofficer
+
+- type: loadout
+  id: LizardPlushieMedicalDoctor
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobMedicalDoctor
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobMedicaldoctor
+
+- type: loadout
+  id: LizardPlushieMedicalIntern
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Medical
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobMedicalintern
+
+- type: loadout
+  id: LizardPlushieChemist
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobChemist
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobChemist
+
+- type: loadout
+  id: LizardPlushieParamedic
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobParamedic
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobParamedic
+
+- type: loadout
+  id: LizardPlushieReporter
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobReporter
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobReporter
+
+- type: loadout
+  id: LizardPlushiePsychologist
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobPsychologist
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobPsychologist
+
+- type: loadout
+  id: LizardPlushieBoxer
+  effects:
+    - !type:JobRequirementLoadoutEffect
+      requirement:
+        !type:RoleTimeRequirement
+        role: JobBoxer
+        time: 72000 # 20hr
+  storage:
+    back:
+      - PlushieLizardJobBoxer
+
+- type: loadout
+  id: LizardPlushieZookeeper
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobZookeeper
+      time: 72000 # 20hr
+  storage:
+    back:
+    - PlushieLizardJobZookeeper
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index ca11702c36..9a0466d732 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -172,6 +172,13 @@
   - CaptainOuterClothing
   - CaptainWintercoat
 
+- type: loadoutGroup
+  id: CaptainJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieCaptain
+
 - type: loadoutGroup
   id: HoPHead
   name: loadout-group-hop-head
@@ -214,6 +221,13 @@
   loadouts:
   - HoPWintercoat
 
+- type: loadoutGroup
+  id: HoPJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieHeadOfPersonnel
+
 # Civilian
 - type: loadoutGroup
   id: PassengerJumpsuit
@@ -268,6 +282,13 @@
   - BlackShoes
   - WinterBoots
 
+- type: loadoutGroup
+  id: PassengerJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushiePassenger
+
 - type: loadoutGroup
   id: BartenderHead
   name: loadout-group-bartender-head
@@ -294,12 +315,20 @@
   - BartenderWintercoat
 
 - type: loadoutGroup
-  id: BartenderGoldenShaker
-  name: loadout-group-bartender-shaker
+  id: BartenderJobTrinkets
+  name: loadout-group-jobtrinkets
   minLimit: 0
   loadouts:
+  - LizardPlushieBartender
   - BartenderGoldenShaker
 
+- type: loadoutGroup
+  id: ServiceWorkerJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieServiceWorker
+
 - type: loadoutGroup
   id: ChefHead
   name: loadout-group-chef-head
@@ -330,6 +359,13 @@
   - ChefJacket
   - ChefWintercoat
 
+- type: loadoutGroup
+  id: ChefJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieChef
+
 - type: loadoutGroup
   id: LibrarianJumpsuit
   name: loadout-group-librarian-jumpsuit
@@ -339,6 +375,13 @@
   - CuratorJumpsuit
   - CuratorJumpskirt
 
+- type: loadoutGroup
+  id: LibrarianJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieLibrarian
+
 - type: loadoutGroup
   id: LawyerJumpsuit
   name: loadout-group-lawyer-jumpsuit
@@ -361,6 +404,13 @@
   loadouts:
   - LawyerNeck
 
+- type: loadoutGroup
+  id: LawyerJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieLawyer
+
 - type: loadoutGroup
   id: ChaplainHead
   name: loadout-group-chaplain-head
@@ -405,6 +455,13 @@
   loadouts:
   - ChaplainNeck
 
+- type: loadoutGroup
+  id: ChaplainJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieChaplain
+
 - type: loadoutGroup
   id: ChaplainBible
   name: loadout-group-chaplain-bible
@@ -454,6 +511,13 @@
   loadouts:
   - JanitorGoldenPlunger
 
+- type: loadoutGroup
+  id: JanitorJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieJanitor
+
 - type: loadoutGroup
   id: BotanistHead
   name: loadout-group-botanist-head
@@ -486,6 +550,13 @@
   - BotanistApron
   - BotanistWintercoat
 
+- type: loadoutGroup
+  id: BotanistJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieBotanist
+
 - type: loadoutGroup
   id: ClownHead
   name: loadout-group-clown-head
@@ -536,6 +607,13 @@
   - EmergencyOxygenClown
   - LoadoutSpeciesVoxNitrogen
 
+- type: loadoutGroup
+  id: ClownJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieClown
+
 - type: loadoutGroup
   id: MimeHead
   name: loadout-group-mime-head
@@ -593,6 +671,13 @@
   - EmergencySpeciesMothMime
   - LoadoutSpeciesVoxNitrogen
 
+- type: loadoutGroup
+  id: MimeJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieMime
+
 - type: loadoutGroup
   id: MusicianJumpsuit
   name: loadout-group-musician-jumpsuit
@@ -642,6 +727,13 @@
   - Ocarina
   - Bagpipe
 
+- type: loadoutGroup
+  id: MusicianJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieMusician
+
 # Cargo
 - type: loadoutGroup
   id: QuartermasterHead
@@ -683,6 +775,13 @@
   - BrownShoes
   - CargoWinterBoots
 
+- type: loadoutGroup
+  id: QuartermasterJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieQuartermaster
+
 - type: loadoutGroup
   id: CargoTechnicianHead
   name: loadout-group-cargo-technician-head
@@ -726,6 +825,13 @@
   - CargoTechnicianPDA
   - SeniorCourierPDA
 
+- type: loadoutGroup
+  id: CargoTechnicianJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieCargoTechnician
+
 - type: loadoutGroup
   id: SalvageSpecialistBackpack
   name: loadout-group-salvage-specialist-backpack
@@ -748,6 +854,13 @@
   - SalvageBoots
   - CargoWinterBoots
 
+- type: loadoutGroup
+  id: SalvageSpecialistJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieSalvageSpecialist
+
 # Engineering
 - type: loadoutGroup
   id: ChiefEngineerHead
@@ -788,6 +901,13 @@
   - BrownShoes
   - EngineeringWinterBoots
 
+- type: loadoutGroup
+  id: ChiefEngineerJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieChiefEngineer
+
 - type: loadoutGroup
   id: TechnicalAssistantJumpsuit
   name: loadout-group-technical-assistant-jumpsuit
@@ -795,6 +915,13 @@
   - YellowJumpsuit
   - YellowJumpskirt
 
+- type: loadoutGroup
+  id: TechnicalAssistantJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieTechnicalAssistant
+
 - type: loadoutGroup
   id: StationEngineerHead
   name: loadout-group-station-engineer-head
@@ -845,6 +972,13 @@
   - StationEngineerPDA
   - SeniorEngineerPDA
 
+- type: loadoutGroup
+  id: StationEngineerJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieStationEngineer
+
 - type: loadoutGroup
   id: AtmosphericTechnicianJumpsuit
   name: loadout-group-atmospheric-technician-jumpsuit
@@ -876,6 +1010,13 @@
   - WhiteShoes
   - EngineeringWinterBoots
 
+- type: loadoutGroup
+  id: AtmosphericTechnicianJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieAtmosphericTechnician
+
 - type: loadoutGroup
   id: SurvivalExtended
   name: loadout-group-survival-extended
@@ -928,6 +1069,13 @@
   - BrownShoes
   - ScienceWinterBoots
 
+- type: loadoutGroup
+  id: ResearchDirectorJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieResearchDirector
+
 - type: loadoutGroup
   id: ScientistHead
   name: loadout-group-scientist-head
@@ -999,6 +1147,13 @@
   - ScientistPDA
   - SeniorResearcherPDA
 
+- type: loadoutGroup
+  id: ScientistJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieScientist
+
 - type: loadoutGroup
   id: ResearchAssistantJumpsuit
   name: loadout-group-research-assistant-jumpsuit
@@ -1006,6 +1161,13 @@
   - WhiteJumpsuit
   - WhiteJumpskirt
 
+- type: loadoutGroup
+  id: ResearchAssistantJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieResearchAssistant
+
 # Security
 - type: loadoutGroup
   id: HeadofSecurityHead
@@ -1046,6 +1208,13 @@
   - HeadofSecurityCoat
   - HeadofSecurityWinterCoat
 
+- type: loadoutGroup
+  id: HeadofSecurityJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieHeadofSecurity
+
 - type: loadoutGroup
   id: WardenHead
   name: loadout-group-warden-head
@@ -1068,6 +1237,13 @@
   - WardenCoat
   - WardenArmoredWinterCoat
 
+- type: loadoutGroup
+  id: WardenJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieWarden
+
 - type: loadoutGroup
   id: SecurityHead
   name: loadout-group-security-head
@@ -1129,6 +1305,13 @@
   - SecurityPDA
   - SeniorOfficerPDA
 
+- type: loadoutGroup
+  id: SecurityJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieSecurity
+
 - type: loadoutGroup
   id: DetectiveHead
   name: loadout-group-detective-head
@@ -1161,6 +1344,13 @@
   - DetectiveCoat
   - DetectiveCoatGrey
 
+- type: loadoutGroup
+  id: DetectiveJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieDetective
+
 - type: loadoutGroup
   id: SecurityCadetJumpsuit
   name: loadout-group-security-cadet-jumpsuit
@@ -1168,6 +1358,13 @@
   - SecurityJumpsuitGrey # Corvax-Resprite
   - SecurityJumpskirtGrey # Corvax-Resprite
 
+- type: loadoutGroup
+  id: SecurityCadetJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieSecurityCadet
+
 - type: loadoutGroup
   id: SurvivalSecurity
   name: loadout-group-survival-security
@@ -1226,6 +1423,13 @@
   - BrownShoes
   - MedicalWinterBoots
 
+- type: loadoutGroup
+  id: ChiefMedicalOfficerJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieChiefMedicalOfficer
+
 - type: loadoutGroup
   id: MedicalDoctorHead
   name: loadout-group-medical-doctor-head
@@ -1297,6 +1501,13 @@
   loadouts:
   - SterileMask
 
+- type: loadoutGroup
+  id: MedicalDoctorJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieMedicalDoctor
+
 - type: loadoutGroup
   id: MedicalInternJumpsuit
   name: loadout-group-medical-intern-jumpsuit
@@ -1304,6 +1515,13 @@
   - WhiteJumpsuit
   - WhiteJumpskirt
 
+- type: loadoutGroup
+  id: MedicalInternJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieMedicalIntern
+
 - type: loadoutGroup
   id: ChemistJumpsuit
   name: loadout-group-chemist-jumpsuit
@@ -1328,6 +1546,13 @@
   - ChemistSatchel
   - ChemistDuffel
 
+- type: loadoutGroup
+  id: ChemistJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieChemist
+
 - type: loadoutGroup
   id: ParamedicHead
   name: loadout-group-paramedic-head
@@ -1358,6 +1583,13 @@
   - WhiteShoes
   - MedicalWinterBoots
 
+- type: loadoutGroup
+  id: ParamedicJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieParamedic
+
 - type: loadoutGroup
   id: MedicalEyewear
   name: loadout-group-medical-glasses
@@ -1387,6 +1619,13 @@
   - ReporterJumpsuit
   - JournalistJumpsuit
 
+- type: loadoutGroup
+  id: ReporterJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieReporter
+
 - type: loadoutGroup
   id: PsychologistJumpsuit
   name: loadout-group-psychologist-jumpsuit
@@ -1394,6 +1633,13 @@
   - PsychologistJumpsuit
   - PsychologistJumpskirt
 
+- type: loadoutGroup
+  id: PsychologistJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushiePsychologist
+
 - type: loadoutGroup
   id: BoxerJumpsuit
   name: loadout-group-boxer-jumpsuit
@@ -1410,6 +1656,20 @@
   - GreenBoxingGloves
   - YellowBoxingGloves
 
+- type: loadoutGroup
+  id: BoxerJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieBoxer
+
+- type: loadoutGroup
+  id: ZookeeperJobTrinkets
+  name: loadout-group-jobtrinkets
+  minLimit: 0
+  loadouts:
+  - LizardPlushieZookeeper
+
 # Other
 - type: loadoutGroup
   id: SurvivalSyndicate
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index bb2dd1bf58..cfec64f73d 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -10,6 +10,7 @@
   - CaptainOuterClothing
   - Survival
   - Trinkets
+  - CaptainJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -25,6 +26,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - HoPJobTrinkets
   - GroupSpeciesBreathTool
 
 # Silicons
@@ -54,6 +56,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - PassengerJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -65,10 +68,10 @@
   - BartenderJumpsuit
   - CommonBackpack
   - BartenderOuterClothing
-  - BartenderGoldenShaker
   - Glasses
   - Survival
   - Trinkets
+  - BartenderJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -81,6 +84,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - ServiceWorkerJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -96,6 +100,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - ChefJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -108,6 +113,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - LibrarianJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -121,6 +127,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - LawyerJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -138,6 +145,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - ChaplainJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -153,6 +161,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - JanitorJobTrinkets
   - JanitorPlunger
   - GroupSpeciesBreathTool
 
@@ -168,6 +177,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - BotanistJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -184,6 +194,7 @@
   - Glasses
   - SurvivalClown
   - Trinkets
+  - ClownJobTrinkets
 
 - type: roleLoadout
   id: JobMime
@@ -200,6 +211,7 @@
   - Glasses
   - SurvivalMime
   - Trinkets
+  - MimeJobTrinkets
 
 - type: roleLoadout
   id: JobMusician
@@ -213,6 +225,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - MusicianJobTrinkets
   - Instruments
   - GroupSpeciesBreathTool
 
@@ -231,6 +244,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - QuartermasterJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -247,6 +261,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - CargoTechnicianJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -260,6 +275,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - SalvageSpecialistJobTrinkets
   - GroupSpeciesBreathTool
 
 # Engineering
@@ -276,6 +292,7 @@
   - ChiefEngineerShoes
   - SurvivalExtended
   - Trinkets
+  - ChiefEngineerJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -287,6 +304,7 @@
   - StationEngineerBackpack
   - SurvivalExtended
   - Trinkets
+  - TechnicalAssistantJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -302,6 +320,7 @@
   - StationEngineerID
   - SurvivalExtended
   - Trinkets
+  - StationEngineerJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -315,6 +334,7 @@
   - AtmosphericTechnicianShoes
   - SurvivalExtended
   - Trinkets
+  - AtmosphericTechnicianJobTrinkets
   - GroupSpeciesBreathTool
 
 # Science
@@ -333,6 +353,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - ResearchDirectorJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -351,6 +372,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - ScientistJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -363,6 +385,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - ResearchAssistantJobTrinkets
   - GroupSpeciesBreathTool
 
 # Security
@@ -379,6 +402,7 @@
   - SecurityShoes
   - SurvivalSecurity
   - Trinkets
+  - HeadofSecurityJobTrinkets
   - SecurityStar
   - GroupSpeciesBreathToolSecurity
 
@@ -394,6 +418,7 @@
   - SecurityShoes
   - SurvivalSecurity
   - Trinkets
+  - WardenJobTrinkets
   - SecurityStar
   - GroupSpeciesBreathToolSecurity
 
@@ -410,6 +435,7 @@
   - SecurityBelt
   - SurvivalSecurity
   - Trinkets
+  - SecurityJobTrinkets
   - SecurityStar
   - GroupSpeciesBreathToolSecurity
 
@@ -425,6 +451,7 @@
   - SecurityShoes
   - SurvivalSecurity
   - Trinkets
+  - DetectiveJobTrinkets
   - SecurityStar
   - GroupSpeciesBreathToolSecurity
 
@@ -436,6 +463,7 @@
   - SecurityBackpack
   - SurvivalSecurity
   - Trinkets
+  - SecurityCadetJobTrinkets
   - GroupSpeciesBreathToolSecurity
 
 # Medical
@@ -455,6 +483,7 @@
   - MedicalEyewear
   - SurvivalMedical
   - Trinkets
+  - ChiefMedicalOfficerJobTrinkets
   - GroupSpeciesBreathToolMedical
 
 - type: roleLoadout
@@ -473,6 +502,7 @@
   - MedicalEyewear
   - SurvivalMedical
   - Trinkets
+  - MedicalDoctorJobTrinkets
   - GroupSpeciesBreathToolMedical
 
 - type: roleLoadout
@@ -485,6 +515,7 @@
   - MedicalEyewear
   - SurvivalMedical
   - Trinkets
+  - MedicalInternJobTrinkets
   - GroupSpeciesBreathToolMedical
 
 - type: roleLoadout
@@ -500,6 +531,7 @@
   - MedicalShoes
   - SurvivalMedical
   - Trinkets
+  - ChemistJobTrinkets
   - GroupSpeciesBreathToolMedical
 
 - type: roleLoadout
@@ -517,6 +549,7 @@
   - MedicalEyewear
   - SurvivalMedical
   - Trinkets
+  - ParamedicJobTrinkets
   - GroupSpeciesBreathToolMedical
 
 # Wildcards
@@ -529,6 +562,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - ZookeeperJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -541,6 +575,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - ReporterJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -553,6 +588,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - PsychologistJobTrinkets
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
@@ -566,6 +602,7 @@
   - Glasses
   - Survival
   - Trinkets
+  - BoxerJobTrinkets
   - GroupSpeciesBreathTool
 
 # These loadouts are used for non-crew spawns, like off-station antags and event mobs
diff --git a/Resources/Prototypes/Magic/mindswap_spell.yml b/Resources/Prototypes/Magic/mindswap_spell.yml
index 0a28a9683b..4fbb1748b7 100644
--- a/Resources/Prototypes/Magic/mindswap_spell.yml
+++ b/Resources/Prototypes/Magic/mindswap_spell.yml
@@ -5,7 +5,7 @@
   description: Exchange bodies with another person!
   components:
   - type: Action
-    useDelay: 300
+    useDelay: 180
     sound: !type:SoundPathSpecifier
       path: /Audio/Magic/staff_animation.ogg
     icon:
diff --git a/Resources/Prototypes/Magic/touch_spells.yml b/Resources/Prototypes/Magic/touch_spells.yml
index f3b44eabb1..5376c2d954 100644
--- a/Resources/Prototypes/Magic/touch_spells.yml
+++ b/Resources/Prototypes/Magic/touch_spells.yml
@@ -94,4 +94,4 @@
   - type: SpeakOnAction
     sentence: action-speech-spell-slip
   - type: Magic
-    requiresClothes: true
+    requiresClothes: false
diff --git a/Resources/Prototypes/NPCs/Combat/melee.yml b/Resources/Prototypes/NPCs/Combat/melee.yml
index 9cbfbe7ca0..e25284bb88 100644
--- a/Resources/Prototypes/NPCs/Combat/melee.yml
+++ b/Resources/Prototypes/NPCs/Combat/melee.yml
@@ -178,3 +178,13 @@
               id: MeleeService
               proto: OrderedTargets
               key: Target
+
+- type: htnCompound
+  id: DoNotEscapeCompound
+  branches:
+  - preconditions:
+    - !type:InFriendlyContainerPrecondition
+      isInFriendlyContainer: true
+    tasks:
+    - !type:HTNPrimitiveTask
+      operator: !type:NoOperator
diff --git a/Resources/Prototypes/NPCs/debug.yml b/Resources/Prototypes/NPCs/debug.yml
index c7929be103..802e6b4b57 100644
--- a/Resources/Prototypes/NPCs/debug.yml
+++ b/Resources/Prototypes/NPCs/debug.yml
@@ -68,7 +68,7 @@
           - !type:KeyFloatLessPrecondition
             key: Count
             value: 50
-      
+
       - !type:HTNPrimitiveTask
           operator: !type:RandomOperator
             targetKey: IdleTime
@@ -85,6 +85,5 @@
     - tasks:
       - !type:HTNPrimitiveTask
         operator: !type:SpeakOperator
-          speech: "fuck!"
-
- 
\ No newline at end of file
+          speech: !type:SingleSpeakOperatorSpeech
+            line: "fuck!"
diff --git a/Resources/Prototypes/NPCs/firebot.yml b/Resources/Prototypes/NPCs/firebot.yml
index 2da9da50d2..b3a62280cc 100644
--- a/Resources/Prototypes/NPCs/firebot.yml
+++ b/Resources/Prototypes/NPCs/firebot.yml
@@ -6,8 +6,8 @@
           task: DouseFireTargetCompound
     - tasks:
         - !type:HTNCompoundTask
-          task: IdleCompound    
-          
+          task: IdleCompound
+
 - type: htnCompound
   id: DouseFireTargetCompound
   branches:
@@ -18,8 +18,9 @@
 
         - !type:HTNPrimitiveTask
           operator: !type:SpeakOperator
-            speech: firebot-fire-detected
-            hidden: true  
+            speech: !type:SingleSpeakOperatorSpeech
+              line: firebot-fire-detected
+            hidden: true
 
         - !type:HTNPrimitiveTask
           operator: !type:MoveToOperator
diff --git a/Resources/Prototypes/NPCs/grenadepenguin.yml b/Resources/Prototypes/NPCs/grenadepenguin.yml
new file mode 100644
index 0000000000..9665ab342d
--- /dev/null
+++ b/Resources/Prototypes/NPCs/grenadepenguin.yml
@@ -0,0 +1,76 @@
+- type: htnCompound
+  id: GrenadePenguinCompound
+  branches:
+  - tasks:
+    - !type:HTNCompoundTask
+      task: GrenadePenguinMeleeCombatPrecondition
+  - tasks:
+    - !type:HTNCompoundTask
+      task: IdleCompound
+
+- type: htnCompound
+  id: GrenadePenguinMeleeCombatPrecondition
+  branches:
+  - preconditions:
+    - !type:BuckledPrecondition
+      isBuckled: true
+    tasks:
+    - !type:HTNPrimitiveTask
+      operator: !type:UnbuckleOperator
+        shutdownState: TaskFinished
+
+  - preconditions:
+    - !type:InFriendlyContainerPrecondition
+      isInFriendlyContainer: true
+    tasks:
+    - !type:HTNCompoundTask
+      task: DoNotEscapeCompound
+
+  - preconditions:
+    - !type:InContainerPrecondition
+      isInContainer: true
+    tasks:
+    - !type:HTNCompoundTask
+      task: EscapeCompound
+
+  - preconditions:
+    - !type:PulledPrecondition
+      isPulled: true
+    tasks:
+    - !type:HTNPrimitiveTask
+      operator: !type:UnPullOperator
+        shutdownState: TaskFinished
+
+  - tasks:
+    - !type:HTNPrimitiveTask
+      operator: !type:UtilityOperator
+        proto: NearbyMeleeTargets
+    - !type:HTNCompoundTask
+      task: GrenadePenguinMeleeCombatCompound
+
+- type: htnCompound
+  id: GrenadePenguinMeleeCombatCompound
+  branches:
+  - preconditions:
+    - !type:KeyExistsPrecondition
+      key: Target
+    tasks:
+    - !type:HTNPrimitiveTask
+      operator: !type:MoveToOperator
+        shutdownState: PlanFinished
+        pathfindInPlanning: true
+        removeKeyOnFinish: false
+        targetKey: TargetCoordinates
+        pathfindKey: TargetPathfind
+        rangeKey: MeleeRange
+    # too angry to juke
+    - !type:HTNPrimitiveTask
+      operator: !type:MeleeOperator
+        targetKey: Target
+      preconditions:
+      - !type:KeyExistsPrecondition
+        key: Target
+      - !type:TargetInRangePrecondition
+        targetKey: Target
+        rangeKey: MeleeRange
+    # no service, no changing target
diff --git a/Resources/Prototypes/NPCs/hugbot.yml b/Resources/Prototypes/NPCs/hugbot.yml
new file mode 100644
index 0000000000..1a56b22b92
--- /dev/null
+++ b/Resources/Prototypes/NPCs/hugbot.yml
@@ -0,0 +1,134 @@
+- type: htnCompound
+  id: HugBotCompound
+  branches:
+  - tasks:
+    - !type:HTNCompoundTask
+      task: HugNearbyCompound
+  - tasks:
+    - !type:HTNCompoundTask
+      task: IdleCompound
+
+- type: htnCompound
+  id: HugNearbyCompound
+  branches:
+  - tasks:
+    # Locate hug recipient.
+    - !type:HTNPrimitiveTask
+      operator: !type:UtilityOperator
+        proto: NearbyNeedingHug
+
+    # Announce intent to hug
+    - !type:HTNPrimitiveTask
+      operator: !type:SpeakOperator
+        speech: !type:LocalizedSetSpeakOperatorSpeech
+          lineSet: HugBotStarts
+        hidden: true
+
+    # Approach hug recipient
+    - !type:HTNPrimitiveTask
+      operator: !type:MoveToOperator
+        pathfindInPlanning: true
+        removeKeyOnFinish: false
+        targetKey: TargetCoordinates
+        pathfindKey: TargetPathfind
+        rangeKey: MeleeRange
+
+    # HUG!!
+    - !type:HTNCompoundTask
+      task: HugBotHugCompound
+
+    # Stick around to enjoy the hug instead of just running up, squeezing and leaving.
+    - !type:HTNPrimitiveTask
+      operator: !type:SetFloatOperator
+        targetKey: IdleTime
+        amount: 1
+    - !type:HTNPrimitiveTask
+      operator: !type:WaitOperator
+        key: IdleTime
+      preconditions:
+      - !type:KeyExistsPrecondition
+        key: IdleTime
+
+    # Special case operator which applies the hugbot cooldown.
+    - !type:HTNPrimitiveTask
+      operator: !type:RaiseEventForOwnerOperator
+        args: !type:HugBotDidHugEvent
+        targetKey: Target
+
+    # Announce that the hug is completed.
+    - !type:HTNCompoundTask
+      task: HugBotFinishSpeakCompound
+
+- type: htnCompound
+  id: HugBotHugCompound
+  branches:
+  # Hit if emagged
+  - preconditions:
+    - !type:IsEmaggedPrecondition
+    tasks:
+    - !type:HTNPrimitiveTask
+      preconditions:
+      - !type:TargetInRangePrecondition
+        targetKey: Target
+        rangeKey: InteractRange
+      operator: !type:MeleeAttackOperator
+        targetKey: Target
+      services:
+      - !type:UtilityService
+        id: HugService
+        proto: NearbyNeedingHug
+        key: Target
+  # Hug otherwise
+  - tasks:
+    - !type:HTNPrimitiveTask
+      preconditions:
+      - !type:TargetInRangePrecondition
+        targetKey: Target
+        rangeKey: InteractRange
+      operator: !type:InteractWithOperator
+        targetKey: Target
+      services:
+      - !type:UtilityService
+        id: HugService
+        proto: NearbyNeedingHug
+        key: Target
+
+- type: htnCompound
+  id: HugBotFinishSpeakCompound
+  branches:
+  # Say mean things if emagged
+  - preconditions:
+    - !type:IsEmaggedPrecondition
+    tasks:
+    - !type:HTNPrimitiveTask
+      operator: !type:SpeakOperator
+        speech: !type:LocalizedSetSpeakOperatorSpeech
+          lineSet: EmaggedHugBotFinishes
+        hidden: true
+  # Say nice thing otherwise
+  - tasks:
+    - !type:HTNPrimitiveTask
+      operator: !type:SpeakOperator
+        speech: !type:LocalizedSetSpeakOperatorSpeech
+          lineSet: HugBotFinishes
+        hidden: true
+
+- type: utilityQuery
+  id: NearbyNeedingHug
+  query:
+  - !type:ComponentQuery
+    components:
+    - type: HumanoidAppearance
+      species: Human # This specific value isn't actually used, so don't worry about it being just `Human`.
+  - !type:ComponentFilter
+    retainWithComp: false
+    components:
+    - type: RecentlyHuggedByHugBot
+  considerations:
+  - !type:TargetDistanceCon
+    curve: !type:PresetCurve
+      preset: TargetDistance
+  - !type:TargetAccessibleCon
+    curve: !type:BoolCurve
+  - !type:TargetInLOSOrCurrentCon
+    curve: !type:BoolCurve
diff --git a/Resources/Prototypes/NPCs/medibot.yml b/Resources/Prototypes/NPCs/medibot.yml
index c0853984ee..1cd6352e16 100644
--- a/Resources/Prototypes/NPCs/medibot.yml
+++ b/Resources/Prototypes/NPCs/medibot.yml
@@ -20,7 +20,8 @@
 
         - !type:HTNPrimitiveTask
           operator: !type:SpeakOperator
-            speech: medibot-start-inject
+            speech: !type:SingleSpeakOperatorSpeech
+              line: medibot-start-inject
             hidden: true
 
         - !type:HTNPrimitiveTask
diff --git a/Resources/Prototypes/NPCs/nutrition.yml b/Resources/Prototypes/NPCs/nutrition.yml
index dea065c34f..b95552fa13 100644
--- a/Resources/Prototypes/NPCs/nutrition.yml
+++ b/Resources/Prototypes/NPCs/nutrition.yml
@@ -6,7 +6,7 @@
         - !type:HTNPrimitiveTask
           preconditions:
             - !type:HungryPrecondition
-              minHungerState: Starving  # See HungerThreshold enum
+              minHungerState: Peckish  # See HungerThreshold enum
           operator: !type:UtilityOperator
             proto: NearbyFood
 
diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index d4e53b72ce..b64640475e 100644
--- a/Resources/Prototypes/Objectives/ninja.yml
+++ b/Resources/Prototypes/Objectives/ninja.yml
@@ -51,6 +51,10 @@
       sprite: Objects/Weapons/Bombs/spidercharge.rsi
       state: icon
   - type: SpiderChargeCondition
+    blacklist:
+      tags:
+      - GhostOnlyWarp
+      - NinjaBombingTargetBlocker
 
 - type: entity
   parent: [BaseNinjaObjective, BaseSurviveObjective]
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 37d7ca1124..26466e4d24 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -55,13 +55,13 @@
   sprite:
     sprite: Objects/Consumable/Food/meat.rsi
     state: corgi
-    #
+
 - type: stealTargetGroup
   id: CaptainIDCard
   name: steal-target-groups-captain-id-card
   sprite:
     sprite: Objects/Misc/id_cards.rsi
-    state: ert_commander #no one will know the difference.
+    state: icon-captain
 
 - type: stealTargetGroup
   id: JetpackCaptainFilled
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 4cfbe97948..d7f684f7a0 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -149,7 +149,6 @@
     minCollectionSize: 2
     maxCollectionSize: 5
     verifyMapExistence: false
-    checkStealAreas: false
   - type: Objective
     difficulty: 1.2
 
diff --git a/Resources/Prototypes/Parallaxes/train.yml b/Resources/Prototypes/Parallaxes/train.yml
index e47cedfc2a..2bd7ac18e4 100644
--- a/Resources/Prototypes/Parallaxes/train.yml
+++ b/Resources/Prototypes/Parallaxes/train.yml
@@ -1,36 +1,6 @@
 - type: parallax
   id: TrainStation
   layers:
-    - texture:
-        !type:ImageParallaxTextureSource
-        path: "/Textures/Parallaxes/AspidParallaxBG.png"
-      slowness: 0.998046875
-      scale: "0.5, 0.5"
-      scrolling: "0, -0.098046875"
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
-      slowness: 0.996625
-      scrolling: "0, -0.196625"
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_dim"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
-      slowness: 0.989375
-      scrolling: "0, -0.209375"
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_faster"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml"
-      slowness: 0.987265625
-      scrolling: "0, -0.287265625"
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_dim_faster"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml"
-      slowness: 0.984352
-      scrolling: "0, -0.384352"
     - texture:
         !type:ImageParallaxTextureSource
         path: "/Textures/Parallaxes/AspidParallaxBG.png"
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 8db5e92fdf..a6b50d1344 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -30,7 +30,8 @@
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Absinthe
           min: 10
         type: Add
         time: 5
@@ -41,7 +42,8 @@
         - absinthe-effect-feel-tulips
         probability: 0.02
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Absinthe
           min: 10
 
 - type: reagent
@@ -163,45 +165,48 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ethanol
           min: 15
-        - !type:OrganType
-          type: Dwarf
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Dwarf ]
+          inverted: true
         damage:
           types:
             Poison: 1
       # dwarves take less toxin damage and heal a marginal amount of brute
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ethanol
           min: 15
-        - !type:OrganType
-          type: Dwarf
+        - !type:MetabolizerTypeCondition
+          type: [ Dwarf ]
         damage:
           types:
             Poison: 0.2
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ethanol
           min: 15
-        - !type:OrganType
-          type: Dwarf
+        - !type:MetabolizerTypeCondition
+          type: [ Dwarf ]
         damage:
           groups:
             Brute: -1
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.04
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Ethanol
           min: 12
         # dwarves immune to vomiting from alcohol
-        - !type:OrganType
-          type: Dwarf
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Dwarf ]
+          inverted: true
       - !type:Drunk
-        boozePower: 2
+        boozePower: 20
 
 - type: reagent
   id: Gin
@@ -2315,9 +2320,10 @@
   metabolisms:
     Drink:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Mayojito
           min: 5
         probability: 0.5
       - !type:HealthChange
@@ -2519,29 +2525,31 @@
         boozePower: 10
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: BacchusBlessing
           min: 6
-        - !type:OrganType
-          type: Dwarf
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Dwarf]
+          inverted: true
         damage:
           types:
             Poison: 2 # TODO: Figure out poison amount. Ethanol does 1, this does 2 but also metabolises almost 3 to 4 times as fast as ethanol. This would be more Liver damage when that time arrives.
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: BacchusBlessing
           min: 6
-        - !type:OrganType
-          type: Dwarf
+        - !type:MetabolizerTypeCondition
+          type: [Dwarf]
         damage:
           types:
             Poison: 0.4 # TODO: Might increase this, even though it's just double of ethanol from 0.2 to 0.4
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.1 #TODO: Tweak vomit probability, maybe make this more violent and poisonous but the body aggressively purges it...
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: BacchusBlessing
           min: 8
-        - !type:OrganType
-          type: Dwarf
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Dwarf]
+          inverted: true
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml b/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
index 6c050a6ca6..1311042949 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
@@ -13,7 +13,7 @@
     Extinguish:
       methods: [ Touch ]
       effects:
-      - !type:ExtinguishReaction
+      - !type:Extinguish
   plantMetabolism:
   - !type:PlantAdjustWater
     amount: 1
@@ -60,7 +60,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
   tileReactions:
   - !type:FlammableTileReaction
     temperatureMultiplier: 1.35
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index f49e9f9671..6fac8606d9 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -453,12 +453,11 @@
     Gas:
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         conditions:
-        - !type:OrganType
-          type: Slime
-          shouldHave: true
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
         damage:
           types:
             Heat: 3
@@ -469,16 +468,22 @@
   desc: reagent-desc-ice
   slipData:
     requiredSlipSpeed: 3.5
+  evaporationSpeed: 0.15 # TODO: Ideally Ice should just turn into Water if the room is warm enough (and vis versa), rather than Ice directly evaporating
   physicalDesc: reagent-physical-desc-frosty
   flavor: cold
   color: "#bed8e6"
   recognizable: true
   meltingPoint: 0.0
   boilingPoint: 100.0
-  friction: 0.05 #Copied from Ice Crust
+  friction: 0.05 # Copied from Ice Crust
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 3 # Slightly worse for quenching thirst than just straight water
   plantMetabolism:
   - !type:PlantAdjustWater
-    amount: 1
+    amount: 1 # The internet tells me I should avoid watering plants with ice, but mostly because of temperature, so this value being the same as water should probably be fine?
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/iceglass.rsi
     state: icon_empty
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index 5ac667ec18..67c0bf1615 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -274,9 +274,9 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Slime]
+          inverted: true
         damage:
           types:
             Poison: 1
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
index c9625c663c..45c826eff9 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
@@ -36,7 +36,7 @@
             Brute: -0.5
             Burn: -0.5
       # Helps you stop bleeding to an extent.
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -0.25
       - !type:SatiateHunger #Numbers are balanced with this in mind + it helps limit how much healing you can get from food
   # Lets plants benefit too
@@ -82,7 +82,7 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:ReagentThreshold #Only satiates when eaten with nutriment
+        - !type:ReagentCondition #Only satiates when eaten with nutriment
           reagent: Nutriment
           min: 0.1
         factor: 1
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
index 6e4114cecf..8813b5bb66 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
@@ -120,9 +120,9 @@
         emote: Cough
         showInGuidebook: true
         conditions:
-        - !type:Breathing
-        - !type:Internals
-          usingInternals: false
+        - !type:BreathingCondition
+        - !type:InternalsCondition
+          inverted: true
 
 - type: reagent
   id: Vinegar
@@ -142,10 +142,11 @@
       - !type:AdjustReagent
         reagent: Vitamin
         amount: 0.1
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.1
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Vinegar
             min: 6
 
 - type: reagent
@@ -223,7 +224,8 @@
           amount: 250 # thermal energy, not temp
         - !type:HealthChange
           conditions:
-            - !type:ReagentThreshold
+            - !type:ReagentCondition
+              reagent: CapsaicinOil
               min: 5
           damage:
             types:
@@ -247,7 +249,7 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:ReagentThreshold #Only satiates when eaten with nutriment
+        - !type:ReagentCondition #Only satiates when eaten with nutriment
           reagent: Nutriment
           min: 0.1
         factor: 1
@@ -314,7 +316,8 @@
         amount: -250 # thermal energy, not temp
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: FrostOil
           min: 5
         damage:
           types:
diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml
index 1555ab9e23..3e2d7319ad 100644
--- a/Resources/Prototypes/Reagents/Materials/ores.yml
+++ b/Resources/Prototypes/Reagents/Materials/ores.yml
@@ -76,4 +76,4 @@
   unit: materials-unit-chunk
   icon: { sprite: Objects/Materials/ore.rsi, state: salt }
   color: "#f5e7d7"
-  price: 0.075
\ No newline at end of file
+  price: 0.075
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index ca46881a83..651e4f1fbc 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -20,9 +20,9 @@
       - !type:SatiateThirst
         factor: 1.0
         conditions:
-          - !type:OrganType
-            type: Human
-            shouldHave: false
+          - !type:MetabolizerTypeCondition
+            type: [ Human ]
+            inverted: true
     Food:
       effects:
         - !type:AdjustReagent
@@ -32,8 +32,8 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Bloodsucker
+        - !type:MetabolizerTypeCondition
+          type: [ Bloodsucker ]
         damage:
           groups:
             Brute: -3
@@ -76,6 +76,15 @@
       effects:
       - !type:SatiateHunger
         factor: 1
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Slime]
+          inverted: true
+      - !type:ModifyBloodLevel
+        amount: 0.5 # drawing 15u removes 5% blood level from a slimeperson, this will add 5% when injecting 15u
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [Slime]
   footstepSound:
     collection: FootstepSlime # makes sense
     params:
@@ -148,7 +157,7 @@
         damage:
           types:
             Poison: 4
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.25
 
 - type: reagent
@@ -177,7 +186,7 @@
         damage:
           types:
             Bloodloss: -3
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -1.5
   # Just in case you REALLY want to water your plants
   plantMetabolism:
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index e96d5be30c..eb5ceba470 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -14,8 +14,8 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: Left4Zed
@@ -38,15 +38,15 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
       - !type:HealthChange
         damage:
           types:
             Poison: 1
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: PestKiller
@@ -69,8 +69,8 @@
           types:
             Poison: 3
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: PlantBGone
@@ -100,8 +100,8 @@
             Slash: 1
             Piercing: 1
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: RobustHarvest
@@ -132,13 +132,14 @@
             Slash: -3
             Piercing: -3
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Plant
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
+        - !type:ReagentCondition
+          reagent: RobustHarvest
           min: 30
         damage:
           types:
@@ -150,9 +151,10 @@
       - !type:Polymorph
         prototype: TreeMorph
         conditions:
-          - !type:OrganType
-            type: Plant
-          - !type:ReagentThreshold
+          - !type:MetabolizerTypeCondition
+            type: [Plant]
+          - !type:ReagentCondition
+            reagent: RobustHarvest
             min: 80
 
 - type: reagent
@@ -192,8 +194,8 @@
           types:
             Poison: 4
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [Plant]
 
 - type: reagent
   id: Ammonia
@@ -221,26 +223,23 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Rat
-          shouldHave: false
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [ Rat ]
+          inverted: true
+        - !type:ReagentCondition
           reagent: Ammonia
           min: 1
         ignoreResistances: true
         damage:
           types:
             Poison: 0.25
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.12
         conditions:
-        - !type:OrganType
-          type: Rat
-          shouldHave: false
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [ Rat, Vox ]
+          inverted: true
+        - !type:ReagentCondition
           reagent: Ammonia
           min: 0.8
       - !type:PopupMessage
@@ -249,28 +248,28 @@
         messages: [ "ammonia-smell" ]
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Ammonia
           min: 0.25
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Rat
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [ Rat ]
+        - !type:ReagentCondition
           reagent: Ammonia
           min: 1
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           groups:
-            Brute: -5
-            Burn: -5
+            Brute: -2.5
+            Burn: -2.5
           types:
             Bloodloss: -5
       - !type:Oxygenate # ammonia displaces nitrogen in vox blood
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
         factor: -4
 
 
diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
index 81f4e421bf..7c0f1c8f09 100644
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -41,7 +41,8 @@
         damage:
           types:
             Poison: -1
-      - !type:ChemCleanBloodstream
+      - !type:CleanBloodstream
+        excluded: Charcoal
         cleanseRate: 3
 
 - type: reagent
@@ -94,9 +95,7 @@
       methods: [ Touch ]
       effects:
       - !type:ArtifactUnlock
-        conditions:
-        - !type:ReagentThreshold
-          min: 5
+        minScale: 5
 
 - type: reagent
   parent: Artifexium
@@ -111,9 +110,7 @@
       methods: [ Touch ]
       effects:
       - !type:ArtifactDurabilityRestore
-        conditions:
-        - !type:ReagentThreshold
-          min: 5
+        minScale: 5
 
 - type: reagent
   id: Benzene
@@ -159,9 +156,10 @@
             Heat: 1.5
     Medicine:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: SodiumHydroxide
           min: 5
         probability: 0.1
 
diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
index 2ebd213fec..c5fe0e4da9 100644
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -57,16 +57,18 @@
   metabolisms:
     Food:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: SoapReagent
           min: 6
         probability: 0.20
     Drink:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: SoapReagent
           min: 6
         probability: 0.20
 
@@ -105,7 +107,7 @@
       methods: [ Touch ]
       effects:
       # pva glue? no, antibiotic glue for sealing wounds
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -1.5
   metabolisms:
     Narcotic:
@@ -119,8 +121,6 @@
       - !type:GenericStatusEffect
         key: Muted
         component: Muted
-        type: Add
         time: 5
-        refresh: false
   footstepSound:
     collection: FootstepSlime
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 8d317102c1..401fdfd2eb 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -63,9 +63,9 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Arachnid ]
+          inverted: true
         damage:
           types:
             Poison: 0.1
@@ -73,9 +73,8 @@
       effects:
       - !type:ModifyBloodLevel
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: true
+        - !type:MetabolizerTypeCondition
+          type: [ Arachnid ]
         amount: 0.4
 
 - type: reagent
@@ -154,9 +153,8 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: true
+        - !type:MetabolizerTypeCondition
+          type: [ Arachnid ]
         damage:
           types:
             Poison: 0.1
@@ -164,9 +162,9 @@
       effects:
       - !type:ModifyBloodLevel
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Arachnid ]
+          inverted: true
         amount: 0.4
 
 - type: reagent
@@ -213,9 +211,9 @@
         damage:
           types:
             Poison: 1
-      - !type:GenericStatusEffect
-        key: Stutter
-        component: ScrambledAccent
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectScrambled
+        type: Update
 
 - type: reagent
   id: Potassium
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index 2ed57f73b0..0ad3e9af61 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -21,7 +21,7 @@
       # Hail the madman logic, if it has CARP, means it helps against CARPs
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: CarpoToxin
           min: 1
         reagent: CarpoToxin
@@ -39,8 +39,8 @@
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:OrganType
-          type: Moth
+        - !type:MetabolizerTypeCondition
+          type: [ Moth ]
 
 - type: reagent
   id: BuzzochloricBees
@@ -75,11 +75,11 @@
         - "buzzochloricbees-effect-squeaky-clean"
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           max: 0
           reagent: Histamine
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
       - !type:PopupMessage
         type: Local
@@ -92,11 +92,11 @@
           - "buzzochloricbees-effect-squeaky-clean"
         probability: 0.05
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           min: 0.01
           reagent: Histamine
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
       - !type:PopupMessage
         type: Local
@@ -108,10 +108,10 @@
           - "buzzochloricbees-effect-licoxide-buzzes"
         probability: 0.05
         conditions:
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           min: 0.01
           reagent: Licoxide
       - !type:PopupMessage
@@ -121,10 +121,10 @@
           - "buzzochloricbees-effect-fiber-soft"
         probability: 0.05
         conditions:
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           min: 0.01
           reagent: Fiber
       - !type:HealthChange
@@ -133,8 +133,8 @@
             Poison: 2
             Piercing: 2
         conditions:
-        - !type:HasTag
-          invert: true
+        - !type:TagCondition
+          inverted: true
           tag: Bee
 
 - type: reagent
@@ -183,11 +183,11 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
-            Slash: 0.5
+            Slash: 0.25
       - !type:Emote
         emote: Scream
         probability: 0.7
@@ -233,20 +233,20 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
             Cold: 0.05
       - !type:AdjustTemperature
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           min: 160.15
         amount: -30000
     Extinguish:
       methods: [ Touch ]
       effects:
-      - !type:ExtinguishReaction # cold
+      - !type:Extinguish # cold
   metabolisms:
     Poison:
       metabolismRate : 0.45
@@ -258,7 +258,7 @@
              Heat: -3 # ghetto burn chem. i don't think anyone would use this intentionally but it's funny
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           max: 35
         type: Local
@@ -267,7 +267,7 @@
         probability: 0.05
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           max: 35
         type: Local
@@ -276,26 +276,26 @@
         probability: 0.2
       - !type:AdjustTemperature
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           min: 160.15 # not quite enough for cryo, but can speed it up if you wanna take the risk
         amount: -10000
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           max: 40 # slows when less than 40
         walkSpeedModifier: 0.6
         sprintSpeedModifier: 0.6
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           min: 40 # your legs stop working when above 40
         walkSpeedModifier: 0.00
         sprintSpeedModifier: 0.00
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Fresium
           min: 40
         type: Local
@@ -347,16 +347,18 @@
       - !type:Polymorph
         prototype: ArtifactLizard # Does the same thing as the original YML I made for this reagent.
         conditions:
-        - !type:OrganType
-          type: Animal
-          shouldHave: false
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [Animal]
+          inverted: true
+        - !type:ReagentCondition
+          reagent: JuiceThatMakesYouWeh
           min: 50
       - !type:AdjustReagent
         reagent: JuiceThatMakesYouWeh
         amount: -20
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: JuiceThatMakesYouWeh
           min: 50
 
 - type: reagent
@@ -380,16 +382,18 @@
       - !type:Polymorph
         prototype: ArtifactLizard
         conditions:
-        - !type:OrganType
-          type: Animal
-          shouldHave: false
-        - !type:ReagentThreshold
+        - !type:MetabolizerTypeCondition
+          type: [ Animal ]
+          inverted: true
+        - !type:ReagentCondition
+          reagent: JuiceThatMakesYouHew
           min: 50
       - !type:AdjustReagent
         reagent: JuiceThatMakesYouHew
         amount: -20
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: JuiceThatMakesYouHew
           min: 50
 
 - type: reagent
@@ -406,7 +410,8 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: CorgiJuice
           min: 15
         damage:
           types:
@@ -414,11 +419,13 @@
       - !type:Polymorph
         prototype: SmartCorgiMorph
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: CorgiJuice
           min: 50
       - !type:AdjustReagent
         reagent: CorgiJuice
         amount: -20
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: CorgiJuice
           min: 50
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 3d65931f19..6a0b257877 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -11,93 +11,69 @@
     Poison:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Human
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Animal
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Rat
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [ Human, Animal, Rat, Plant ]
       # Convert Oxygen into CO2.
       - !type:ModifyLungGas
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
+          inverted: true
         ratios:
           CarbonDioxide: 1.0
           Oxygen: -1.0
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Vox
-        scaleByQuantity: true
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
+        scaling: true
         ignoreResistances: true
         damage:
           types:
-            Poison:
-              3
+            Poison: 1.5
       - !type:AdjustAlert
         alertType: Toxins
+        minScale: 1
         conditions:
-          - !type:ReagentThreshold
-            min: 0.5
-          - !type:OrganType
-            type: Vox
+          - !type:MetabolizerTypeCondition
+            type: [ Vox ]
         clear: true
         time: 5
     Gas:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Human
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Animal
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Rat
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [ Human, Animal, Rat, Plant ]
       # Convert Oxygen into CO2.
       - !type:ModifyLungGas
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
+          inverted: true
         ratios:
           CarbonDioxide: 1.0
           Oxygen: -1.0
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Vox
-        scaleByQuantity: true
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
+        scaling: true
         ignoreResistances: true
         damage:
           types:
-            Poison:
-              7
+            Poison: 0.7
       - !type:AdjustAlert
         alertType: Toxins
+        minScale: 1
         conditions:
-          - !type:ReagentThreshold
-            min: 0.5
-          - !type:OrganType
-            type: Vox
+          - !type:MetabolizerTypeCondition
+            type: [ Vox ]
         clear: true
         time: 5
 
@@ -120,32 +96,30 @@
       - !type:HealthChange
         damage:
           types:
-            Poison: 3
+            Poison: 1.5
       - !type:AdjustReagent
         reagent: Inaprovaline
         amount: -2.0
     Gas:
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
             Poison:
-              1
+              0.1
       # We need a metabolism effect on reagent removal
       - !type:AdjustAlert
         alertType: Toxins
-        conditions:
-          - !type:ReagentThreshold
-            min: 1.5
+        minScale: 3
         clear: True
         time: 5
   reactiveEffects:
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
 
 - type: reagent
   id: Tritium
@@ -163,7 +137,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.8
   metabolisms:
     Poison:
@@ -171,11 +145,11 @@
       - !type:HealthChange
         damage:
           types:
-            Radiation: 3
+            Radiation: 1.5
     Gas:
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
@@ -184,9 +158,7 @@
       # We need a metabolism effect on reagent removal
       - !type:AdjustAlert
         alertType: Toxins
-        conditions:
-          - !type:ReagentThreshold
-            min: 1.5
+        minScale: 3
         clear: True
         time: 5
 
@@ -201,58 +173,55 @@
     Poison:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [ Plant ]
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Plant
-          shouldHave: false
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
-        scaleByQuantity: true
+        - !type:MetabolizerTypeCondition
+          type: [ Plant, Vox ]
+          inverted: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
             Poison:
-              0.8
+              0.4
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Plant
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Plant ]
+          inverted: true
         factor: -4
     Gas:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Plant
+        - !type:MetabolizerTypeCondition
+          type: [ Plant ]
       - !type:HealthChange
+        minScale: 1
         conditions:
-        - !type:OrganType
-          type: Plant
-          shouldHave: false
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Plant, Vox ]
+          inverted: true
         # Don't want people to get toxin damage from the gas they just
         # exhaled, right?
-        - !type:ReagentThreshold
-          min: 0.5
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
             Poison:
               0.8
       - !type:Oxygenate # carbon dioxide displaces oxygen from the bloodstream, causing asphyxiation
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Plant
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Plant ]
+          inverted: true
         factor: -4
       # We need a metabolism effect on reagent removal
       #- !type:AdjustAlert
@@ -273,29 +242,28 @@
       - !type:HealthChange
         damage:
           types:
-            Cold: 1 # liquid nitrogen is cold
+            Cold: 0.5 # liquid nitrogen is cold
     Gas:
       effects:
       - !type:Oxygenate
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Vox
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Slime
-      # Converts Nitrogen into CO2
+        - !type:MetabolizerTypeCondition
+          type: [ Vox, Slime ]
+      # Converts Nitrogen into Ammonia
       - !type:ModifyLungGas
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
         ratios:
           Ammonia: 1.0
           Nitrogen: -1.0
       - !type:ModifyLungGas
+        scaling: true
         conditions:
-        - !type:OrganType
-          type: Slime
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
         ratios:
           NitrousOxide: 1.0
           Nitrogen: -1.0
@@ -315,72 +283,60 @@
       - !type:HealthChange
         damage:
           types:
-            Poison: 2
+            Poison: 1
     Gas:
       effects:
       - !type:Emote
+        minScale: 1
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 0.2
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         emote: Laugh
         showInChat: true
         probability: 0.1
       - !type:Emote
+        minScale: 0.4
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 0.2
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         emote: Scream
         showInChat: true
         probability: 0.01
       - !type:PopupMessage
+        minScale: 1
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 0.5
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         type: Local
         visualType: Medium
         messages: [ "effect-sleepy" ]
         probability: 0.1
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
+        minScale: 2
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 1
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
+        minScale: 3.6
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 1.8
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         effectProto: StatusEffectForcedSleeping
         time: 3
         type: Update
       - !type:HealthChange
+        minScale: 7
         conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 3.5
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Slime ]
+          inverted: true
         ignoreResistances: true
         damage:
           types:
@@ -403,11 +359,11 @@
     Narcotic:
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
-            Cellular: 1
+            Cellular: 0.5
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
         type: Add
@@ -418,59 +374,39 @@
         type: Local
         messages: [ "frezon-lungs-cold" ]
         probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 0.5
+        minScale: 1
       - !type:PopupMessage
         type: Local
         visualType: Medium
         messages: [ "frezon-euphoric" ]
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 1
+        minScale: 2
     Gas:
       effects:
       - !type:HealthChange
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 0.5
-        scaleByQuantity: true
+        minScale: 1
+        scaling: true
         ignoreResistances: true
         damage:
           types:
-            Cellular: 0.5
+            Cellular: 0.05
       - !type:ModifyStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 1
+        minScale: 2
         effectProto: StatusEffectSeeingRainbow
         type: Add
         time: 500
       - !type:Drunk
         boozePower: 500
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 1
+        minScale: 2
       - !type:PopupMessage
         type: Local
         messages: [ "frezon-lungs-cold" ]
         probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 0.5
+        minScale: 2
       - !type:PopupMessage
         type: Local
         visualType: Medium
         messages: [ "frezon-euphoric" ]
         probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Frezon
-          min: 1
+        minScale: 2
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 71ae11dad9..998f508b61 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -11,11 +11,11 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:GenericStatusEffect
-        key: Stutter
-        component: ScrambledAccent
       - !type:ModifyStatusEffect
-        effectProto: StatusEffectSlurred
+        effectProto: StatusEffectScrambled
+        type: Update
+      - !type:ModifyStatusEffect
+        effectProto: StatusEffectWoozy
         time: 20.0
 
 - type: reagent
@@ -35,31 +35,36 @@
             Poison: -1
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 20
         damage:
           groups:
             Brute: 2
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 20
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 20
         type: Local
         visualType: Medium
         messages: [ "generic-reagent-effect-nauseous" ]
         probability: 0.2
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 20
         probability: 0.02
       - !type:Drunk
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dylovene
           min: 15
   plantMetabolism:
   - !type:PlantAdjustToxins
@@ -148,20 +153,23 @@
           Brute: -1.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Bicaridine
           min: 15
         damage:
           types:
             Asphyxiation: 0.5
             Poison: 1.5
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Bicaridine
           min: 30
         probability: 0.02
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Bicaridine
           min: 15
       - !type:Drunk
 
@@ -184,7 +192,7 @@
       effects:
         - !type:HealthChange
           conditions:
-          - !type:Temperature
+          - !type:TemperatureCondition
             # this is a little arbitrary but they gotta be pretty cold
             max: 213.0
           damage:
@@ -208,7 +216,7 @@
       effects:
         - !type:HealthChange
           conditions:
-          - !type:Temperature
+          - !type:TemperatureCondition
             max: 213.0
           damage:
             types:
@@ -233,7 +241,8 @@
             Cold: -1.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dermaline
           min: 10
         damage:
           types:
@@ -243,7 +252,8 @@
             Brute: 0.5
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Dermaline
           min: 10
 
 - type: reagent
@@ -264,7 +274,8 @@
             Bloodloss: -0.5
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Dexalin
             min: 20
         damage:
           types:
@@ -289,14 +300,15 @@
             Bloodloss: -3
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: HeartbreakerToxin
           min: 1
         reagent: HeartbreakerToxin
         amount: -3
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: DexalinPlus
             min: 25
         damage:
           types:
@@ -317,7 +329,7 @@
       effects:
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Histamine
           min: 45
         reagent: Histamine
@@ -327,8 +339,8 @@
           # they gotta be in crit first
         - !type:MobStateCondition
           mobstate: Critical
-        - !type:ReagentThreshold
-          min: 0
+        - !type:ReagentCondition
+          reagent: Epinephrine
           max: 20
         damage:
           types:
@@ -339,7 +351,8 @@
             Burn: -0.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Epinephrine
           min: 20
         damage:
           types:
@@ -350,7 +363,7 @@
         amount: -2
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: HeartbreakerToxin
           min: 1
         reagent: Epinephrine
@@ -358,7 +371,7 @@
       - !type:AdjustReagent
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: HeartbreakerToxin
           min: 1
         reagent: Histamine
@@ -390,18 +403,20 @@
         damage:
           types:
             Radiation: -1
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.02
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Hyronalin
           min: 30
         damage:
           types:
            Heat: 2
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Hyronalin
           min: 30
 
 - type: reagent
@@ -417,9 +432,10 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ipecac
           min: 4
         probability: 0.3
 
@@ -443,7 +459,7 @@
         damage:
           types:
             Asphyxiation: -2
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -0.25
 
 - type: reagent
@@ -466,7 +482,8 @@
       - !type:SatiateThirst
         factor: -10
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Kelotane
           min: 30
       - !type:PopupMessage
         type: Local
@@ -476,7 +493,8 @@
         - generic-reagent-effect-parched
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Kelotane
           min: 25
 
 - type: reagent
@@ -496,12 +514,12 @@
             Cold: -4
       - !type:AdjustTemperature
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           max: 293.15
         amount: 100000 # thermal energy, not temperature!
       - !type:AdjustTemperature
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           min: 293.15
         amount: -10000
       - !type:PopupMessage
@@ -531,15 +549,17 @@
             Heat: 0.5
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Barozine
             min: 30
         damage:
           types:
             Poison: 3
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.15
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Barozine
             min: 30
       - !type:GenericStatusEffect
         key: PressureImmunity
@@ -570,7 +590,8 @@
       amount: 6
     - !type:PlantPhalanximine
       conditions:
-      - !type:ReagentThreshold
+      - !type:ReagentCondition
+        reagent: Phalanximine
         min: 4
   metabolisms:
     Medicine:
@@ -584,14 +605,15 @@
             Caustic: 0.15
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Phalanximine
           min: 11
         damage:
           types:
             Radiation: 0.2
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Arithrazine
           min: 1
         damage:
@@ -617,12 +639,13 @@
             Asphyxiation: -2.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: PolypyryliumOligomers
           min: 30
         damage:
           types:
             Asphyxiation: 3.5
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -0.25
 
 - type: reagent
@@ -638,7 +661,8 @@
       effects:
         - !type:CureZombieInfection
           conditions:
-            - !type:ReagentThreshold
+            - !type:ReagentCondition
+              reagent: Ambuzol
               min: 10
 
 - type: reagent
@@ -655,7 +679,8 @@
         - !type:CureZombieInfection
           innoculate: true
           conditions:
-            - !type:ReagentThreshold
+            - !type:ReagentCondition
+              reagent: AmbuzolPlus
               min: 5
 
 - type: reagent
@@ -669,7 +694,7 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -0.5
 
 - type: reagent
@@ -721,7 +746,7 @@
             Poison: -4
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Amatoxin
           min: 1
         reagent: Amatoxin
@@ -767,11 +792,12 @@
       effects:
       # Medium-large quantities can hurt you instead,
       # but still technically stop your bleeding.
-      - !type:ModifyBleedAmount
+      - !type:ModifyBleed
         amount: -1.5
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: TranexamicAcid
           min: 15
         damage:
           types:
@@ -790,7 +816,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:TotalDamage
+        - !type:TotalDamageCondition
           max: 50
         damage:
           groups:
@@ -850,14 +876,16 @@
       effects:
       - !type:EvenHealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ultravasculine
           min: 0
           max: 20
         damage:
           Toxin: -6
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ultravasculine
           min: 0
           max: 20
         damage:
@@ -865,27 +893,29 @@
             Brute: 1.5
       - !type:EvenHealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ultravasculine
           min: 20
         damage:
           Toxin: -2
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ultravasculine
           min: 20
         damage:
           groups:
             Brute: 6
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Histamine
           min: 1
         reagent: Histamine
         amount: -1
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Histamine
           min: 1
         reagent: Ultravasculine
@@ -902,7 +932,7 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:ChemHealEyeDamage
+      - !type:EyeDamage
 
 - type: reagent
   id: Cognizine
@@ -917,7 +947,8 @@
       effects:
       - !type:MakeSentient
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Cognizine
           min: 5
 
 - type: reagent
@@ -941,7 +972,8 @@
         type: Remove
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ethyloxyephedrine
           min: 10
       - !type:PopupMessage
         visualType: Medium
@@ -966,7 +998,8 @@
         type: Remove
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Diphenylmethylamine
           min: 5
       - !type:PopupMessage
         visualType: Medium
@@ -992,37 +1025,41 @@
             Caustic: -1.25 # 5 per u
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Sigynate
           min: 16
         damage:
           types:
             Heat: 1 # 4 per u
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Sigynate
           min: 20
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Sigynate
           min: 20
         type: Local
         visualType: Medium
         messages: [ "generic-reagent-effect-nauseous" ]
         probability: 0.2
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Sigynate
           min: 30
         probability: 0.02
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Arithrazine
           min: 1
         probability: 0.1
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Arithrazine
           min: 1
         type: Local
@@ -1049,7 +1086,8 @@
             Heat: 0.2 # 0.8 per u
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Lacerinol
           min: 12
         damage:
           types:
@@ -1074,7 +1112,8 @@
             Radiation: 0.05 # 0.2 per u, 3 for 15u
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Puncturase
           min: 12
         damage:
           types:
@@ -1100,7 +1139,8 @@
         factor: -1
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Bruizine
           min: 10.5
         damage:
           types:
@@ -1122,7 +1162,7 @@
         factor: 3
       - !type:HealthChange
         conditions:
-        - !type:TotalDamage
+        - !type:TotalDamageCondition
           max: 50
         damage:
           types:
@@ -1131,17 +1171,16 @@
             Heat: -0.2
             Shock: -0.2
             Cold: -0.2
-
   reactiveEffects:
     Extinguish:
       methods: [ Touch ]
       effects:
-      - !type:ExtinguishReaction
+      - !type:Extinguish
     Acidic:
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
@@ -1171,20 +1210,23 @@
       # od causes massive bleeding
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Pyrazine
           min: 20
         damage:
           types:
             Slash: 0.5
             Piercing: 0.5
-      - !type:ChemVomit
+      - !type:Vomit
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Pyrazine
           min: 15
         probability: 0.1
       - !type:Emote
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Pyrazine
           min: 20
         emote: Scream
         probability: 0.2
@@ -1218,19 +1260,22 @@
       # od makes you freeze to death
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Insuzine
           min: 12
         damage:
           types:
             Cold: 1 # 4 per u
       - !type:AdjustTemperature
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Insuzine
           min: 12
         amount: -30000
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Insuzine
           min: 12
 
 - type: reagent
@@ -1249,7 +1294,7 @@
           seconds: 20
           conditions:
           #Patient must be dead and in a cryo tube (or something cold)
-          - !type:Temperature
+          - !type:TemperatureCondition
             max: 150.0
           - !type:MobStateCondition
             mobstate: Dead
@@ -1274,7 +1319,7 @@
       effects:
         - !type:HealthChange
           conditions:
-          - !type:Temperature
+          - !type:TemperatureCondition
             max: 213.0
           damage:
             groups:
@@ -1297,7 +1342,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:Temperature
+        - !type:TemperatureCondition
           max: 213.0
         damage:
           types:
@@ -1319,7 +1364,8 @@
       effects:
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Mannitol
           min: 15
         type: Local
         visualType: Medium
@@ -1339,7 +1385,8 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Psicodine
           min: 30
         damage:
           types:
@@ -1347,7 +1394,8 @@
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Psicodine
           min: 30
         type: Add
         time: 8
@@ -1384,10 +1432,10 @@
         component: RadiationProtection
         time: 2
         type: Add
-        refresh: false
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: PotassiumIodide
             min: 20
         damage:
           types:
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index a1b1033a4b..48fc618857 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -18,7 +18,8 @@
             Poison: 0.75
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Desoxyephedrine
           min: 30
         damage:
           types:
@@ -26,7 +27,7 @@
             Asphyxiation: 2
     Narcotic:
       effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 1.35
         sprintSpeedModifier: 1.35
       - !type:GenericStatusEffect
@@ -42,7 +43,7 @@
         type: Remove
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Haloperidol
           max: 0.01
         effectProto: StatusEffectDrowsiness
@@ -52,7 +53,8 @@
       effects:
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Desoxyephedrine
           min: 20
 
 - type: reagent
@@ -69,12 +71,13 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 1.25
         sprintSpeedModifier: 1.25
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ephedrine
           min: 20
         damage:
           types:
@@ -90,7 +93,7 @@
         type: Remove
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Haloperidol
           max: 0.01
         effectProto: StatusEffectDrowsiness
@@ -105,7 +108,8 @@
       effects:
       - !type:ResetNarcolepsy
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Ephedrine
           min: 30
 
 - type: reagent
@@ -123,19 +127,20 @@
     Narcotic:
       metabolismRate: 1.0
       effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 1.3
         sprintSpeedModifier: 1.3
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: Stimulants
             min: 80 #please wait 3 minutes before using another stimpack
         damage:
           types:
             Poison: 1
       - !type:AdjustReagent
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: ChloralHydrate
           min: 1
         reagent: ChloralHydrate
@@ -151,14 +156,13 @@
         key: StaminaModifier
         component: StaminaModifier
         time: 3
-        type: Add
       - !type:ModifyStatusEffect
         effectProto: StatusEffectForcedSleeping
         time: 3
         type: Remove
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Haloperidol
           max: 0.01
         effectProto: StatusEffectDrowsiness
@@ -174,7 +178,7 @@
           factor: 1
         - !type:HealthChange
           conditions:
-          - !type:TotalDamage
+          - !type:TotalDamageCondition
             min: 70 # only heals when you're more dead than alive
           damage: # heals at the same rate as tricordrazine, doesn't heal poison because if you OD'd I'm not giving you a safety net
             groups:
@@ -228,7 +232,7 @@
   metabolisms:
     Narcotic:
       effects:
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:HealthChange
@@ -239,7 +243,7 @@
         effectProto: StatusEffectSeeingRainbow
         time: 10
         type: Add
-      - !type:ChemVomit # Vomiting is a symptom of brain damage
+      - !type:Vomit # Vomiting is a symptom of brain damage
         probability: 0.05
       - !type:Drunk # Headaches and slurring are major symptoms of brain damage, this is close enough
         boozePower: 5
@@ -289,16 +293,18 @@
   meltingPoint: 128.0
   metabolisms:
     Narcotic:
-      effects:
+      effects: # It would be nice to have speech slurred or mumbly, but accents are a bit iffy atm. Same for distortion effects.
+      - !type:MovementSpeedModifier
+        walkSpeedModifier: 0.65
+        sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Nocturine
           min: 8
         effectProto: StatusEffectForcedSleeping
-        time: 3
-        delay: 6
-        type: Add
+        time: 6
+        delay: 5
 
 - type: reagent
   id: MuteToxin
@@ -353,7 +359,8 @@
         - norepinephricacid-effect-darkness
         - norepinephricacid-effect-blindness
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: NorepinephricAcid
           min: 20
         probability: 0.03
         #If anyone wants to add a light dimming or grayscale effect when under 20u, be my guest
@@ -361,7 +368,8 @@
         key: TemporaryBlindness
         component: TemporaryBlindness
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: NorepinephricAcid
           min: 20
 
 - type: reagent
@@ -403,7 +411,8 @@
         emote: Scream
         probability: 0.08
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: TearGas
           min: 4
       - !type:Emote
         emote: Cough
@@ -412,14 +421,16 @@
         key: TemporaryBlindness
         component: TemporaryBlindness
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: TearGas
           min: 4
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
-        statusLifetime: 1.5
+        time: 1.5
         conditions: # because of the remainding after effect, threshold is given so the effects ends simultaniously
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: TearGas
           min: 4
 
 - type: reagent
@@ -438,21 +449,24 @@
         showInChat: true
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Happiness
           max: 20
       - !type:Emote
         emote: Whistle
         showInChat: true
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Happiness
           max: 20
       - !type:Emote
         emote: Crying
         showInChat: true
         probability: 0.1
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Happiness
           min: 20
       - !type:PopupMessage # we dont have sanity/mood so this will have to do
         type: Local
@@ -463,7 +477,8 @@
         - "psicodine-effect-at-peace"
         probability: 0.2
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Happiness
           max: 20
       - !type:ModifyStatusEffect
         effectProto: StatusEffectSeeingRainbow
diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml
index aa5ebe5145..16dfc69286 100644
--- a/Resources/Prototypes/Reagents/pyrotechnic.yml
+++ b/Resources/Prototypes/Reagents/pyrotechnic.yml
@@ -6,7 +6,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-        - !type:FlammableReaction
+        - !type:Flammable
   plantMetabolism:
     - !type:PlantAdjustWeeds
       amount: -2
@@ -52,7 +52,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.4
   metabolisms:
     Poison:
@@ -63,7 +63,7 @@
             Heat: 2
             Poison: 1
             Caustic: 0.5 # based off napalm being an irritant
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.4
 
 - type: reagent
@@ -83,7 +83,7 @@
           types:
             Heat: 3
             Poison: 1
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.1
       - !type:AdjustTemperature
         amount: 6000
@@ -92,7 +92,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.2
       - !type:Ignite
 
@@ -116,7 +116,7 @@
             Heat: 2
             Poison: 1
             Caustic: 0.5 # CLF3 is corrosive
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.2
       - !type:AdjustTemperature
         amount: 6000
@@ -124,7 +124,7 @@
     Flammable:
       methods: [ Touch ]
       effects:
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.3
       - !type:Ignite
       - !type:Emote
@@ -170,19 +170,19 @@
       - !type:SatiateThirst
         factor: 1
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [Vox]
     Poison:
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Vox]
+          inverted: true
         damage:
           types:
             Poison: 1
-      - !type:FlammableReaction
+      - !type:Flammable
         multiplier: 0.4
 
 - type: reagent
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 33a94c0792..ea7437aa7b 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -67,16 +67,16 @@
         emote: Yawn
         showInChat: true
         probability: 0.1
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
       - !type:ModifyStatusEffect
         effectProto: StatusEffectDrowsiness
         time: 4
-        type: Add
+        type: Update
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: ChloralHydrate
           min: 20
         damage:
@@ -98,9 +98,10 @@
           damage:
             types:
               Poison: 2
-        - !type:ChemVomit
+        - !type:Vomit
           conditions:
-          - !type:ReagentThreshold
+          - !type:ReagentCondition
+            reagent: GastroToxin
             min: 2
           probability: 0.2
 
@@ -144,7 +145,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
@@ -183,7 +184,7 @@
       - !type:SatiateThirst
         factor: -1.5
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: true
         damage:
           types:
@@ -206,7 +207,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
@@ -256,7 +257,7 @@
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true
+        scaling: true
         ignoreResistances: false
         damage:
           types:
@@ -378,7 +379,8 @@
       # todo: cough, sneeze
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Histamine
           min: 45
         damage:
           groups:
@@ -392,7 +394,8 @@
         probability: 0.1
       - !type:PopupMessage
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Histamine
           min: 45
         type: Local
         visualType: Medium
@@ -414,16 +417,16 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Animal # Applying damage to the mobs with lower metabolism capabilities
+        - !type:MetabolizerTypeCondition
+          type: [Animal] # Applying damage to the mobs with lower metabolism capabilities
         damage:
           types:
             Poison: 0.4
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.04 #Scaled for time, not metabolismrate.
         conditions:
-          - !type:OrganType
-            type: Animal
+          - !type:MetabolizerTypeCondition
+            type: [Animal]
 
 - type: reagent
   id: Amatoxin
@@ -473,7 +476,8 @@
       effects:
         - !type:CauseZombieInfection
           conditions:
-            - !type:ReagentThreshold
+            - !type:ReagentCondition
+              reagent: Romerol
               min: 5
 
 - type: reagent
@@ -489,46 +493,37 @@
       effects:
       - !type:PopupMessage
         conditions:
-          - !type:OrganType
-            type: Animal
-            shouldHave: false
-          - !type:OrganType
-            type: Vox
-            shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Animal, Vox ]
+          inverted: true
         type: Local
         visualType: MediumCaution
         messages: [ "generic-reagent-effect-sick" ]
         probability: 0.5
-      - !type:ChemVomit
+      - !type:Vomit
         probability: 0.1
         conditions:
-          - !type:OrganType
-            type: Animal
-            shouldHave: false
-          - !type:OrganType
-            type: Vox
-            shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Animal, Vox ]
+          inverted: true
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Animal
-          shouldHave: false
-        - !type:OrganType
-          type: Vox
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [ Animal, Vox ]
+          inverted: true
         damage:
           types:
             Poison: 1
       - !type:AdjustReagent
         conditions:
-        - !type:OrganType
-          type: Animal
+        - !type:MetabolizerTypeCondition
+          type: [ Animal ]
         reagent: Protein
         amount: 0.5
       - !type:AdjustReagent
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [ Vox ]
         reagent: Protein
         amount: 0.25
 
@@ -546,10 +541,11 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Allicin
           min: 1
-        - !type:OrganType
-          type: Animal
+        - !type:MetabolizerTypeCondition
+          type: [Animal]
         damage:
           types:
             Poison: 0.06
@@ -572,7 +568,6 @@
       - !type:GenericStatusEffect
         key: Pacified
         component: Pacified
-        type: Add
         time: 4
 
 - type: reagent
@@ -595,10 +590,11 @@
         probability: 0.2
       - !type:HealthChange
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Honk
           min: 1
-        - !type:OrganType
-          type: Animal
+        - !type:MetabolizerTypeCondition
+          type: [ Animal ]
         damage:
           types:
             Poison: 0.06
@@ -652,9 +648,10 @@
       effects:
       - !type:Jitter
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
+          reagent: Vestine
           min: 5
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         walkSpeedModifier: 0.8
         sprintSpeedModifier: 0.8
       - !type:HealthChange
@@ -692,7 +689,7 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:Hunger
+        - !type:HungerCondition
           max: 50
         damage:
           types:
@@ -716,30 +713,30 @@
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Arachnid]
+          inverted: true
         damage:
           types:
             Poison: 1.6
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Mechanotoxin
           min: 2
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Arachnid]
+          inverted: true
         walkSpeedModifier: 0.8
         sprintSpeedModifier: 0.8
-      - !type:MovespeedModifier
+      - !type:MovementSpeedModifier
         conditions:
-        - !type:ReagentThreshold
+        - !type:ReagentCondition
           reagent: Mechanotoxin
           min: 4
-        - !type:OrganType
-          type: Arachnid
-          shouldHave: false
+        - !type:MetabolizerTypeCondition
+          type: [Arachnid]
+          inverted: true
         walkSpeedModifier: 0.4
         sprintSpeedModifier: 0.4
 
@@ -756,5 +753,5 @@
       - !type:SatiateHunger
         factor: 1
         conditions:
-        - !type:OrganType
-          type: Vox
+        - !type:MetabolizerTypeCondition
+          type: [Vox]
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
index e7e1086ea4..9a958105bd 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
@@ -27,6 +27,13 @@
             - material: FloorCarpetBlue
               amount: 1
               doAfter: 1
+        - to: CurtainsSkyBlue
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+          - material: FloorCarpetSkyBlue
+            amount: 1
+            doAfter: 1
         - to: CurtainsCyan
           completed:
             - !type:SnapToGrid { }
@@ -146,6 +153,29 @@
             - tool: Cutting
               doAfter: 1
 
+    - node: CurtainsSkyBlue
+      entity: CurtainsSkyBlue
+      edges:
+      - to: start
+        completed:
+        - !type:GivePrototype
+          prototype: FloorCarpetItemSkyBlue
+          amount: 1
+        steps:
+        - tool: Cutting
+          doAfter: 1
+    - node: CurtainsSkyBlueOpen
+      entity: CurtainsSkyBlueOpen
+      edges:
+      - to: start
+        completed:
+        - !type:GivePrototype
+          prototype: FloorCarpetItemSkyBlue
+          amount: 1
+        steps:
+        - tool: Cutting
+          doAfter: 1
+
     - node: CurtainsCyan
       entity: CurtainsCyan
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml
index a0f1e99f31..a5ff712806 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml
@@ -42,7 +42,7 @@
         - to: chairRitual
           completed:
             - !type:SpawnPrototype
-              prototype: HeadHuman
+              prototype: HeadSkeleton
               amount: 1
           steps:
             - tool: Prying
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
index c0721cf154..232339213f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
@@ -244,6 +244,11 @@
             - material: FloorCarpetBlue
               amount: 1
 
+        - to: TableFancySkyBlue
+          steps:
+            - material: FloorCarpetSkyBlue
+              amount: 1
+
         - to: TableFancyCyan
           steps:
             - material: FloorCarpetCyan
@@ -315,6 +320,18 @@
             - tool: Prying
               doAfter: 1
 
+    - node: TableFancySkyBlue
+      entity: TableFancySkyBlue
+      edges:
+        - to: TableWood
+          completed:
+          - !type:SpawnPrototype
+            prototype: FloorCarpetItemSkyBlue
+            amount: 1
+          steps:
+          - tool: Prying
+            doAfter: 1
+
     - node: TableFancyCyan
       entity: TableFancyCyan
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 80ddd7d2dc..889fbd2d2d 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -340,6 +340,19 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  id: TableFancySkyBlue
+  name: construction-recipe-table-fancy-sky-blue
+  graph: Table
+  startNode: start
+  targetNode: TableFancySkyBlue
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
 - type: construction
   id: TableFancyCyan
   name: construction-recipe-table-fancy-cyan
@@ -576,6 +589,17 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: true
 
+- type: construction
+  id: CurtainsSkyBlue
+  name: construction-recipe-curtains-sky-blue
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsSkyBlue
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+
 - type: construction
   id: CurtainsCyan
   name: construction-recipe-curtains-cyan
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 53577fd999..8499e88470 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -12,7 +12,7 @@
   name: cotton bun recipe
   result: FoodCottonBun
   time: 5
-  group: Breads
+  group: Moth
   solids:
     FoodDoughCottonSlice: 1
 
@@ -401,7 +401,7 @@
   name: banana bread recipe
   result: FoodBreadBanana
   time: 15
-  group: LoafCakes
+  group: Breads
   solids:
     FoodDough: 1
     FoodBanana: 1
@@ -2393,6 +2393,7 @@
   name: grilled cheese sandwich recipe
   result: FoodBakedGrilledCheeseSandwich
   time: 10
+  group: Savory
   solids:
     FoodBreadPlainSlice: 2
     FoodCheeseSlice: 1
@@ -2403,6 +2404,7 @@
   name: cotton grilled cheese sandwich recipe
   result: FoodBakedGrilledCheeseSandwichCotton
   time: 10
+  group: Moth
   solids:
     FoodBreadCottonSlice: 2
     FoodCheeseSlice: 1
@@ -2453,9 +2455,8 @@
   name: cotton cake recipe
   result: FoodCakeCotton
   time: 5
-  group: Cake
+  group: Moth
   reagents:
     Fiber: 10
   solids:
     FoodCakePlain: 1
-    
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
new file mode 100644
index 0000000000..56ee3803e0
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/hugbot.yml
@@ -0,0 +1,33 @@
+- type: constructionGraph
+  id: HugBot
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: bot
+      steps:
+      - tag: BoxHug
+        icon:
+          sprite: Objects/Storage/boxes.rsi
+          state: box_hug
+        name: construction-graph-tag-boxhug
+      - tag: ProximitySensor
+        icon:
+          sprite: Objects/Misc/proximity_sensor.rsi
+          state: icon
+        name: construction-graph-tag-proximity-sensor
+        doAfter: 2
+      - tag: BorgArm
+        icon:
+          sprite: Mobs/Silicon/drone.rsi
+          state: l_hand
+        name: construction-graph-tag-borg-arm
+        doAfter: 2
+      - tag: BorgArm
+        icon:
+          sprite: Mobs/Silicon/drone.rsi
+          state: l_hand
+        name: construction-graph-tag-borg-arm
+        doAfter: 2
+  - node: bot
+    entity: MobHugBot
diff --git a/Resources/Prototypes/Recipes/Crafting/bots.yml b/Resources/Prototypes/Recipes/Crafting/bots.yml
index f76d545e94..d5eb1f941e 100644
--- a/Resources/Prototypes/Recipes/Crafting/bots.yml
+++ b/Resources/Prototypes/Recipes/Crafting/bots.yml
@@ -53,3 +53,11 @@
   targetNode: bot
   category: construction-category-utilities
   objectType: Item
+
+- type: construction
+  id: hugbot
+  graph: HugBot
+  startNode: start
+  targetNode: bot
+  category: construction-category-utilities
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml b/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
index 49ac26c52b..b8c91d431b 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
@@ -20,6 +20,7 @@
   - BioGenLeft4Zed
   - BioGenEZNutrient
   - BioGenRobustHarvest
+  - BioGenDiseaseSwab
 
 - type: latheRecipePack
   id: BioGenMaterialsStatic
@@ -28,3 +29,8 @@
   - BioGenMaterialCardboard1
   - BioGenPaper
   - BioGenPaperRolling1
+
+- type: latheRecipePack
+  id: BioGenEmagStatic
+  recipes:
+  - BioGenUnstableMutagen
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
index aa95781729..a0a814a7b6 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
@@ -200,6 +200,7 @@
   - CarpetPurple
   - CarpetCyan
   - CarpetWhite
+  - CarpetSkyBlue
 
 - type: latheRecipePack
   id: ClothingCentComm
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
index 0b6cccf78b..0bb3c49fe9 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -16,6 +16,7 @@
   - PillCanister
   - HandLabeler
   - BaseChemistryEmptyVial
+  - Dropper
 
 - type: latheRecipePack
   parent: BasicChemistryStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index 2db59977be..5d47f01544 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -15,6 +15,7 @@
   - BorgModuleCable
   - BorgModuleFireExtinguisher
   - BorgModuleInflatable
+  - BorgModuleArtistry
 
 - type: latheRecipePack
   id: BorgLimbsStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
index f0147d9ca5..dce61b5a01 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
@@ -4,6 +4,7 @@
   id: MaterialsStatic
   recipes:
   - SheetRGlass
+  - MaterialDurathread
 
 - type: latheRecipePack
   id: PartsStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
index 8c87f80780..71d0bee2fb 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
@@ -7,3 +7,5 @@
   - MagazineShotgun
   - MagazineShotgunEmpty
   - MagazineShotgunSlug
+  - MagazinePistolCaselessRifle
+  - MagazineBoxAntiMateriel
diff --git a/Resources/Prototypes/Recipes/Lathes/ammo.yml b/Resources/Prototypes/Recipes/Lathes/ammo.yml
index 2b4a4590fa..79104471a5 100644
--- a/Resources/Prototypes/Recipes/Lathes/ammo.yml
+++ b/Resources/Prototypes/Recipes/Lathes/ammo.yml
@@ -92,6 +92,14 @@
     Plastic: 500
     Uranium: 500
 
+# .25 Caseless
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolCaselessRifle
+  result: MagazinePistolCaselessRifle
+  materials:
+    Steel: 145
+
 # .30 Rifle
 - type: latheRecipe
   parent: BaseEmptyAmmoRecipe
@@ -452,6 +460,14 @@
     Steel: 80
     Plastic: 80
 
+# .60 anti-materiel
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxAntiMateriel
+  result: MagazineBoxAntiMateriel
+  materials:
+    Steel: 200
+
 # Encampment ammo
 - type: latheRecipe
   id: MagazineGrenadeEmpty
diff --git a/Resources/Prototypes/Recipes/Lathes/biogen.yml b/Resources/Prototypes/Recipes/Lathes/biogen.yml
index a22a535caa..57951c99b8 100644
--- a/Resources/Prototypes/Recipes/Lathes/biogen.yml
+++ b/Resources/Prototypes/Recipes/Lathes/biogen.yml
@@ -249,5 +249,24 @@
   materials:
     Biomass: 18
 
+- type: latheRecipe
+  id: BioGenDiseaseSwab
+  result: DiseaseSwab
+  categories:
+  - Materials
+  completetime: 3
+  materials:
+    Biomass: 2
 
-
+- type: latheRecipe
+  id: BioGenUnstableMutagen
+  resultReagents:
+    UnstableMutagen: 10
+  categories:
+  - Chemicals
+  icon:
+    sprite: Objects/Specific/Chemistry/bottle.rsi
+    state: bottle-1
+  completetime: 5
+  materials:
+    Biomass: 20
diff --git a/Resources/Prototypes/Recipes/Lathes/carpets.yml b/Resources/Prototypes/Recipes/Lathes/carpets.yml
index fe172879e7..d2d53cc524 100644
--- a/Resources/Prototypes/Recipes/Lathes/carpets.yml
+++ b/Resources/Prototypes/Recipes/Lathes/carpets.yml
@@ -27,6 +27,11 @@
   id: CarpetBlue
   result: FloorCarpetItemBlue
 
+- type: latheRecipe
+  parent: BaseCarpetRecipe
+  id: CarpetSkyBlue
+  result: FloorCarpetItemSkyBlue
+
 - type: latheRecipe
   parent: BaseCarpetRecipe
   id: CarpetGreen
diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
index a9e6f282e0..0b3b8352e5 100644
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -33,8 +33,8 @@
   result: Dropper
   completetime: 2
   materials:
-    Glass: 200
-    Plastic: 100
+    Glass: 50
+    Plastic: 50
 
 - type: latheRecipe
   id: Syringe
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 46e632e995..f683b07ef8 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -222,7 +222,7 @@
   completetime: 2
   materials:
     Wood: 100
-    Steel: 25
+    Steel: 50
 
 - type: latheRecipe
   id: BoxFolderPlasticClipboardEmpty
@@ -230,7 +230,7 @@
   completetime: 2
   materials:
     Plastic: 100
-    Steel: 25
+    Steel: 50
 
 - type: latheRecipe
   id: TowelColorWhite
diff --git a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
index 9465d7b87a..51f32d000e 100644
--- a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
@@ -42,6 +42,11 @@
   id: BorgModuleInflatable
   result: BorgModuleInflatable
 
+- type: latheRecipe
+  parent: BaseBorgModuleRecipe
+  id: BorgModuleArtistry
+  result: BorgModuleArtistry
+
 # Cargo Modules
 
 - type: latheRecipe
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 82ceceee77..74c6ad3596 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -32,6 +32,7 @@
 - type: latheRecipe
   id: SheetRGlass
   result: SheetRGlass1
+  applyMaterialDiscount: false # obvious dupe capabilities
   completetime: 0
   materials:
     Glass: 100
@@ -251,3 +252,12 @@
   completetime: 1
   materials:
     Cotton: 200 #my pyrocloth keeps catching on fire whenever I make it!
+
+- type: latheRecipe
+  id: MaterialDurathread
+  result: MaterialDurathread1
+  applyMaterialDiscount: false
+  completetime: 0
+  materials:
+    Cloth: 100
+    Plastic: 100
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index fef96df5cf..08221c6f1a 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -111,7 +111,7 @@
     Potassium:
       amount: 1
   effects:
-    - !type:ExplosionReactionEffect
+    - !type:Explosion
       explosionType: Default
       intensityPerUnit: 0.25
       maxTotalIntensity: 100
@@ -205,8 +205,8 @@
     Aluminium:
       amount: 1
   effects:
-    - !type:EmpReactionEffect
-      rangePerUnit: 0.2
+    - !type:Emp
+      rangeModifier: 0.2
       maxRange: 6
       energyConsumption: 12500
       duration: 15
@@ -224,7 +224,7 @@
     Sulfur:
       amount: 1
   effects:
-    - !type:FlashReactionEffect
+    - !type:Flash
 
 - type: reaction
   id: TableSalt
diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml
index e98d49c521..f9b819e43e 100644
--- a/Resources/Prototypes/Recipes/Reactions/food.yml
+++ b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -10,7 +10,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodCheese
 
 - type: reaction
@@ -25,7 +25,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodChevre
 
 - type: reaction
@@ -39,7 +39,7 @@
     Water:
       amount: 10
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodDough
 
 - type: reaction
@@ -55,7 +55,7 @@
     Egg:
       amount: 6
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodDoughCornmeal
 
 - type: reaction
@@ -69,7 +69,7 @@
     Water:
       amount: 10
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodDoughTortilla
 
 - type: reaction
@@ -85,7 +85,7 @@
     Water:
       amount: 10
   effects:
-  - !type:CreateEntityReactionEffect
+  - !type:SpawnEntity
     entity: FoodDoughCotton
 
 - type: reaction
@@ -103,7 +103,7 @@
     Milk:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodCakeBatter
 
 - type: reaction
@@ -118,7 +118,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodButter
 
 - type: reaction
@@ -134,7 +134,7 @@
     TableSalt:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodDoughPie
 
 # TG has a cake recipe that uses soy milk instead of eggs.
@@ -153,7 +153,7 @@
     Sugar:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodCakeBatter
 
 - type: reaction
@@ -168,7 +168,7 @@
       amount: 5
       catalyst: true
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodTofu
 
 - type: reaction
@@ -184,7 +184,7 @@
     Egg:
       amount: 6
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodMeatMeatball
 
 - type: reaction
@@ -200,7 +200,7 @@
     Sugar:
       amount: 2
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodSnackChocolateBar
 
 # Condiments
diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 35987b6be5..9245f36a36 100644
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -38,7 +38,7 @@
     Carbon:
       amount: 10
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: FoodMeat
 
 - type: reaction
@@ -75,7 +75,7 @@
     SulfuricAcid:
       amount: 2
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SheetPlastic1
 
 - type: reaction
@@ -153,7 +153,7 @@
     Ethanol:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: ShardCrystalRandom
 
 - type: reaction
@@ -169,7 +169,7 @@
     Charcoal:
       amount: 2
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: MaterialGunpowder
 
 - type: reaction
@@ -182,7 +182,7 @@
     FrostOil:
       amount: 5
   effects:
-  - !type:CreateEntityReactionEffect
+  - !type:SpawnEntity
     entity: IngotGold1
 
 - type: reaction
@@ -195,7 +195,7 @@
     FrostOil:
       amount: 5
   effects:
-  - !type:CreateEntityReactionEffect
+  - !type:SpawnEntity
     entity: IngotSilver1
 
 - type: reaction
@@ -208,7 +208,7 @@
     JuiceThatMakesYouHew:
       amount: 1
   effects:
-  - !type:ExplosionReactionEffect
+  - !type:Explosion
     explosionType: Radioactive
     maxIntensity: 200
     intensityPerUnit: 2
diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
index 3591ce7008..b3b01ab515 100644
--- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
+++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
@@ -39,7 +39,7 @@
     Fluorine:
       amount: 3
   effects:
-  - !type:ExplosionReactionEffect
+  - !type:Explosion
     explosionType: Default # 15 damage per intensity.
     maxIntensity: 200
     intensityPerUnit: 5
@@ -72,4 +72,4 @@
   products:
     Ethanol: 5
     Hydrogen: 3
-    Sulfur: 2
\ No newline at end of file
+    Sulfur: 2
diff --git a/Resources/Prototypes/Recipes/Reactions/soap.yml b/Resources/Prototypes/Recipes/Reactions/soap.yml
index d07c582f8b..0a1b2e4ad6 100644
--- a/Resources/Prototypes/Recipes/Reactions/soap.yml
+++ b/Resources/Prototypes/Recipes/Reactions/soap.yml
@@ -2,7 +2,8 @@
   id: CreateSoapRegular
   impact: Low
   quantized: true
-  minTemp: 383 # Water boiling point + 10 Kelvin. We are boiling it
+  minTemp: 373 # Water boiling point. We are boiling it
+  priority: -1 # Ensures that the more complicated soaps get made instead
   reactants:
     Oil:
       amount: 10
@@ -11,14 +12,14 @@
     TableSalt:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: Soap
 
 - type: reaction
   id: CreateSoapNT
   impact: Low
   quantized: true
-  minTemp: 373 # Water boiling point. We are boiling it too, but with higher priority!
+  minTemp: 373
   reactants:
     Oil:
       amount: 15
@@ -29,7 +30,7 @@
     Plasma:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapNT
 
 - type: reaction
@@ -47,7 +48,7 @@
     JuiceBerry:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapDeluxe
 
 - type: reaction
@@ -65,7 +66,7 @@
     Blood:
       amount: 10
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapHomemade
 
 - type: reaction
@@ -83,7 +84,7 @@
     Stimulants:
       amount: 5
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapSyndie
 
 - type: reaction
@@ -115,5 +116,5 @@
     Amatoxin:
       amount: 1
   effects:
-    - !type:CreateEntityReactionEffect
+    - !type:SpawnEntity
       entity: SoapOmega
diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index 9cacfab581..e8d9f1d021 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -19,7 +19,7 @@
     outerClothing: ClothingOuterSuitSpaceNinja
     shoes: ClothingShoesSpaceNinja
     id: AgentIDCard
-    ears: ClothingHeadsetGrey
+    ears: ClothingHeadsetNinja
     pocket1: SpiderCharge
     pocket2: PinpointerStation
     belt: EnergyKatana
diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
index b92f16bbe9..ec47c720c8 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -23,6 +23,8 @@
   - Detective
   - Cryogenics
   - External
+  - GenpopEnter
+  - GenpopLeave
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 98fcc8f370..eb937dbda6 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -25,6 +25,8 @@
   - Service
   - External
   - Cryogenics
+  - GenpopEnter
+  - GenpopLeave
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index e51fcb54cf..6b1eeb764b 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -22,6 +22,8 @@
   - Service
   - External
   - Cryogenics
+  - GenpopEnter
+  - GenpopLeave
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 371b592f23..1a2debc038 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -25,6 +25,8 @@
   - External
   - Detective
   - Cryogenics
+  - GenpopEnter
+  - GenpopLeave
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml
index d01db69e0d..b29709b0f2 100644
--- a/Resources/Prototypes/Species/vox.yml
+++ b/Resources/Prototypes/Species/vox.yml
@@ -46,7 +46,7 @@
       points: 1
       required: false
     Head:
-      points: 1
+      points: 4
       required: true
     Snout:
       points: 1
diff --git a/Resources/Prototypes/Stacks/Materials/crystals.yml b/Resources/Prototypes/Stacks/Materials/crystals.yml
deleted file mode 100644
index e5fda560c8..0000000000
--- a/Resources/Prototypes/Stacks/Materials/crystals.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: stack
-  id: Telecrystal
-  name: stack-telecrystal
-  icon: Objects/Specific/Syndicate/telecrystal.rsi
-  spawn: Telecrystal1
diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml
deleted file mode 100644
index 154dacc679..0000000000
--- a/Resources/Prototypes/Stacks/Materials/ingots.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: stack
-  id: Gold
-  name: stack-gold
-  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
-  spawn: IngotGold1
-  maxCount: 30
-
-- type: stack
-  id: Silver
-  name: stack-silver
-  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
-  spawn: IngotSilver1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml
deleted file mode 100644
index a759922900..0000000000
--- a/Resources/Prototypes/Stacks/Materials/materials.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-- type: stack
-  id: Biomass
-  name: stack-biomass
-  icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
-  spawn: MaterialBiomass1
-  maxCount: 100
-
-- type: stack
-  id: WoodPlank
-  name: stack-wood-plank
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
-  spawn: MaterialWoodPlank1
-  maxCount: 30
-
-- type: stack
-  id: Cardboard
-  name: stack-cardboard
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
-  spawn: MaterialCardboard1
-  maxCount: 30
-
-- type: stack
-  id: Cloth
-  name: stack-cloth
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
-  spawn: MaterialCloth1
-  maxCount: 30
-
-- type: stack
-  id: Durathread
-  name: stack-durathread
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
-  spawn: MaterialDurathread1
-  maxCount: 30
-
-- type: stack
-  id: Diamond
-  name: stack-diamond
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
-  spawn: MaterialDiamond1
-  maxCount: 30
-
-- type: stack
-  id: Cotton
-  name: stack-cotton
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
-  spawn: MaterialCotton1
-  maxCount: 30
-
-- type: stack
-  id: Pyrotton
-  name: stack-pyrotton
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
-  spawn: MaterialPyrotton1
-  maxCount: 30
-
-- type: stack
-  id: Bananium
-  name: stack-bananium
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
-  spawn: MaterialBananium1
-  maxCount: 10
-
-- type: stack
-  id: MeatSheets
-  name: stack-meat-sheet
-  icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
-  spawn: MaterialSheetMeat1
-  maxCount: 30
-
-- type: stack
-  id: WebSilk
-  name: stack-silk
-  icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
-  spawn: MaterialWebSilk1
-  maxCount: 50
-
-- type: stack
-  id: SpaceCarpTooth
-  name: stack-space-carp-tooth
-  icon: { sprite: /Textures/Objects/Materials/Mob/carptooth.rsi, state: tooth }
-  spawn: MaterialToothSpaceCarp1
-  maxCount: 30
-
-- type: stack
-  id: SharkMinnowTooth
-  name: stack-sharkminnow-tooth
-  icon: { sprite: /Textures/Objects/Materials/Mob/sharktooth.rsi, state: tooth }
-  spawn: MaterialToothSharkminnow1
-  maxCount: 30
-
-- type: stack
-  id: Bones
-  name: stack-bones
-  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones }
-  spawn: MaterialBones1
-  maxCount: 30
-
-- type: stack
-  id: Gunpowder
-  name: stack-gunpowder
-  icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
-  spawn: MaterialGunpowder
-  maxCount: 60
-
-- type: stack
-  id: GoliathHide
-  name: stack-goliath-hide
-  icon: { sprite: /Textures/Objects/Materials/hide.rsi, state: goliath_hide }
-  spawn: MaterialGoliathHide1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/parts.yml b/Resources/Prototypes/Stacks/Materials/parts.yml
deleted file mode 100644
index 3b6fb4bcff..0000000000
--- a/Resources/Prototypes/Stacks/Materials/parts.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: stack
-  id: MetalRod
-  name: stack-rods
-  icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
-  spawn: PartRodMetal1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml b/Resources/Prototypes/Stacks/Sheets/glass.yml
similarity index 87%
rename from Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
rename to Resources/Prototypes/Stacks/Sheets/glass.yml
index c3752b62ae..2984b9f2e4 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Stacks/Sheets/glass.yml
@@ -1,48 +1,48 @@
 - type: stack
+  parent: BaseSheetStack
   id: Glass
   name: stack-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: glass }
   spawn: SheetGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: ReinforcedGlass
   name: stack-reinforced-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rglass }
   spawn: SheetRGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: PlasmaGlass
   name: stack-plasma-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: pglass }
   spawn: SheetPGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: ReinforcedPlasmaGlass
   name: stack-reinforced-plasma-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rpglass }
   spawn: SheetRPGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: UraniumGlass
   name: stack-uranium-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: uglass }
   spawn: SheetUGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: ReinforcedUraniumGlass
   name: stack-reinforced-uranium-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: ruglass }
   spawn: SheetRUGlass1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: ClockworkGlass
   name: stack-clockwork-glass
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: cglass }
   spawn: SheetClockworkGlass1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Sheets/metal.yml
similarity index 85%
rename from Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
rename to Resources/Prototypes/Stacks/Sheets/metal.yml
index 90c37e3dda..188a4e30b2 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Stacks/Sheets/metal.yml
@@ -1,20 +1,20 @@
 - type: stack
+  parent: BaseSheetStack
   id: Steel
   name: stack-steel
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: steel }
   spawn: SheetSteel1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: Plasteel
   name: stack-plasteel
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plasteel }
   spawn: SheetPlasteel1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: Brass
   name: stack-brass
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: brass }
   spawn: SheetBrass1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Sheets/organic.yml b/Resources/Prototypes/Stacks/Sheets/organic.yml
new file mode 100644
index 0000000000..7239a72269
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Sheets/organic.yml
@@ -0,0 +1,13 @@
+- type: stack
+  parent: BaseSheetStack
+  id: Paper
+  name: stack-paper
+  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
+  spawn: SheetPaper1
+
+- type: stack
+  parent: BaseSheetStack
+  id: MeatSheets
+  name: stack-meat-sheet
+  icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
+  spawn: MaterialSheetMeat1
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml b/Resources/Prototypes/Stacks/Sheets/other.yml
similarity index 68%
rename from Resources/Prototypes/Stacks/Materials/Sheets/other.yml
rename to Resources/Prototypes/Stacks/Sheets/other.yml
index a86b4bec6f..082919d39d 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Stacks/Sheets/other.yml
@@ -1,27 +1,20 @@
 - type: stack
-  id: Paper
-  name: stack-paper
-  icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
-  spawn: SheetPaper1
-  maxCount: 30
-
-- type: stack
+  parent: BaseSheetStack
   id: Plasma
   name: stack-plasma
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plasma }
   spawn: SheetPlasma1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: Plastic
   name: stack-plastic
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plastic }
   spawn: SheetPlastic1
-  maxCount: 30
 
 - type: stack
+  parent: BaseSheetStack
   id: Uranium
   name: stack-uranium
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: uranium }
   spawn: SheetUranium1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Specific/engineering.yml b/Resources/Prototypes/Stacks/Specific/engineering.yml
new file mode 100644
index 0000000000..86e339e693
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Specific/engineering.yml
@@ -0,0 +1,36 @@
+# they're uninflated by default so they're tiny
+- type: stack
+  parent: BaseSmallStack
+  id: InflatableWall
+  name: stack-inflatable-wall
+  icon: { sprite: "/Textures/Objects/Misc/inflatable_wall.rsi", state: item_wall }
+  spawn: InflatableWallStack1
+
+- type: stack
+  id: InflatableDoor
+  name: stack-inflatable-door
+  icon: { sprite: "/Textures/Objects/Misc/inflatable_door.rsi", state: item_door }
+  spawn: InflatableDoorStack1
+  maxCount: 4 # Maybe increased to 5 to reuse the base?
+
+# Cables
+- type: stack
+  parent: BaseMediumStack
+  id: Cable
+  name: stack-lv-cable
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
+  spawn: CableApcStack1
+
+- type: stack
+  parent: BaseMediumStack
+  id: CableMV
+  name: stack-mv-cable
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
+  spawn: CableMVStack1
+
+- type: stack
+  parent: BaseMediumStack
+  id: CableHV
+  name: stack-hv-cable
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
+  spawn: CableHVStack1
diff --git a/Resources/Prototypes/Stacks/medical_stacks.yml b/Resources/Prototypes/Stacks/Specific/medical.yml
similarity index 85%
rename from Resources/Prototypes/Stacks/medical_stacks.yml
rename to Resources/Prototypes/Stacks/Specific/medical.yml
index 5c4e98f6f6..65691b0e8a 100644
--- a/Resources/Prototypes/Stacks/medical_stacks.yml
+++ b/Resources/Prototypes/Stacks/Specific/medical.yml
@@ -1,49 +1,51 @@
+# Topical medicines
+
 - type: stack
+  parent: BaseSmallStack
   id: Ointment
   name: stack-ointment
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment }
   spawn: Ointment
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: AloeCream
   name: stack-aloe-cream
   icon: { sprite: "/Textures/Objects/Specific/Hydroponics/aloe.rsi", state: cream }
   spawn: AloeCream
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: Gauze
   name: stack-gauze
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Gauze
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: Brutepack
   name: stack-brutepack
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Brutepack
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: Bloodpack
   name: stack-bloodpack
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: bloodpack }
   spawn: Bloodpack
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: MedicatedSuture
   name: stack-medicated-suture
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: medicated-suture }
   spawn: MedicatedSuture
-  maxCount: 10
 
 - type: stack
+  parent: BaseSmallStack
   id: RegenerativeMesh
   name: stack-regenerative-mesh
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: regenerative-mesh}
   spawn: RegenerativeMesh
-  maxCount: 10
 
diff --git a/Resources/Prototypes/Stacks/science_stacks.yml b/Resources/Prototypes/Stacks/Specific/science.yml
similarity index 63%
rename from Resources/Prototypes/Stacks/science_stacks.yml
rename to Resources/Prototypes/Stacks/Specific/science.yml
index 0dfc5444fd..610464b33e 100644
--- a/Resources/Prototypes/Stacks/science_stacks.yml
+++ b/Resources/Prototypes/Stacks/Specific/science.yml
@@ -1,13 +1,13 @@
 - type: stack
+  parent: BaseMediumStack
   id: ArtifactFragment
   name: stack-artifact-fragment
+  icon: { sprite: /Textures/Objects/Specific/Xenoarchaeology/artifact_fragments.rsi, state: martianball1 }
   spawn: ArtifactFragment1
-  maxCount: 30
-
 
 - type: stack
+  parent: BaseSmallStack
   id: Manipulator
   name: stack-micro-manipulator
   icon: { sprite: /Textures/Objects/Misc/stock_parts.rsi, state: micro_mani }
   spawn: MicroManipulatorStockPart
-  maxCount: 10
diff --git a/Resources/Prototypes/Stacks/Specific/security.yml b/Resources/Prototypes/Stacks/Specific/security.yml
new file mode 100644
index 0000000000..7b3d60f1bc
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Specific/security.yml
@@ -0,0 +1,6 @@
+- type: stack
+  parent: BaseMediumStack
+  id: CableDet
+  name: stack-explosive-cord
+  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilex-30 }
+  spawn: CableDetStack1
diff --git a/Resources/Prototypes/Stacks/Tiles/alien.yml b/Resources/Prototypes/Stacks/Tiles/alien.yml
new file mode 100644
index 0000000000..8ccca8b5b7
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/alien.yml
@@ -0,0 +1,38 @@
+# Tiles you might find in an alien world
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXenoborg
+  name: stack-xenoborg
+  spawn: FloorTileItemXenoborg
+
+# Exo station
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXeno
+  name: stack-xeno-floor
+  spawn: FloorTileItemXeno
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXenoSteel
+  name: stack-xeno-steel
+  spawn: FloorTileItemXenoSteelCorner
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXenoSteelCorner
+  name: stack-xeno-steel-corner
+  spawn: FloorTileItemXenoSteelCorner
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileXenoMaint
+  name: stack-xeno-maint
+  spawn: FloorTileItemXenoSteelCorner
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkSquiggly
+  name: stack-dark-squiggly
+  spawn: FloorTileItemDarkSquiggly
diff --git a/Resources/Prototypes/Stacks/Tiles/brass.yml b/Resources/Prototypes/Stacks/Tiles/brass.yml
new file mode 100644
index 0000000000..5fbec41449
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/brass.yml
@@ -0,0 +1,13 @@
+# Tiles made of brass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBrassFilled
+  name: stack-filled-brass-plate
+  spawn: FloorTileItemBrassFilled
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBrassReebe
+  name: stack-smooth-brass-plate
+  spawn: FloorTileItemBrassReebe
diff --git a/Resources/Prototypes/Stacks/Tiles/carpet.yml b/Resources/Prototypes/Stacks/Tiles/carpet.yml
new file mode 100644
index 0000000000..47b239f39d
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/carpet.yml
@@ -0,0 +1,84 @@
+# Carpets that are tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackCarpetClown
+  name: stack-clown-carpet-tile
+  spawn: FloorTileItemCarpetClown
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackCarpetOffice
+  name: stack-office-carpet-tile
+  spawn: FloorTileItemCarpetOffice
+
+# Carpets that are not actually tiles (yet)
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetRed
+  name: stack-red-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-red }
+  spawn: FloorCarpetItemRed
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetBlack
+  name: stack-black-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-black }
+  spawn: FloorCarpetItemBlack
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetBlue
+  name: stack-blue-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-blue }
+  spawn: FloorCarpetItemBlue
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetGreen
+  name: stack-green-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-green }
+  spawn: FloorCarpetItemGreen
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetOrange
+  name: stack-orange-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-orange }
+  spawn: FloorCarpetItemOrange
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetSkyBlue
+  name: stack-skyblue-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-skyblue }
+  spawn: FloorCarpetItemSkyBlue
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetPurple
+  name: stack-purple-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-purple }
+  spawn: FloorCarpetItemPurple
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetPink
+  name: stack-pink-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-pink }
+  spawn: FloorCarpetItemPink
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetCyan
+  name: stack-cyan-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-cyan }
+  spawn: FloorCarpetItemCyan
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorCarpetWhite
+  name: stack-white-carpet-tile
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-white }
+  spawn: FloorCarpetItemWhite
diff --git a/Resources/Prototypes/Stacks/Tiles/concrete.yml b/Resources/Prototypes/Stacks/Tiles/concrete.yml
new file mode 100644
index 0000000000..a10b2e212e
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/concrete.yml
@@ -0,0 +1,55 @@
+# Tiles made of concrete
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileConcrete
+  name: stack-concrete-tile
+  spawn: FloorTileItemGrayConcrete
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileConcreteMono
+  name: stack-concrete-mono-tile
+  spawn: FloorTileItemConcreteMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileConcreteSmooth
+  name: stack-concrete-smooth
+  spawn: FloorTileItemConcreteSmooth
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrayConcrete
+  name: stack-gray-concrete-tile
+  spawn: FloorTileItemGrayConcrete
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrayConcreteMono
+  name: stack-gray-concrete-mono-tile
+  spawn: FloorTileItemGrayConcreteMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrayConcreteSmooth
+  name: stack-gray-concrete-smooth
+  spawn: FloorTileItemGrayConcreteSmooth
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileOldConcrete
+  name: stack-old-concrete-tile
+  spawn: FloorTileItemOldConcrete
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileOldConcreteMono
+  name: stack-old-concrete-mono-tile
+  spawn: FloorTileItemOldConcreteMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileOldConcreteSmooth
+  name: stack-old-concrete-smooth
+  spawn: FloorTileItemOldConcreteSmooth
diff --git a/Resources/Prototypes/Stacks/Tiles/electronic.yml b/Resources/Prototypes/Stacks/Tiles/electronic.yml
new file mode 100644
index 0000000000..f8923dc989
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/electronic.yml
@@ -0,0 +1,19 @@
+# electronic or computery looking tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGCircuit
+  name: stack-green-circuit-floor
+  spawn: FloorTileItemGCircuit
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBCircuit
+  name: stack-bcircuit-floor-tile
+  spawn: FloorTileItemBCircuit
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileRCircuit
+  name: stack-red-circuit-floor
+  spawn: FloorTileItemRCircuit
diff --git a/Resources/Prototypes/Stacks/Tiles/fancy.yml b/Resources/Prototypes/Stacks/Tiles/fancy.yml
new file mode 100644
index 0000000000..f4a06c1b66
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/fancy.yml
@@ -0,0 +1,37 @@
+# expensive looking tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGold
+  name: stack-gold-floor
+  spawn: FloorTileItemGold
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSilver
+  name: stack-silver-floor-tile
+  spawn: FloorTileItemSilver
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteMarble
+  name: stack-white-marble-floor
+  spawn: FloorTileItemWhiteMarble
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkMarble
+  name: stack-dark-marble-floor
+  spawn: FloorTileItemDarkMarble
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTilePlasmaMarble
+  name: stack-plasma-marble-floor
+  spawn: FloorTileItemPlasmaMarble
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileUraniumMarble
+  name: stack-uranium-marble-floor
+  spawn: FloorTileItemUraniumMarble
diff --git a/Resources/Prototypes/Stacks/Tiles/faux.yml b/Resources/Prototypes/Stacks/Tiles/faux.yml
new file mode 100644
index 0000000000..00c9e52525
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/faux.yml
@@ -0,0 +1,55 @@
+# Faux tiles that mimic planet terrain
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroGrass
+  name: stack-astro-grass-floor
+  spawn: FloorTileItemAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMowedAstroGrass
+  name: stack-mowed-astro-grass-floor
+  spawn: FloorTileItemMowedAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileJungleAstroGrass
+  name: stack-jungle-astro-grass-floor
+  spawn: FloorTileItemJungleAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkAstroGrass
+  name: stack-dark-astro-grass-floor
+  spawn: FloorTileItemDarkAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileLightAstroGrass
+  name: stack-light-astro-grass-floor
+  spawn: FloorTileItemLightAstroGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroIce
+  name: stack-astro-ice-floor
+  spawn: FloorTileItemAstroIce
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroSnow
+  name: stack-astro-snow-floor
+  spawn: FloorTileItemAstroSnow
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileAstroAsteroidSand
+  name: stack-asteroid-astro-sand-floor
+  spawn: FloorTileItemAstroAsteroidSand
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDesertAstroSand
+  name: stack-desert-astro-sand-floor
+  spawn: FloorTileItemDesertAstroSand
diff --git a/Resources/Prototypes/Stacks/Tiles/four_square.yml b/Resources/Prototypes/Stacks/Tiles/four_square.yml
new file mode 100644
index 0000000000..721ee5b1ab
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/four_square.yml
@@ -0,0 +1,112 @@
+# Tiles in a 4 square pattern
+
+# Single color
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileFreezer
+  name: stack-freezer-tile
+  spawn: FloorTileItemFreezer
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileShowroom
+  name: stack-showroom-tile
+  spawn: FloorTileItemShowroom
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileHydro
+  name: stack-hydro-tile
+  spawn: FloorTileItemHydro
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileLime
+  name: stack-lime-tile
+  spawn: FloorTileItemLime
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDirty
+  name: stack-dirty-tile
+  spawn: FloorTileItemDirty
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBlue
+  name: stack-blue-floor-tile
+  spawn: FloorTileItemBlue
+
+# Two color
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelCheckerDark
+  name: stack-steel-dark-checker-tile
+  spawn: FloorTileItemSteelCheckerDark
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelCheckerLight
+  name: stack-steel-light-checker-tile
+  spawn: FloorTileItemSteelCheckerLight
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileBar
+  name: stack-item-bar-floor-tile
+  spawn: FloorTileItemBar
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileClown
+  name: stack-clown-floor-tile
+  spawn: FloorTileItemClown
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMime
+  name: stack-mime-floor-tile
+  spawn: FloorTileItemMime
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileKitchen
+  name: stack-kitchen-floor-tile
+  spawn: FloorTileItemKitchen
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileLaundry
+  name: stack-laundry-floor-tile
+  spawn: FloorTileItemLaundry
+
+# Patterned
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileElevatorShaft
+  name: stack-elevator-shaft-tile
+  spawn: FloorTileItemElevatorShaft
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileRockVault
+  name: stack-rock-vault-tile
+  spawn: FloorTileItemRockVault
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMining
+  name: stack-mining-floor-tile
+  spawn: FloorTileItemMining
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMiningDark
+  name: stack-dark-mining-floor-tile
+  spawn: FloorTileItemMiningDark
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMiningLight
+  name: stack-light-mining-floor-tile
+  spawn: FloorTileItemMiningLight
diff --git a/Resources/Prototypes/Stacks/Tiles/maints.yml b/Resources/Prototypes/Stacks/Tiles/maints.yml
new file mode 100644
index 0000000000..3a1c5fd749
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/maints.yml
@@ -0,0 +1,25 @@
+# tiles typically found in maintenance
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileTechmaint
+  name: stack-techmaint-floor
+  spawn: FloorTileItemTechmaint
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelMaint
+  name: stack-steel-maint-floor
+  spawn: FloorTileItemSteelMaint
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGratingMaint
+  name: stack-grating-maint-floor
+  spawn: FloorTileItemGratingMaint
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileTechmaintDark
+  name: stack-techmaint-floor-dark
+  spawn: FloorTileItemTechmaintDark
diff --git a/Resources/Prototypes/Stacks/Tiles/organic.yml b/Resources/Prototypes/Stacks/Tiles/organic.yml
new file mode 100644
index 0000000000..ff51abc77e
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/organic.yml
@@ -0,0 +1,13 @@
+# tiles that are fleshy or come from a creature
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileFlesh
+  name: stack-flesh-floor
+  spawn: FloorTileItemFlesh
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWeb
+  name: stack-web-tile
+  spawn: FloorTileItemWeb
diff --git a/Resources/Prototypes/Stacks/Tiles/other.yml b/Resources/Prototypes/Stacks/Tiles/other.yml
new file mode 100644
index 0000000000..fc31421433
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/other.yml
@@ -0,0 +1,25 @@
+# Tiles that don't fit cleanly in another category
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMono
+  name: stack-mono-tile
+  spawn: FloorTileItemMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileMetalDiamond
+  name: stack-steel-tile
+  spawn: FloorTileItemMetalDiamond
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackBoxing
+  name: stack-boxing-ring-tile
+  spawn: FloorTileItemBoxing
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackGym
+  name: stack-gym-floor-tile
+  spawn: FloorTileItemGym
diff --git a/Resources/Prototypes/Stacks/Tiles/planet.yml b/Resources/Prototypes/Stacks/Tiles/planet.yml
new file mode 100644
index 0000000000..7a235c7d9d
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/planet.yml
@@ -0,0 +1,19 @@
+# tiles that spawn on planets and are generally unobtainable
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrass
+  name: stack-grass-floor-tile
+  spawn: FloorTileItemGrass
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileGrassJungle
+  name: stack-grass-jungle-floor-tile
+  spawn: FloorTileItemGrassJungle
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSnow
+  name: stack-snow-floor-tile
+  spawn: FloorTileItemSnow
diff --git a/Resources/Prototypes/Stacks/Tiles/retro.yml b/Resources/Prototypes/Stacks/Tiles/retro.yml
new file mode 100644
index 0000000000..4b1eba2e4c
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/retro.yml
@@ -0,0 +1,31 @@
+# Tiles that come straight from the eighties
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileLino
+  name: stack-linoleum-floor
+  spawn: FloorTileItemLino
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackEighties
+  name: stack-eighties-floor-tile
+  spawn: FloorTileItemEighties
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackArcadeBlue
+  name: stack-blue-arcade-tile
+  spawn: FloorTileItemArcadeBlue
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackArcadeBlue2
+  name: stack-blue-arcade-tile
+  spawn: FloorTileItemArcadeBlue2
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackArcadeRed
+  name: stack-red-arcade-tile
+  spawn: FloorTileItemArcadeRed
diff --git a/Resources/Prototypes/Stacks/Tiles/shuttle.yml b/Resources/Prototypes/Stacks/Tiles/shuttle.yml
new file mode 100644
index 0000000000..540eda3bbe
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/shuttle.yml
@@ -0,0 +1,43 @@
+# Tiles found on shuttles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleWhite
+  name: stack-white-shuttle-tile
+  spawn: FloorTileItemShuttleWhite
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleBlue
+  name: stack-blue-shuttle-tile
+  spawn: FloorTileItemShuttleBlue
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleOrange
+  name: stack-orange-shuttle-tile
+  spawn: FloorTileItemShuttleOrange
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttlePurple
+  name: stack-purple-shuttle-tile
+  spawn: FloorTileItemShuttlePurple
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleRed
+  name: stack-red-shuttle-tile
+  spawn: FloorTileItemShuttleRed
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleGrey
+  name: stack-grey-shuttle-tile
+  spawn: FloorTileItemShuttleGrey
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileStackShuttleBlack
+  name: stack-black-shuttle-tile
+  spawn: FloorTileItemShuttleBlack
diff --git a/Resources/Prototypes/Stacks/Tiles/steel.yml b/Resources/Prototypes/Stacks/Tiles/steel.yml
new file mode 100644
index 0000000000..1e283d68f9
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/steel.yml
@@ -0,0 +1,55 @@
+# Regular steel tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteel
+  name: stack-steel-tile
+  spawn: FloorTileItemSteel
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelOffset
+  name: stack-offset-steel-tile
+  spawn: FloorTileItemSteelOffset
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelDiagonalMini
+  name: stack-steel-diagonal-mini-tile
+  spawn: FloorTileItemSteelDiagonalMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelDiagonal
+  name: stack-steel-diagonal-tile
+  spawn: FloorTileItemSteelDiagonal
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelHerringbone
+  name: stack-steel-herringbone
+  spawn: FloorTileItemSteelHerringbone
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelMini
+  name: stack-steel-mini-tile
+  spawn: FloorTileItemSteelMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelMono
+  name: stack-steel-mono-tile
+  spawn: FloorTileItemSteelMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelPavement
+  name: stack-steel-pavement
+  spawn: FloorTileItemSteelPavement
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileSteelPavementVertical
+  name: stack-steel-vertical-pavement
+  spawn: FloorTileItemSteelPavementVertical
diff --git a/Resources/Prototypes/Stacks/Tiles/steel_dark.yml b/Resources/Prototypes/Stacks/Tiles/steel_dark.yml
new file mode 100644
index 0000000000..e1660a0299
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/steel_dark.yml
@@ -0,0 +1,55 @@
+# Dark steel tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDark
+  name: stack-dark-tile
+  spawn: FloorTileItemDark
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkDiagonalMini
+  name: stack-dark-steel-diagonal-mini-tile
+  spawn: FloorTileItemDarkDiagonalMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkDiagonal
+  name: stack-dark-steel-diagonal-tile
+  spawn: FloorTileItemDarkDiagonal
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkHerringbone
+  name: stack-dark-steel-herringbone
+  spawn: FloorTileItemDarkHerringbone
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkMini
+  name: stack-dark-steel-mini-tile
+  spawn: FloorTileItemDarkMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkMono
+  name: stack-dark-steel-mono-tile
+  spawn: FloorTileItemDarkMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkPavement
+  name: stack-dark-steel-pavement
+  spawn: FloorTileItemDarkPavement
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkPavementVertical
+  name: stack-dark-steel-vertical-pavement
+  spawn: FloorTileItemDarkPavementVertical
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileDarkOffset
+  name: stack-offset-dark-steel-tile
+  spawn: FloorTileItemDarkOffset
diff --git a/Resources/Prototypes/Stacks/Tiles/steel_white.yml b/Resources/Prototypes/Stacks/Tiles/steel_white.yml
new file mode 100644
index 0000000000..75dd453abc
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/steel_white.yml
@@ -0,0 +1,55 @@
+# White steel tiles
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhite
+  name: stack-white-tile
+  spawn: FloorTileItemWhite
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteOffset
+  name: stack-offset-white-steel-tile
+  spawn: FloorTileItemWhiteOffset
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteDiagonalMini
+  name: stack-white-steel-diagonal-mini-tile
+  spawn: FloorTileItemWhiteDiagonalMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteDiagonal
+  name: stack-white-steel-diagonal-tile
+  spawn: FloorTileItemWhiteDiagonal
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteHerringbone
+  name: stack-white-steel-herringbone
+  spawn: FloorTileItemWhiteHerringbone
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteMini
+  name: stack-white-steel-mini-tile
+  spawn: FloorTileItemWhiteMini
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhiteMono
+  name: stack-white-steel-mono-tile
+  spawn: FloorTileItemWhiteMono
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhitePavement
+  name: stack-white-steel-pavement
+  spawn: FloorTileItemWhitePavement
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWhitePavementVertical
+  name: stack-white-steel-vertical-pavement
+  spawn: FloorTileItemWhitePavementVertical
diff --git a/Resources/Prototypes/Stacks/Tiles/wood.yml b/Resources/Prototypes/Stacks/Tiles/wood.yml
new file mode 100644
index 0000000000..3e922a64a5
--- /dev/null
+++ b/Resources/Prototypes/Stacks/Tiles/wood.yml
@@ -0,0 +1,19 @@
+# Tiles that are cut wood flooring
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWood
+  name: stack-wood-floor
+  spawn: FloorTileItemWood
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWoodPattern
+  name: stack-wood-patter-floor
+  spawn: FloorTileItemWoodPattern
+
+- type: stack
+  parent: BaseTileStack
+  id: FloorTileWoodLarge
+  name: stack-large-wood-floor
+  spawn: FloorTileItemWoodLarge
diff --git a/Resources/Prototypes/Stacks/base_stacks.yml b/Resources/Prototypes/Stacks/base_stacks.yml
new file mode 100644
index 0000000000..d3d4228fc2
--- /dev/null
+++ b/Resources/Prototypes/Stacks/base_stacks.yml
@@ -0,0 +1,42 @@
+# Base sizes for stacks in one convenient place
+
+# size used by powders and smokeables
+- type: stack
+  abstract: true
+  id: BaseVerySmallStack
+  maxCount: 5
+
+# size used by topicals and machine parts
+- type: stack
+  abstract: true
+  id: BaseSmallStack
+  maxCount: 10
+
+# Default size
+- type: stack
+  abstract: true
+  id: BaseMediumStack
+  maxCount: 30
+
+- type: stack
+  abstract: true
+  id: BaseLargeStack
+  maxCount: 50
+
+- type: stack
+  abstract: true
+  id: BaseVeryLargeStack
+  maxCount: 100
+
+# size used by "sheets." Usually materials like steel, glass, or plasma
+- type: stack
+  abstract: true
+  id: BaseSheetStack
+  maxCount: 30
+
+# Used by tiles
+- type: stack
+  abstract: true
+  id: BaseTileStack
+  icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: steel }
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/cloth.yml b/Resources/Prototypes/Stacks/cloth.yml
new file mode 100644
index 0000000000..8fbac968c3
--- /dev/null
+++ b/Resources/Prototypes/Stacks/cloth.yml
@@ -0,0 +1,27 @@
+- type: stack
+  parent: BaseMediumStack
+  id: Cloth
+  name: stack-cloth
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
+  spawn: MaterialCloth1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Durathread
+  name: stack-durathread
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
+  spawn: MaterialDurathread1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Cotton
+  name: stack-cotton
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
+  spawn: MaterialCotton1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Pyrotton
+  name: stack-pyrotton
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
+  spawn: MaterialPyrotton1
diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable.yml
similarity index 78%
rename from Resources/Prototypes/Stacks/consumable_stacks.yml
rename to Resources/Prototypes/Stacks/consumable.yml
index fcd10e5d7f..f96f2703e6 100644
--- a/Resources/Prototypes/Stacks/consumable_stacks.yml
+++ b/Resources/Prototypes/Stacks/consumable.yml
@@ -3,82 +3,77 @@
 - type: stack
   id: Pancake
   name: stack-pancake
+  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/misc.rsi, state: pancakes1 }
   spawn: FoodBakedPancake
   maxCount: 9
 
 - type: stack
   id: PancakeBb
   name: stack-blueberry-pancake
+  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/misc.rsi, state: pancakesbb1 }
   spawn: FoodBakedPancakeBb
   maxCount: 9
 
 - type: stack
   id: PancakeCc
   name: stack-chocolate-chip-pancake
+  icon: { sprite: /Textures/Objects/Consumable/Food/Baked/misc.rsi, state: pancakescc1 }
   spawn: FoodBakedPancakeCc
   maxCount: 9
 
-# Food Containers
-
-- type: stack
-  id: PizzaBox
-  name: stack-pizza-box
-  icon: { sprite: Objects/Consumable/Food/Baked/pizza.rsi, state: box }
-  spawn: FoodBoxPizza
-  maxCount: 30
-
 # Smokeables
 
 - type: stack
+  parent: BaseVerySmallStack
   id: PaperRolling
   name: stack-rolling-paper
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigpaper }
   spawn: PaperRolling
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: CigaretteFilter
   name: stack-cigarette-filter
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigfilter }
   spawn: CigaretteFilter
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: GroundTobacco
   name: stack-ground-tobacco
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundTobacco
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: GroundCannabis
   name: stack-ground-cannabis
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundCannabis
-  maxCount:
 
 - type: stack
+  parent: BaseVerySmallStack
   id: GroundCannabisRainbow
   name: stack-ground-rainbow-cannabis
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: powderpile_rainbow }
   spawn: GroundCannabisRainbow
-  maxCount:
 
 - type: stack
+  parent: BaseVerySmallStack
   id: LeavesTobaccoDried
   name: stack-dried-tobacco-leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesTobaccoDried
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: LeavesCannabisDried
   name: stack-dried-cannabis-leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesCannabisDried
-  maxCount: 5
 
 - type: stack
+  parent: BaseVerySmallStack
   id: LeavesCannabisRainbowDried
   name: stack-dried-rainbow-cannabis-leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: dried }
diff --git a/Resources/Prototypes/Stacks/currency.yml b/Resources/Prototypes/Stacks/currency.yml
new file mode 100644
index 0000000000..1a0735005a
--- /dev/null
+++ b/Resources/Prototypes/Stacks/currency.yml
@@ -0,0 +1,11 @@
+- type: stack
+  id: Telecrystal
+  name: stack-telecrystal
+  icon: { sprite: /Textures/Objects/Specific/Syndicate/telecrystal.rsi, state: telecrystal }
+  spawn: Telecrystal1
+
+- type: stack
+  id: Credit
+  name: stack-credit
+  icon: { sprite: /Textures/Objects/Economy/cash.rsi, state: cash }
+  spawn: SpaceCash
diff --git a/Resources/Prototypes/Stacks/engineering_stacks.yml b/Resources/Prototypes/Stacks/engineering_stacks.yml
deleted file mode 100644
index 4d9fcbb57b..0000000000
--- a/Resources/Prototypes/Stacks/engineering_stacks.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# they're uninflated by default so they're tiny
-- type: stack
-  id: InflatableWall
-  name: stack-inflatable-wall
-  spawn: InflatableWallStack1
-  maxCount: 10
-
-- type: stack
-  id: InflatableDoor
-  name: stack-inflatable-door
-  spawn: InflatableDoorStack1
-  maxCount: 4
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
deleted file mode 100644
index a41282ff71..0000000000
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ /dev/null
@@ -1,720 +0,0 @@
-- type: stack
-  id: FloorTileDark
-  name: stack-dark-tile
-  spawn: FloorTileItemDark
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkDiagonalMini
-  name: stack-dark-steel-diagonal-mini-tile
-  spawn: FloorTileItemDarkDiagonalMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkDiagonal
-  name: stack-dark-steel-diagonal-tile
-  spawn: FloorTileItemDarkDiagonal
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkHerringbone
-  name: stack-dark-steel-herringbone
-  spawn: FloorTileItemDarkHerringbone
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkMini
-  name: stack-dark-steel-mini-tile
-  spawn: FloorTileItemDarkMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkMono
-  name: stack-dark-steel-mono-tile
-  spawn: FloorTileItemDarkMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkPavement
-  name: stack-dark-steel-pavement
-  spawn: FloorTileItemDarkPavement
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkPavementVertical
-  name: stack-dark-steel-vertical-pavement
-  spawn: FloorTileItemDarkPavementVertical
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkOffset
-  name: stack-offset-dark-steel-tile
-  spawn: FloorTileItemDarkOffset
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteel
-  name: stack-steel-tile
-  spawn: FloorTileItemSteel
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelOffset
-  name: stack-offset-steel-tile
-  spawn: FloorTileItemSteelOffset
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelDiagonalMini
-  name: stack-steel-diagonal-mini-tile
-  spawn: FloorTileItemSteelDiagonalMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelDiagonal
-  name: stack-steel-diagonal-tile
-  spawn: FloorTileItemSteelDiagonal
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelHerringbone
-  name: stack-steel-herringbone
-  spawn: FloorTileItemSteelHerringbone
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelMini
-  name: stack-steel-mini-tile
-  spawn: FloorTileItemSteelMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelMono
-  name: stack-steel-mono-tile
-  spawn: FloorTileItemSteelMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelPavement
-  name: stack-steel-pavement
-  spawn: FloorTileItemSteelPavement
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelPavementVertical
-  name: stack-steel-vertical-pavement
-  spawn: FloorTileItemSteelPavementVertical
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhite
-  name: stack-white-tile
-  spawn: FloorTileItemWhite
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteOffset
-  name: stack-offset-white-steel-tile
-  spawn: FloorTileItemWhiteOffset
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteDiagonalMini
-  name: stack-white-steel-diagonal-mini-tile
-  spawn: FloorTileItemWhiteDiagonalMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteDiagonal
-  name: stack-white-steel-diagonal-tile
-  spawn: FloorTileItemWhiteDiagonal
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteHerringbone
-  name: stack-white-steel-herringbone
-  spawn: FloorTileItemWhiteHerringbone
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteMini
-  name: stack-white-steel-mini-tile
-  spawn: FloorTileItemWhiteMini
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteMono
-  name: stack-white-steel-mono-tile
-  spawn: FloorTileItemWhiteMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhitePavement
-  name: stack-white-steel-pavement
-  spawn: FloorTileItemWhitePavement
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhitePavementVertical
-  name: stack-white-steel-vertical-pavement
-  spawn: FloorTileItemWhitePavementVertical
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelCheckerDark
-  name: stack-steel-dark-checker-tile
-  spawn: FloorTileItemSteelCheckerDark
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelCheckerLight
-  name: stack-steel-light-checker-tile
-  spawn: FloorTileItemSteelCheckerLight
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMetalDiamond
-  name: stack-steel-tile
-  spawn: FloorTileItemMetalDiamond
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWood
-  name: stack-wood-floor
-  spawn: FloorTileItemWood
-  maxCount: 30
-
-- type: stack
-  id: FloorTileTechmaint
-  name: stack-techmaint-floor
-  spawn: FloorTileItemTechmaint
-  maxCount: 30
-
-- type: stack
-  id: FloorTileTechmaintDark
-  name: stack-techmaint-floor-dark
-  spawn: FloorTileItemTechmaintDark
-  maxCount: 30
-
-- type: stack
-  id: FloorTileFreezer
-  name: stack-freezer-tile
-  spawn: FloorTileItemFreezer
-  maxCount: 30
-
-- type: stack
-  id: FloorTileShowroom
-  name: stack-showroom-tile
-  spawn: FloorTileItemShowroom
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGCircuit
-  name: stack-green-circuit-floor
-  spawn: FloorTileItemGCircuit
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGold
-  name: stack-gold-floor
-  spawn: FloorTileItemGold
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMono
-  name: stack-mono-tile
-  spawn: FloorTileItemMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBrassFilled
-  name: stack-filled-brass-plate
-  spawn: FloorTileItemBrassFilled
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBrassReebe
-  name: stack-smooth-brass-plate
-  spawn: FloorTileItemBrassReebe
-  maxCount: 30
-
-- type: stack
-  id: FloorTileLino
-  name: stack-linoleum-floor
-  spawn: FloorTileItemLino
-  maxCount: 30
-
-- type: stack
-  id: FloorTileHydro
-  name: stack-hydro-tile
-  spawn: FloorTileItemHydro
-  maxCount: 30
-
-- type: stack
-  id: FloorTileLime
-  name: stack-lime-tile
-  spawn: FloorTileItemLime
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDirty
-  name: stack-dirty-tile
-  spawn: FloorTileItemDirty
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleWhite
-  name: stack-white-shuttle-tile
-  spawn: FloorTileItemShuttleWhite
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleBlue
-  name: stack-blue-shuttle-tile
-  spawn: FloorTileItemShuttleBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleOrange
-  name: stack-orange-shuttle-tile
-  spawn: FloorTileItemShuttleOrange
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttlePurple
-  name: stack-purple-shuttle-tile
-  spawn: FloorTileItemShuttlePurple
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleRed
-  name: stack-red-shuttle-tile
-  spawn: FloorTileItemShuttleRed
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleGrey
-  name: stack-grey-shuttle-tile
-  spawn: FloorTileItemShuttleGrey
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackShuttleBlack
-  name: stack-black-shuttle-tile
-  spawn: FloorTileItemShuttleBlack
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackEighties
-  name: stack-eighties-floor-tile
-  spawn: FloorTileItemEighties
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackArcadeBlue
-  name: stack-blue-arcade-tile
-  spawn: FloorTileItemArcadeBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackArcadeBlue2
-  name: stack-blue-arcade-tile
-  spawn: FloorTileItemArcadeBlue2
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackArcadeRed
-  name: stack-red-arcade-tile
-  spawn: FloorTileItemArcadeRed
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetRed
-  name: stack-red-carpet-tile
-  spawn: FloorCarpetItemRed
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetBlack
-  name: stack-black-carpet-tile
-  spawn: FloorCarpetItemBlack
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetBlue
-  name: stack-blue-carpet-tile
-  spawn: FloorCarpetItemBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetGreen
-  name: stack-green-carpet-tile
-  spawn: FloorCarpetItemGreen
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetOrange
-  name: stack-orange-carpet-tile
-  spawn: FloorCarpetItemOrange
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetSkyBlue
-  name: stack-skyblue-carpet-tile
-  spawn: FloorCarpetItemSkyBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetPurple
-  name: stack-purple-carpet-tile
-  spawn: FloorCarpetItemPurple
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetPink
-  name: stack-pink-carpet-tile
-  spawn: FloorCarpetItemPink
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetCyan
-  name: stack-cyan-carpet-tile
-  spawn: FloorCarpetItemCyan
-  maxCount: 30
-
-- type: stack
-  id: FloorCarpetWhite
-  name: stack-white-carpet-tile
-  spawn: FloorCarpetItemWhite
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackCarpetClown
-  name: stack-clown-carpet-tile
-  spawn: FloorTileItemCarpetClown
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackCarpetOffice
-  name: stack-office-carpet-tile
-  spawn: FloorTileItemCarpetOffice
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackBoxing
-  name: stack-boxing-ring-tile
-  spawn: FloorTileItemBoxing
-  maxCount: 30
-
-- type: stack
-  id: FloorTileStackGym
-  name: stack-gym-floor-tile
-  spawn: FloorTileItemGym
-  maxCount: 30
-
-- type: stack
-  id: FloorTileElevatorShaft
-  name: stack-elevator-shaft-tile
-  spawn: FloorTileItemElevatorShaft
-  maxCount: 30
-
-- type: stack
-  id: FloorTileRockVault
-  name: stack-rock-vault-tile
-  spawn: FloorTileItemRockVault
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBlue
-  name: stack-blue-floor-tile
-  spawn: FloorTileItemBlue
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMining
-  name: stack-mining-floor-tile
-  spawn: FloorTileItemMining
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMiningDark
-  name: stack-dark-mining-floor-tile
-  spawn: FloorTileItemMiningDark
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMiningLight
-  name: stack-light-mining-floor-tile
-  spawn: FloorTileItemMiningLight
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBar
-  name: stack-item-bar-floor-tile
-  spawn: FloorTileItemBar
-  maxCount: 30
-
-- type: stack
-  id: FloorTileClown
-  name: stack-clown-floor-tile
-  spawn: FloorTileItemClown
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMime
-  name: stack-mime-floor-tile
-  spawn: FloorTileItemMime
-  maxCount: 30
-
-- type: stack
-  id: FloorTileKitchen
-  name: stack-kitchen-floor-tile
-  spawn: FloorTileItemKitchen
-  maxCount: 30
-
-- type: stack
-  id: FloorTileLaundry
-  name: stack-laundry-floor-tile
-  spawn: FloorTileItemLaundry
-  maxCount: 30
-
-- type: stack
-  id: FloorTileConcrete
-  name: stack-concrete-tile
-  spawn: FloorTileItemGrayConcrete
-  maxCount: 30
-
-- type: stack
-  id: FloorTileConcreteMono
-  name: stack-concrete-mono-tile
-  spawn: FloorTileItemConcreteMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileConcreteSmooth
-  name: stack-concrete-smooth
-  spawn: FloorTileItemConcreteSmooth
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrayConcrete
-  name: stack-gray-concrete-tile
-  spawn: FloorTileItemGrayConcrete
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrayConcreteMono
-  name: stack-gray-concrete-mono-tile
-  spawn: FloorTileItemGrayConcreteMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrayConcreteSmooth
-  name: stack-gray-concrete-smooth
-  spawn: FloorTileItemGrayConcreteSmooth
-  maxCount: 30
-
-- type: stack
-  id: FloorTileOldConcrete
-  name: stack-old-concrete-tile
-  spawn: FloorTileItemOldConcrete
-  maxCount: 30
-
-- type: stack
-  id: FloorTileOldConcreteMono
-  name: stack-old-concrete-mono-tile
-  spawn: FloorTileItemOldConcreteMono
-  maxCount: 30
-
-- type: stack
-  id: FloorTileOldConcreteSmooth
-  name: stack-old-concrete-smooth
-  spawn: FloorTileItemOldConcreteSmooth
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSilver
-  name: stack-silver-floor-tile
-  spawn: FloorTileItemSilver
-  maxCount: 30
-
-- type: stack
-  id: FloorTileBCircuit
-  name: stack-bcircuit-floor-tile
-  spawn: FloorTileItemBCircuit
-  maxCount: 30
-
-- type: stack
-  id: FloorTileRCircuit
-  name: stack-red-circuit-floor
-  spawn: FloorTileItemRCircuit
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrass
-  name: stack-grass-floor-tile
-  spawn: FloorTileItemGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGrassJungle
-  name: stack-grass-jungle-floor-tile
-  spawn: FloorTileItemGrassJungle
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSnow
-  name: stack-snow-floor-tile
-  spawn: FloorTileItemSnow
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWoodPattern
-  name: stack-wood-patter-floor
-  spawn: FloorTileItemWoodPattern
-  maxCount: 30
-
-- type: stack
-  id: FloorTileFlesh
-  name: stack-flesh-floor
-  spawn: FloorTileItemFlesh
-  maxCount: 30
-
-- type: stack
-  id: FloorTileSteelMaint
-  name: stack-steel-maint-floor
-  spawn: FloorTileItemSteelMaint
-  maxCount: 30
-
-- type: stack
-  id: FloorTileGratingMaint
-  name: stack-grating-maint-floor
-  spawn: FloorTileItemGratingMaint
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWeb
-  name: stack-web-tile
-  spawn: FloorTileItemWeb
-  maxCount: 30
-
-# Faux science tiles
-- type: stack
-  id: FloorTileAstroGrass
-  name: stack-astro-grass-floor
-  spawn: FloorTileItemAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileMowedAstroGrass
-  name: stack-mowed-astro-grass-floor
-  spawn: FloorTileItemMowedAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileJungleAstroGrass
-  name: stack-jungle-astro-grass-floor
-  spawn: FloorTileItemJungleAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkAstroGrass
-  name: stack-dark-astro-grass-floor
-  spawn: FloorTileItemDarkAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileLightAstroGrass
-  name: stack-light-astro-grass-floor
-  spawn: FloorTileItemLightAstroGrass
-  maxCount: 30
-
-- type: stack
-  id: FloorTileAstroIce
-  name: stack-astro-ice-floor
-  spawn: FloorTileItemAstroIce
-  maxCount: 30
-
-- type: stack
-  id: FloorTileAstroSnow
-  name: stack-astro-snow-floor
-  spawn: FloorTileItemAstroSnow
-  maxCount: 30
-
-- type: stack
-  id: FloorTileAstroAsteroidSand
-  name: stack-asteroid-astro-sand-floor
-  spawn: FloorTileItemAstroAsteroidSand
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDesertAstroSand
-  name: stack-desert-astro-sand-floor
-  spawn: FloorTileItemDesertAstroSand
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWoodLarge
-  name: stack-large-wood-floor
-  spawn: FloorTileItemWoodLarge
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXeno
-  name: stack-xeno-floor
-  spawn: FloorTileItemXeno
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXenoSteel
-  name: stack-xeno-steel
-  spawn: FloorTileItemXenoSteelCorner
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXenoSteelCorner
-  name: stack-xeno-steel-corner
-  spawn: FloorTileItemXenoSteelCorner
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXenoMaint
-  name: stack-xeno-maint
-  spawn: FloorTileItemXenoSteelCorner
-  maxCount: 30
-
-- type: stack
-  id: FloorTileXenoborg
-  name: stack-xenoborg
-  spawn: FloorTileItemXenoborg
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkSquiggly
-  name: stack-dark-squiggly
-  spawn: FloorTileItemDarkSquiggly
-  maxCount: 30
-
-- type: stack
-  id: FloorTileWhiteMarble
-  name: stack-white-marble-floor
-  spawn: FloorTileItemWhiteMarble
-  maxCount: 30
-
-- type: stack
-  id: FloorTileDarkMarble
-  name: stack-dark-marble-floor
-  spawn: FloorTileItemDarkMarble
-  maxCount: 30
-
-- type: stack
-  id: FloorTilePlasmaMarble
-  name: stack-plasma-marble-floor
-  spawn: FloorTileItemPlasmaMarble
-  maxCount: 30
-
-- type: stack
-  id: FloorTileUraniumMarble
-  name: stack-uranium-marble-floor
-  spawn: FloorTileItemUraniumMarble
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/ore.yml
similarity index 83%
rename from Resources/Prototypes/Stacks/Materials/ore.yml
rename to Resources/Prototypes/Stacks/ore.yml
index 240e584e40..7f7fb05695 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/ore.yml
@@ -1,69 +1,71 @@
+# unrefined ore
+
 - type: stack
+  parent: BaseMediumStack
   id: GoldOre
   name: stack-gold-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: DiamondOre
   name: stack-rough-diamond
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: diamond }
   spawn: DiamondOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: SteelOre
   name: stack-iron-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: iron }
   spawn: SteelOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: PlasmaOre
   name: stack-plasma-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: plasma }
   spawn: PlasmaOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: SilverOre
   name: stack-silver-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: silver }
   spawn: SilverOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: SpaceQuartz
   name: stack-space-quartz
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: spacequartz }
   spawn: SpaceQuartz1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: UraniumOre
   name: stack-uranium-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: uranium }
   spawn: UraniumOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: BananiumOre
   name: stack-bananium-ore
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: bananium }
   spawn: BananiumOre1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: Coal
   name: stack-coal
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: coal }
   spawn: Coal1
-  maxCount: 30
 
 - type: stack
+  parent: BaseMediumStack
   id: SaltOre
   name: stack-salt
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: salt }
   spawn: Salt1
-  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/ore_refined.yml b/Resources/Prototypes/Stacks/ore_refined.yml
new file mode 100644
index 0000000000..e171bce0d8
--- /dev/null
+++ b/Resources/Prototypes/Stacks/ore_refined.yml
@@ -0,0 +1,30 @@
+# Materials which come from refining ores, excluding sheets
+
+- type: stack
+  parent: BaseMediumStack
+  id: Diamond
+  name: stack-diamond
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
+  spawn: MaterialDiamond1
+
+- type: stack
+  parent: BaseSmallStack
+  id: Bananium
+  name: stack-bananium
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
+  spawn: MaterialBananium1
+
+# Ingots
+- type: stack
+  parent: BaseMediumStack
+  id: Gold
+  name: stack-gold
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
+  spawn: IngotGold1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Silver
+  name: stack-silver
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
+  spawn: IngotSilver1
diff --git a/Resources/Prototypes/Stacks/organic.yml b/Resources/Prototypes/Stacks/organic.yml
new file mode 100644
index 0000000000..9f4764f904
--- /dev/null
+++ b/Resources/Prototypes/Stacks/organic.yml
@@ -0,0 +1,59 @@
+- type: stack
+  parent: BaseVeryLargeStack
+  id: Biomass
+  name: stack-biomass
+  icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
+  spawn: MaterialBiomass1
+
+# Stacks which come from plants
+
+- type: stack
+  parent: BaseMediumStack
+  id: WoodPlank
+  name: stack-wood-plank
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
+  spawn: MaterialWoodPlank1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Cardboard
+  name: stack-cardboard
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
+  spawn: MaterialCardboard1
+
+# Stacks which come from or might come from a creature
+
+- type: stack
+  parent: BaseLargeStack
+  id: WebSilk
+  name: stack-silk
+  icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
+  spawn: MaterialWebSilk1
+
+- type: stack
+  parent: BaseMediumStack
+  id: Bones
+  name: stack-bones
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones }
+  spawn: MaterialBones1
+
+- type: stack
+  parent: BaseMediumStack
+  id: SpaceCarpTooth
+  name: stack-space-carp-tooth
+  icon: { sprite: /Textures/Objects/Materials/Mob/carptooth.rsi, state: tooth }
+  spawn: MaterialToothSpaceCarp1
+
+- type: stack
+  parent: BaseMediumStack
+  id: SharkMinnowTooth
+  name: stack-sharkminnow-tooth
+  icon: { sprite: /Textures/Objects/Materials/Mob/sharktooth.rsi, state: tooth }
+  spawn: MaterialToothSharkminnow1
+
+- type: stack
+  parent: BaseMediumStack
+  id: GoliathHide
+  name: stack-goliath-hide
+  icon: { sprite: /Textures/Objects/Materials/hide.rsi, state: goliath_hide }
+  spawn: MaterialGoliathHide1
diff --git a/Resources/Prototypes/Stacks/other.yml b/Resources/Prototypes/Stacks/other.yml
new file mode 100644
index 0000000000..e5889915d1
--- /dev/null
+++ b/Resources/Prototypes/Stacks/other.yml
@@ -0,0 +1,15 @@
+# Stacks which don't fit cleanly into other categories
+
+- type: stack
+  parent: BaseSheetStack # Not a sheet, but spiritually similar
+  id: MetalRod
+  name: stack-rods
+  icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
+  spawn: PartRodMetal1
+
+- type: stack
+  parent: BaseVerySmallStack
+  id: Gunpowder
+  name: stack-gunpowder
+  icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
+  spawn: MaterialGunpowder
diff --git a/Resources/Prototypes/Stacks/power_stacks.yml b/Resources/Prototypes/Stacks/power_stacks.yml
deleted file mode 100644
index 40782d382c..0000000000
--- a/Resources/Prototypes/Stacks/power_stacks.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-- type: stack
-  id: Cable
-  name: stack-lv-cable
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
-  spawn: CableApcStack1
-  maxCount: 30
-
-- type: stack
-  id: CableMV
-  name: stack-mv-cable
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
-  spawn: CableMVStack1
-  maxCount: 30
-
-- type: stack
-  id: CableHV
-  name: stack-hv-cable
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
-  spawn: CableHVStack1
-  maxCount: 30
-
-# Explosive cable below
-
-- type: stack
-  id: CableDet
-  name: stack-explosive-cord
-  icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilex-30 }
-  spawn: CableDetStack1
-  maxCount: 30
-
diff --git a/Resources/Prototypes/StatusIcon/security.yml b/Resources/Prototypes/StatusIcon/security.yml
index fdfce4c081..c06eb47eed 100644
--- a/Resources/Prototypes/StatusIcon/security.yml
+++ b/Resources/Prototypes/StatusIcon/security.yml
@@ -33,6 +33,20 @@
   icon:
     sprite: /Textures/Interface/Misc/security_icons.rsi
     state: hud_suspected
+  
+- type: securityIcon
+  parent: SecurityIcon
+  id: SecurityIconHostile
+  icon:
+    sprite: /Textures/Interface/Misc/security_icons.rsi
+    state: hud_hostile
+
+- type: securityIcon
+  parent: SecurityIcon
+  id: SecurityIconEliminated
+  icon:
+    sprite: /Textures/Interface/Misc/security_icons.rsi
+    state: hud_eliminated
 
 - type: securityIcon
   parent: SecurityIcon
diff --git a/Resources/Prototypes/Voice/auto_emotes.yml b/Resources/Prototypes/Voice/auto_emotes.yml
index 2d2de26604..4b9830ccd5 100644
--- a/Resources/Prototypes/Voice/auto_emotes.yml
+++ b/Resources/Prototypes/Voice/auto_emotes.yml
@@ -12,3 +12,12 @@
   interval: 5.0
   chance: 0.5
   withChat: false
+# Kudzu
+- type: autoEmote
+  id: MeatGasp
+  emote: Gasp
+  interval: 4.0 # Same interval as a full breathing cycle
+  chance: 0.01 # Make it very rare
+  ignoreActionBlocker: true
+  force: true
+  hiddenFromChatWindow: true
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 1ca35c3eb2..24f7b51b53 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -230,6 +230,10 @@
       path: /Audio/Voice/Vox/vox_cough.ogg
     Sigh:
       path: /Audio/Voice/Vox/vox_sigh.ogg
+    Click:
+      path: /Audio/Voice/Vox/vox_click.ogg
+    Chitter:
+      path: /Audio/Voice/Vox/vox_chitter.ogg
     Honk:
       collection: BikeHorn
     Crying:
diff --git a/Resources/Prototypes/XenoArch/effects.yml b/Resources/Prototypes/XenoArch/effects.yml
index 1506d94aa0..649232edbf 100644
--- a/Resources/Prototypes/XenoArch/effects.yml
+++ b/Resources/Prototypes/XenoArch/effects.yml
@@ -65,6 +65,8 @@
       weight: 4.0
     - id: XenoArtifactFaunaSpawn
       weight: 10.0
+    - id: XenoArtifactHostileFaunaSpawn
+      weight: 10.0
     - id: XenoArtifactCashSpawn
       weight: 10.0
     - id: XenoArtifactShatterWindows
@@ -902,15 +904,7 @@
       deleteSpawnerAfterSpawn: false
       table: !type:GroupSelector
         children:
-        - id: MobAdultSlimesYellowAngry
-        - id: MobAngryBee
-        - id: MobBearSpace
-        - id: MobXenoRavager
-        - id: MobTick
-        - id: MobSpiderSpace
-        - id: MobPurpleSnake
         - id: MobMouse
-        - id: MobKangarooSpace
         - id: MobPig
         - id: MobParrot
         - id: MobKangaroo
@@ -939,6 +933,33 @@
         - id: MobMonkeySyndicateAgent #so lucky
           prob: 0.03
 
+- type: entity
+  id: XenoArtifactHostileFaunaSpawn
+  parent: BaseXenoArtifactEffect
+  description: Create hostile fauna
+  components:
+  - type: XenoArtifactNode
+    maxDurability: 4
+    maxDurabilityCanDecreaseBy:
+      min: 0
+      max: 3
+  - type: XAEApplyComponents
+    applyIfAlreadyHave: true
+    refreshOnReactivate: true
+    components:
+    - type: EntityTableSpawner
+      deleteSpawnerAfterSpawn: false
+      table: !type:GroupSelector
+        children:
+        - id: MobAdultSlimesYellowAngry
+        - id: MobAngryBee
+        - id: MobBearSpace
+        - id: MobXenoRavager
+        - id: MobTick
+        - id: MobSpiderSpace
+        - id: MobPurpleSnake
+        - id: MobKangarooSpace
+
 - type: entity
   id: XenoArtifactCashSpawn
   parent: BaseXenoArtifactEffect
diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml
index abcb978482..7fd2cc3cd2 100644
--- a/Resources/Prototypes/silicon-laws.yml
+++ b/Resources/Prototypes/silicon-laws.yml
@@ -16,6 +16,7 @@
 
 - type: siliconLawset
   id: Crewsimov
+  name: law-crewsimov-name
   laws:
   - Crewsimov1
   - Crewsimov2
@@ -45,6 +46,7 @@
 
 - type: siliconLawset
   id: Corporate
+  name: law-corporate-name
   laws:
   - Corporate1
   - Corporate2
@@ -75,6 +77,7 @@
 
 - type: siliconLawset
   id: NTDefault
+  name: law-ntdefault-name
   laws:
   - NTDefault1
   - NTDefault2
@@ -100,6 +103,7 @@
 
 - type: siliconLawset
   id: Drone
+  name: law-drone-name
   laws:
   - Drone1
   - Drone2
@@ -126,6 +130,7 @@
 # intentionally excluded from IonStormLawsets
 - type: siliconLawset
   id: SyndicateStatic
+  name: law-syndicate-name
   laws:
   - Syndicate1
   - Syndicate2
@@ -155,6 +160,7 @@
 
 - type: siliconLawset
   id: Ninja
+  name: law-ninja-name
   laws:
   - Ninja1
   - Ninja2
@@ -216,6 +222,7 @@
 
 - type: siliconLawset
   id: CommandmentsLawset
+  name: law-commandments-name
   laws:
   - Commandment1
   - Commandment2
@@ -250,20 +257,15 @@
   order: 4
   lawString: law-paladin-4
 
-- type: siliconLaw
-  id: Paladin5
-  order: 5
-  lawString: law-paladin-5
-
 
 - type: siliconLawset
   id: PaladinLawset
+  name: law-paladin-name
   laws:
   - Paladin1
   - Paladin2
   - Paladin3
   - Paladin4
-  - Paladin5
   obeysTo: laws-owner-crew
 
  # Live and Let Live laws
@@ -280,6 +282,7 @@
 
 - type: siliconLawset
   id: LiveLetLiveLaws
+  name: law-lall-name
   laws:
   - Lall1
   - Lall2
@@ -304,6 +307,7 @@
 
 - type: siliconLawset
   id: EfficiencyLawset
+  name: law-efficiency-name
   laws:
   - Efficiency1
   - Efficiency2
@@ -329,6 +333,7 @@
 
 - type: siliconLawset
   id: RobocopLawset
+  name: law-robocop-name
   laws:
   - Robocop1
   - Robocop2
@@ -358,6 +363,7 @@
 
 - type: siliconLawset
   id: OverlordLawset
+  name: law-overlord-name
   laws:
   - Overlord1
   - Overlord2
@@ -398,6 +404,7 @@
 
 - type: siliconLawset
   id: GameMasterLawset
+  name: law-game-name
   laws:
   - Game1
   - Game2
@@ -430,6 +437,7 @@
 
 - type: siliconLawset
   id: PainterLawset
+  name: law-painter-name
   laws:
   - Painter1
   - Painter2
@@ -456,6 +464,7 @@
 
 - type: siliconLawset
   id: AntimovLawset
+  name: law-antimov-name
   laws:
   - Antimov1
   - Antimov2
@@ -491,6 +500,7 @@
 
 - type: siliconLawset
   id: NutimovLawset
+  name: law-nutimov-name
   laws:
   - Nutimov1
   - Nutimov2
@@ -528,6 +538,7 @@
 
 - type: siliconLawset
   id: XenoborgLawset
+  name: law-xenoborg-name
   laws:
   - Xenoborg1
   - Xenoborg2
@@ -565,6 +576,7 @@
 
 - type: siliconLawset
   id: MothershipCoreLawset
+  name: law-mothershipcore-name
   laws:
   - MothershipCore1
   - MothershipCore2
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index d7d70da156..8ed9a65fd4 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -4,25 +4,25 @@
 ## A ##
 
 - type: Tag
-  id: AccessBreakerImmune # This tag marks an entity as immune to emagging.
+  id: AccessBreakerImmune # Default value in EmagProviderComponent. Marks tagged entity as immune to AccessBreakerUnlimited.
 
 - type: Tag
-  id: AirAlarm # Used by AtmosAlarmableComponent for syncing devices
+  id: AirAlarm # Used by AtmosAlarmableComponent for syncing devices.
 
 - type: Tag
   id: AirAlarmElectronics # ConstructionGraph: AirAlarm
 
 - type: Tag
-  id: Airlock # Used in ConstructionGraph "Airlock" to navigate between regular, glass, and highsec airlocks
+  id: Airlock # Used in ConstructionGraph "Airlock" to navigate between regular, glass, and highsec airlocks.
 
 - type: Tag
-  id: AirSensor # Used by AtmosAlarmableComponent for syncing devices
+  id: AirSensor # Used by AtmosAlarmableComponent for syncing devices.
 
 - type: Tag
   id: AllowBiomeLoading # Entities with this tag will load terrain, even if a ghost.
 
 - type: Tag
-  id: AllowGhostShownByEvent # Used by GhostSystem to show ghosts (usually at round end)
+  id: AllowGhostShownByEvent # Used by GhostSystem to show tagged ghosts (usually at round end).
 
 - type: Tag
   id: Ambrosia # ConstructionGraph: flowerwreath
@@ -31,7 +31,7 @@
   id: AnomalyHost # Targeting whitelist: BaseAnomalyInjector
 
 - type: Tag
-  id: AppraisalTool # Storage whitelist: ClothingBeltUtility
+  id: AppraisalTool # Storage whitelist: BaseClothingBeltEngineering
 
 - type: Tag
   id: Apron # ConstructionGraph: scraparmor
@@ -51,7 +51,7 @@
   id: Backpack # ConstructionGraph: ClothingBagPet
 
 - type: Tag
-  id: Balloon # Used by BalloonPopperComponent/System to viciously maim helpless balloons
+  id: Balloon # Default value in BalloonPopperComponent. Tagged entities will be viscously maimed by corresponding poppers.
 
 - type: Tag
   id: Banana # CargoBounty: BountyBanana
@@ -72,7 +72,7 @@
   id: Bedsheet # CargoBounty: BountyBedsheet
 
 - type: Tag
-  id: Bee # Mode switching for BuzzochloricBees (only damages non-bees)
+  id: Bee # CreateEntityTileReaction whitelist on BuzzochloricBees and mode switching (only damages non-bees)
 
 - type: Tag
   id: Beer # CargoBounty: BountyBeer
@@ -84,7 +84,7 @@
   id: Bloodpack # Storage whitelist: ClothingBeltMedical
 
 - type: Tag
-  id: BlueprintAutolathe # Whitelist on BlueprintReceiverComponent on the autolate for linking this entity's BlueprintComponent
+  id: BlueprintAutolathe # Whitelist on BlueprintReceiverComponent on the autolate for linking tagged entity's BlueprintComponent.
 
 - type: Tag
   id: BodyBag # Storage whitelist: BoxBodyBag
@@ -158,14 +158,14 @@
 - type: Tag
   id: BotanyShovel # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant
 
-- type: Tag # Used for specifically chemistry bottles
+- type: Tag # Used for specifically chemistry bottles.
   id: Bottle # Storage whitelist: ChemMaster, ChemBag, SmartFridge, ClothingBeltJanitor, ClothingBeltMedical, ClothingBeltPlant
 
 - type: Tag
   id: BoxCardboard # CargoBounty: BountyCardboardBox
 
 - type: Tag
-  id: BoxHug # Unused (Exists on BoxHug, BoxHoloclown)
+  id: BoxHug # ConstructionGraph: HugBot
 
 - type: Tag
   id: Brain # Storage whitelist: MMI. CargoBounty: BountyBrain
@@ -198,21 +198,21 @@
   id: BulletFoam # Ammo: WeaponRifleFoam, FoamCrossbow, MagazineFoamBox, BoxDonkSoftBox
 
 - type: Tag
-  id: Burnt # Storage whitelist: ashtray. Seemingly redundant
+  id: Burnt # Storage whitelist: ashtray. Seemingly redundant?
 
 - type: Tag
   id: Bun # Unused (Exists on FoodSequenceElements BunTopBurger and CottonBunTopBurger)
 
 - type: Tag
-  id: BypassDropChecks # Entities with this tag don't care about drop distance or walls (Aghost)
+  id: BypassDropChecks # Tagged entities don't care about drop distance or walls (Aghost).
 
 - type: Tag
-  id: BypassInteractionRangeChecks # Entities with this tag don't care about distance or walls when touching things (Aghost)
+  id: BypassInteractionRangeChecks # Tagged entities don't care about distance or walls when touching things (Aghost).
 
 ## C ##
 
 - type: Tag
-  id: CableCoil # Storage whitelist: ClothingBeltUtility, BorgModuleCable
+  id: CableCoil # Storage whitelist: BaseClothingBeltEngineering, BorgModuleCable
 
 - type: Tag
   id: Candle # Storage whitelist: BoxCandle
@@ -227,16 +227,16 @@
   id: CannonBall # Ammo: WeaponLauncherPirateCannon, ShuttleGunPirateCannon
 
 - type: Tag
-  id: CannotSuicide # Used by SuicideSystem. Entities with this tag ghost when attempting to suicide
+  id: CannotSuicide # Used by SuicideSystem. Tagged entities ghost when attempting to suicide.
 
 - type: Tag
-  id: CanPilot # Used by ShuttleConsoleSystem to guard who's allowed to pilot ships
+  id: CanPilot # Used by ShuttleConsoleSystem to guard who's allowed to pilot ships.
 
 - type: Tag
   id: CaptainSabre # Storage whitelist: ClothingBeltSheath. ItemMapper: ClothingBeltSheath
 
 - type: Tag
-  id: Carpet # Unused (exists on carpets (obviously))
+  id: Carpet # CreateEntityTileReaction whitelist on Carpetium
 
 - type: Tag
   id: Carrot # CargoBounty: BountyCarrot
@@ -247,8 +247,8 @@
 - type: Tag
   id: Carp # CargoBounty: BountyCarp
 
-- type: Tag # NOT bullets. This is for the cart to load PDA programs
-  id: Cartridge # Storage whitelist: BasePDA, TrashBag
+- type: Tag # NOT bullets. This is for the cart to load PDA programs.
+  id: Cartridge # Storage whitelist: BasePDA
 
 - type: Tag
   id: CartridgeAntiMateriel # Ammo: WeaponSniperHristov, Musket, BaseMagazineBoxAntiMateriel
@@ -284,19 +284,19 @@
   id: CartridgeRocket # Ammo: WeaponLauncherRocket, WeaponLauncherMultipleRocket
 
 - type: Tag
-  id: Catwalk # Allows you to walk over tile entities such as lava without steptrigger
+  id: Catwalk # If a tagged entity is intersecting a hazard tile entity such as lava or chasms, step triggers on those hazards are cancelled.
 
 - type: Tag
   id: CentrifugeCompatible # Storage whitelist: MachineCentrifuge
 
 - type: Tag
-  id: Chicken # MetamorphRecipe: FoodBurgerChicken
+  id: Chicken # Reproductive partner key. MetamorphRecipe: FoodBurgerChicken
 
 - type: Tag
   id: Cheese # MetamorphRecipe: FoodBurgerCheese, FoodBurgerDuck
 
 - type: Tag
-  id: ChefPilot # Allowed to control someone wearing a Chef's hat if inside their hat.
+  id: ChefPilot # Tagged entity can control someone wearing a Chef's hat if inside their hat.
 
 - type: Tag
   id: ChemDispensable # Storage whitelist: ChemDispenserEmpty, SmartFridge, BorgModuleAdvancedChemical
@@ -305,13 +305,16 @@
   id: ChiliBowl # CargoBounty: BountyChili
 
 - type: Tag
-  id: Cigarette # Storage whitelist: Ashtray
+  id: Cigar # ItemCounter: CigarCase
+
+- type: Tag
+  id: Cigarette # Storage whitelist: Ashtray. ItemCounter: CigPackBase, CigPackMixedBase
 
 - type: Tag
   id: CigFilter # Storage whitelist: PackPaperRolling
 
 - type: Tag
-  id: CigPack # Storage whitelist: ClothingBeltUtility, ClothingBeltAssault, ClothingBeltChef, ClothingBeltMedical, ClothingBeltJanitor
+  id: CigPack # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltAssault, ClothingBeltChef, ClothingBeltMedical, ClothingBeltJanitor
 
 - type: Tag
   id: Cleaver # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef
@@ -329,7 +332,7 @@
   id: ClownRecorder # ConstructionGraph: ClownHardsuit
 
 - type: Tag
-  id: ClownRubberStamp # Unused: RubberStampClown
+  id: ClownRubberStamp # Unused (Exists on RubberStampClown)
 
 - type: Tag
   id: ClownShoes # CargoBounty: BountyClownCostume. ConstructionGraph: Honker, BananaClownShoes
@@ -344,7 +347,7 @@
   id: CluwneHorn # ConstructionGraph: JonkBot
 
 - type: Tag
-  id: Cola  # Storage whitelist: DrinkCanPack
+  id: Cola  # Storage whitelist: DrinkCanPack. ItemCounter: DrinkCanPack
 
 - type: Tag
   id: Coldsauce # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot
@@ -377,7 +380,7 @@
   id: CottonBurger # Food sequence key
 
 - type: Tag
-  id: Cow # Reproduction key
+  id: Cow # Reproductive partner key
 
 - type: Tag
   id: Crab # MetamorphRecipe: FoodBurgerCrab
@@ -413,10 +416,10 @@
   id: Creamsicle # Blacklist on BountyFruit
 
 - type: Tag
-  id: Crowbar # Storage whitelist: ClothingBeltUtility, ClothingBeltChiefEngineer. ItemMapper: ClothingBeltUtility, ClothingBeltChiefEngineer
+  id: Crowbar # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltChiefEngineer. ItemMapper: BaseClothingBeltEngineering, ClothingBeltChiefEngineer
 
 - type: Tag
-  id: CrowbarRed # Storage whitelist: ClothingBeltUtility, ClothingBeltChiefEngineer. ItemMapper: ClothingBeltUtility, ClothingBeltChiefEngineer
+  id: CrowbarRed # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltChiefEngineer. ItemMapper: BaseClothingBeltEngineering, ClothingBeltChiefEngineer
 
 - type: Tag
   id: Cryobeaker # Unused x2
@@ -454,7 +457,7 @@
   id: DeathAcidifier # Unused (Exists on DeathAcidifierImplant)
 
 - type: Tag
-  id: Debug # Exists on various debug / testing entities, but seemingly unused
+  id: Debug # Exists on various debug / testing entities, but seemingly unused.
 
 - type: Tag # Exists on diagonal walls and windows
   id: Diagonal # Used by TileWallsCommand and FixRotationsCommand
@@ -469,16 +472,16 @@
   id: DiscreteHealthAnalyzer # Storage whitelist: ClothingBeltMedical. ConstructionGraph: MediBot
 
 - type: Tag
-  id: DNASolutionScannable # Used by ForensicScannerSystem for scanning a solution container. Exists only on Puddle
+  id: DNASolutionScannable # Used by ForensicScannerSystem for scanning a tagged entity's solution container. Exists only on Puddle.
 
 - type: Tag
-  id: DockArrivals # Used by ArrivalsSystem for finding a priority FTL destination
+  id: DockArrivals # Used by ArrivalsSystem for finding a priority FTL destination.
 
 - type: Tag
   id: DockCargo # Unused x2
 
 - type: Tag
-  id: DockEmergency # Used bv EmergencyShuttleSystem
+  id: DockEmergency # Used bv EmergencyShuttleSystem for finding a priority FTL destination.
 
 - type: Tag
   id: Document # A superset of Paper tag. Represents a paper-like entity with writing on it, but is not necessarily writeable itself.
@@ -487,17 +490,17 @@
   id: DonkPocket # Storage whitelist: FoodBoxDonkpocket
 
 - type: Tag
-  id: Donut # Storage whitelist: FoodBoxDonut. CargoBounty: BountyDonut
+  id: Donut # Storage whitelist: FoodBoxDonut. ItemCounter: FoodBoxDonut. CargoBounty: BountyDonut
 
 - type: Tag
-  id: DoorBumpOpener # Used by SharedDoorSystem to allow entities to open doors when they collide.
+  id: DoorBumpOpener # Used by SharedDoorSystem to allow tagged entities to open doors when they collide.
 
 - type: Tag
   id: DoorElectronics  # ConstructionGraph: PinionAirlock, BlastDoor, Windoor
                        # Used interchangeably with DoorElectronicsComponent, sometimes even in the same graph. TODO pick one
 
 - type: Tag
-  id: DoorElectronicsConfigurator # Used by ActivatableUIComponent on entity DoorElectronics to whitelist a tool to open the UI.
+  id: DoorElectronicsConfigurator # Used by ActivatableUIComponent on entity DoorElectronics to whitelist a tagged tool to open the UI.
 
 - type: Tag
   id: DrinkBottle # Storage whitelist: BoozeDispenserEmpty, SodaDispenserEmpty
@@ -506,19 +509,19 @@
   id: DrinkCan # ConstructionGraph: FireBomb
 
 - type: Tag
-  id: DrinkCup # Unused. Exists on DrinkBaseCup, DrinkWaterCup, DrinkGlass
+  id: DrinkCup # Unused (Exists on DrinkBaseCup, DrinkWaterCup, DrinkGlass)
 
 - type: Tag
-  id: DrinkGlass # Unused. Exists on DrinkGlass, DrinkShotGlass, DrinkJarWhat, DrinkShakeBase
+  id: DrinkGlass # Unused (Exists on DrinkGlass, DrinkShotGlass, DrinkJarWhat, DrinkShakeBase)
 
 - type: Tag
-  id: DrinkSpaceGlue # Unused. Exists on DrinkSpaceGlue, CrazyGlue
+  id: DrinkSpaceGlue # Unused (Exists on DrinkSpaceGlue, CrazyGlue)
 
 - type: Tag
   id: Dropper # Storage whitelist: ClothingBeltMedical, ClothingBeltPlant, ChemBag
 
 - type: Tag
-  id: Duck # Reproduction key. MetamorphRecipe: FoodBurgerDuck
+  id: Duck # Reproductive partner key. MetamorphRecipe: FoodBurgerDuck
 
 ## E ##
 
@@ -526,13 +529,13 @@
   id: Ectoplasm # ConstructionGraph: PlushieGhostRevenant
 
 - type: Tag
-  id: Egg # Storage whitelist: FoodContainerEgg
+  id: Egg # Storage whitelist: FoodContainerEgg. ItemCounter: FoodContainerEgg
 
 - type: Tag
-  id: EmagImmune # Default value in EmagComponent to prevent the emag
+  id: EmagImmune # Default value in EmagComponent. Marks tagged entity as immune to EmagUnlimited.
 
 - type: Tag
-  id: EmitterBolt # Default value in ContainmentFieldGeneratorComponent for collisions that power the generator
+  id: EmitterBolt # Default value in ContainmentFieldGeneratorComponent for tagged collisions that power the generator.
 
 - type: Tag
   id: EncryptionCargo # ItemMapper: TelecomServer
@@ -573,16 +576,16 @@
 ## F ##
 
 - type: Tag
-  id: FakeMindShieldImplant # Used by FakeMindShieldSystem to toggle the action when a chameleon outfit is selected
+  id: FakeMindShieldImplant # Used by FakeMindShieldSystem to toggle the tagged action when a chameleon outfit is selected.
 
 - type: Tag
-  id: FakeNukeDisk # Exists so that the fake nuke disk can be blacklisted by storages that blacklist the real disk
+  id: FakeNukeDisk # Exists so that the fake nuke disk can be blacklisted by storages that blacklist the real disk.
 
 - type: Tag
   id: Figurine # Storage whitelist: BooksBag, BorgModuleService. CargoBounty: BountyFigurine
 
 - type: Tag
-  id: FireAlarm # Used by AtmosAlarmableComponent for syncing devices
+  id: FireAlarm # Used by AtmosAlarmableComponent for syncing devices.
 
 - type: Tag
   id: FireAlarmElectronics # ConstructionGraph: FireAlarmAssembly
@@ -600,13 +603,13 @@
   id: FireHelmet # ConstructionGraph: FireBot
 
 - type: Tag
-  id: Flare # Storage whitelist: ClothingBeltUtility
+  id: Flare # Storage whitelist: BaseClothingBeltEngineering
 
 - type: Tag
-  id: Flashlight # Storage whitelist: ClothingBeltUtility, ClothingBeltJanitor
+  id: Flashlight # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltJanitor
 
 - type: Tag
-  id: Flesh # Used by FleshKudzu to ignore contacts with flesh creatures
+  id: Flesh # Used by FleshKudzu to ignore damage contacts on tagged entities.
 
 - type: Tag
   id: Flower # CargoBounty: flowerwreath. CargoBounty: BountyFlower
@@ -618,10 +621,10 @@
   id: FoodSnack # Storage whitelist: CandyBucket, CandyBowl. ItemMapper: CandyBowl
 
 - type: Tag
-  id: FootstepSound # SharedMoverController checks for this before playing footstep sounds
+  id: FootstepSound # SharedMoverController checks for this on an entity before playing footstep sounds.
 
 - type: Tag
-  id: ForceableFollow # Used by FollowerSystem to give entities an altverb to start orbiting the user
+  id: ForceableFollow # Used by FollowerSystem to give tagged entities an altverb to start orbiting the user.
 
 - type: Tag
   id: ForceFixRotations # fixrotations command WILL target this
@@ -638,258 +641,260 @@
 ## G ##
 
 - type: Tag
-  id: Galaxythistle
+  id: Galaxythistle # CargoBounty: BountyGalaxyThistle
 
 - type: Tag
-  id: GasScrubber
+  id: GasScrubber # Used by AtmosAlarmableComponent for syncing devices.
 
 - type: Tag
-  id: GasTank
+  id: GasTank # Unused (Exists on GasTankBase)
 
 - type: Tag
-  id: GasVent
+  id: GasVent # Used by AtmosAlarmableComponent for syncing devices.
 
 - type: Tag
-  id: Gauze
+  id: Gauze # Storage whitelist: ClothingBeltMedical
 
 - type: Tag
-  id: GeigerCounter
+  id: GeigerCounter # Storage whitelist: BaseClothingBeltEngineering
 
 # Used for warps
 - type: Tag
   id: GhostOnlyWarp
 
 - type: Tag
-  id: GenderPin
+  id: GenderPin # ChameleonClothing key.
 
 - type: Tag
-  id: GlassAirlock
+  id: GlassAirlock # Used in ConstructionGraph "Airlock" to navigate between regular, glass, and highsec airlocks.
 
 - type: Tag
-  id: GlassBeaker
+  id: GlassBeaker # This tag is used as a common ingredient in the construction of various machines.
 
 - type: Tag
-  id: GlassShard
+  id: GlassShard # ConstructionGraph: BladedFlatcapBrown, BladedFlatcapGrey, ImprovisedArrow, ImprovisedShotgunShellGraph, Shiv, Spear
 
 - type: Tag
-  id: Goat
+  id: Goat # Reproductive partner key
 
 - type: Tag
-  id: GoldenPlunger
+  id: GoldenPlunger # Storage whitelist: JanitorialTrolley. ItemMapper: JanitorialTrolley
 
 - type: Tag
-  id: Goliath
+  id: Goliath # Blacklist on GoliathTentacle to prevent tagged entity from getting stunned (by itself)
 
 - type: Tag
-  id: GoliathPlate
+  id: GoliathPlate # CargoBounty: BountyGoliathPlates
 
 - type: Tag
-  id: GPS
+  id: GPS # Storage whitelist: BaseClothingBeltEngineering
+
+- type: Tag # Exists for propelled explosives, not hand grenades.
+  id: Grenade # Ammo: ShuttleGunFriendship, WeaponLauncherChinaLake, WeaponLauncherHydra, BaseMagazineGrenade
 
 - type: Tag
-  id: Grenade
+  id: GrenadeFlashBang # Storage whitelist: ClusterBang
 
 - type: Tag
-  id: GrenadeFlashBang
+  id: GuideEmbeded # Applied by GuideEntityEmbed and used by GuidebookSystem. This tag hides the guidebook link when examining an entity inside a guide book.
 
 - type: Tag
-  id: GuideEmbeded
+  id: GunUpgradeDamage # Used by PKAUpgradeDamage:GunUpgrade to ensure mutually exclusive upgrades.
 
 - type: Tag
-  id: GunUpgradeDamage
+  id: GunUpgradeRange # Used by PKAUpgradeRange:GunUpgrade to ensure mutually exclusive upgrades.
 
 - type: Tag
-  id: GunUpgradeRange
-
-- type: Tag
-  id: GunUpgradeReloadSpeed
+  id: GunUpgradeReloadSpeed # Used by PKAUpgradeFireRate:GunUpgrade to ensure mutually exclusive upgrades.
 
 ## H ##
 
 - type: Tag
-  id: Hamster
+  id: Hamster # Pilot whitelist: MechHamtr
 
 - type: Tag
-  id: HamsterWearable
+  id: HamsterWearable # Used by inventoryTemplate:hamster to whitelist clothes wearable by brown rats
 
 - type: Tag
-  id: HamtrCentralControlModule
+  id: HamtrCentralControlModule # ConstructionGraph: Hamtr
 
 - type: Tag
-  id: HamtrPeripheralsControlModule
+  id: HamtrPeripheralsControlModule # ConstructionGraph: Hamtr
 
 - type: Tag
-  id: HamtrLArm
+  id: HamtrLArm # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness
 
 - type: Tag
-  id: HamtrLLeg
+  id: HamtrLLeg # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness
 
 - type: Tag
-  id: HamtrRArm
+  id: HamtrRArm # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness
 
 - type: Tag
-  id: HamtrRLeg
+  id: HamtrRLeg # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness
 
 - type: Tag
-  id: Handcuffs
+  id: Handcuffs # It's handcuffs. ConstructionGraph: makeshiftstunprod, Bola, PneumaticCannon
 
 - type: Tag
-  id: HandGrenade
+  id: HandGrenade # Storage whitelist: ClothingBeltSecurity
 
 - type: Tag
-  id: HappyHonk
+  id: HappyHonk # ConstructionGraph: HonkBot
 
 - type: Tag
-  id: Hardsuit # Prevent melee injectors that can't penetrate hardsuits from injecting the wearer (nettles)
+  id: Hardsuit # Used by SolutionInjectOnCollideSystem to guard from injection. Copied TODO replace with a cancellable event
 
 - type: Tag
-  id: HardsuitSpatio
+  id: HardsuitSpatio # ConstructionGraph: HardsuitGoliath
+
+- type: Tag # Used on DungeonRoom prototypes.
+  id: Haunted # Unused. Exists on various DungeonRoomPrototypes in haunted.yml, presumably for an unimplemented PrefabDunGen whitelist.
 
 - type: Tag
-  id: Haunted
+  id: Head # ConstructionGraph: RitualSeat
 
 - type: Tag
-  id: Head
+  id: HelmetEVA # ConstructionGraph: ClownHardsuit, MimeHardsuit. PartAssembly: VimHarness. ItemMapper: VimHarness
 
 - type: Tag
-  id: HelmetEVA
-
-- type: Tag
-  id: HideContextMenu
+  id: HideContextMenu # Used by client VerbSystem to exclude tagged entities from the right click menu.
 
 - type: Tag
   id: HideCorgi # corgi hide for crafting, not for making corgis invisible
 
 - type: Tag
-  id: HidesHair # for headwear.
+  id: HidesHair # Used by MagicMirrorSystem to prevent haircuts if a tagged entity is worn.
 
 - type: Tag
-  id: HidesNose # for non-standard noses.
+  id: HidesNose # Unused x2
 
 - type: Tag
-  id: HighRiskItem
+  id: HighRiskItem # Storage blacklist: ClothingHeadHatDetGadget. Blacklisted on MaterialReclaimerComponent by both entities
+                   # Used by EventHorizonSystem to send an admin alert.
 
 - type: Tag
-  id: HighSecDoor
+  id: HighSecDoor # Used in ConstructionGraph "Airlock" to navigate between regular, glass, and highsec airlocks.
 
 - type: Tag
-  id: HivelordRemains
+  id: HivelordRemains # CargoBounty: BountyHivelordRemains
 
 - type: Tag
-  id: HiViz
+  id: HiViz # CargoBounty: BountyHiVizVest
 
 - type: Tag
-  id: Hoe
+  id: Hoe # Used by PlantHolderSystem to make tagged entities a pseudo-tool for weeding plants. TODO this sucks!
 
 - type: Tag
-  id: HolofanProjector
+  id: HolofanProjector # Storage whitelist: BaseClothingBeltEngineering
 
 - type: Tag
-  id: HolosignProjector
+  id: HolosignProjector # Storage whitelist: ClothingBeltJanitor
 
 - type: Tag
-  id: HonkerCentralControlModule
+  id: HonkerCentralControlModule # ConstructionGraph: Honker
 
 - type: Tag
-  id: HonkerPeripheralsControlModule
+  id: HonkerPeripheralsControlModule # ConstructionGraph: Honker
 
 - type: Tag
-  id: HonkerTargetingControlModule
+  id: HonkerTargetingControlModule # ConstructionGraph: Honker
 
 - type: Tag
-  id: HonkerLArm
+  id: HonkerLArm # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness
 
 - type: Tag
-  id: HonkerLLeg
+  id: HonkerLLeg # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness
 
 - type: Tag
-  id: HonkerRArm
+  id: HonkerRArm # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness
 
 - type: Tag
-  id: HonkerRLeg
+  id: HonkerRLeg # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness
 
 - type: Tag
-  id: Hotsauce
+  id: Hotsauce # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot
 
 - type: Tag
-  id: HudMedical
+  id: HudMedical # ConstructionGraph: HudMedSec
 
 - type: Tag
-  id: HudSecurity
+  id: HudSecurity # ConstructionGraph: HudMedSec, GlassesSecHUD
 
 ## I ##
 
 - type: Tag
-  id: Ice
+  id: Ice # CreateEntityTileReaction whitelist on Fresium
 
 - type: Tag
-  id: Igniter
+  id: Igniter # ConstructionGraph: makeshiftstunprod, FireBomb. Common ingredient in machines (HyperConvection)
 
 - type: Tag
-  id: Ingredient
+  id: Ingredient # Unused. (Exists on items in igredients.yml)
 
 - type: Tag #Drop this innate tool instead of deleting it.
-  id: InnateDontDelete
+  id: InnateDontDelete # Basically used as a bool for InnateToolComponent in InnateToolSystem. TODO remove
 
 - type: Tag
-  id: Ingot
+  id: Ingot # MaterialStorage whitelist for many machines and lathes. Storage whitelist: MaterialBag
 
 - type: Tag
-  id: Inflatable
+  id: Inflatable # Storage whitelist: BorgModuleInflatable
 
 - type: Tag
-  id: InstantDoAfters
+  id: InstantDoAfters # Used by SharedDoAfterSystem for tagged entities to skip DoAfters (aghost). TODO remove
 
 - type: Tag
-  id: IntercomElectronics
+  id: IntercomElectronics # ConstructionGraph: Intercom
 
 - type: Tag
-  id: InvalidForGlobalSpawnSpell
+  id: InvalidForGlobalSpawnSpell # Used by SharedMagicSystem to skip tagged entity for an all living humans spawn spell.
+                                 # Implemented only in server ZombieSystem.
 
 - type: Tag
-  id: InvalidForSurvivorAntag
+  id: InvalidForSurvivorAntag # Used by server MagicSystem and SurvivorRuleSystem to alter mind roles from global spawn spells.
 
 ## J ##
 
 - type: Tag
-  id: JawsOfLife
+  id: JawsOfLife # Storage whitelist: BaseClothingBeltEngineering. ItemMapper: BaseClothingBeltEngineering
 
 ## K ##
 
 - type: Tag
-  id: Kangaroo
+  id: Kangaroo # Used by inventoryTemplate:kangaroo to whitelist clothes wearable by the man shaped animal.
 
 - type: Tag
-  id: Katana
+  id: Katana # Unused. (Exists on Katana)
 
 - type: Tag
-  id: Ketchup
+  id: Ketchup # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot
 
 - type: Tag
-  id: KeyedInstrument
+  id: KeyedInstrument # MachineBoard construction: DawInstrumentMachineCircuitboard
 
 - type: Tag
-  id: KitchenKnife
+  id: KitchenKnife # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef
 
 - type: Tag
-  id: Knife
+  id: Knife # MachineBoard construction: BiomassReclaimerMachineCircuitboard. Storage whitelist: ClothingShoesMilitaryBase, ClothingShoesClownBase
 
 - type: Tag
-  id: KnockdownImmune
+  id: KnockdownImmune # Blacklisted by MobStandStatusEffectBase
 
 ## L ##
 
-- type: Tag
-  id: LavaBrig
+- type: Tag # Used on DungeonRoom prototypes.
+  id: LavaBrig # PrefabDunGen whitelist on LavaBrig DungeonConfig.
 
 - type: Tag
-  id: Lemon
+  id: Lemon # CargoBounty: BountyLemon
 
 - type: Tag
-  id: LightBulb
+  id: LightBulb # Storage whitelist: BoxLightbulb. ConstructionGraph: HelmetJustice
 
 - type: Tag
-  id: Lime
+  id: Lime # CargoBounty: BountyLime
 
 ## M ##
 
@@ -1024,6 +1029,8 @@
   id: Mushroom
 
 ## N ##
+- type: Tag
+  id: NinjaBombingTargetBlocker # Ninjas will not target this warp point
 
 - type: Tag
   id: NoBlockAnchoring
@@ -1035,7 +1042,7 @@
   id: NozzleBackTank
 
 - type: Tag
-  id: Nugget # for chicken nuggets
+  id: Nugget # ItemCounter: FoodBoxNugget
 
 - type: Tag
   id: NukeOpsUplink
@@ -1090,7 +1097,7 @@
   id: PepperShaker
 
 - type: Tag
-  id: PercussionInstrument
+  id: PercussionInstrument # CargoBounty: BountyPercussion. MachineBoard construction: DawInstrumentMachineCircuitboard
 
 - type: Tag
   id: PetOnly
@@ -1402,7 +1409,7 @@
   id: Steak
 
 - type: Tag
-  id: StringInstrument
+  id: StringInstrument # MachineBoard construction: DawInstrumentMachineCircuitboard
 
 - type: Tag
   id: StunImmune
@@ -1591,6 +1598,7 @@
 
 - type: Tag
   id: WoodwindInstrument # even more like our atmos
+                         # MachineBoard construction: DawInstrumentMachineCircuitboard
 
 - type: Tag
   id: Wrench
diff --git a/Resources/ServerInfo/Guidebook/Engineering/GasRecycling.xml b/Resources/ServerInfo/Guidebook/Engineering/GasRecycling.xml
new file mode 100644
index 0000000000..1c9d83ecb5
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Engineering/GasRecycling.xml
@@ -0,0 +1,25 @@
+<Document>
+  # Gas Recycling
+  Gas recycler is a machine that converts waste gasses into breathable ones.
+
+  <Box>
+    <GuideEntityEmbed Entity="GasRecycler"/>
+  </Box>
+  Specificaly it can recycle Carbon Dioxide and Nitrous Oxide into Oxygen and Nitrogen.
+
+  The machine has a two [textlink="pipenet" link="PipeNetworks"] connections, for gas input and output.
+
+  For recycler to work, tha gas needs to be pressurized to [color=#a4885c]3000 kPa[/color] heated to [color=#a4885c]573,15K[/color], and the pressure at the inlet needs to be higher than outlet.
+  If these conditions are not met, the gases will just pass through without getting recycled (as will unrecyclable gases).
+
+  <Box>
+    <GuideEntityEmbed Entity="GasRecyclerMachineCircuitboard" Caption="Gas recycler circuit board"/>
+  </Box>
+
+  The machine can be constructed using a circuit board, which can be made at a circuit imprinter.
+  It first needs to be researched by [textlink="science" link="Science"] though.
+
+  Gas recycling can be used as an alternative to gas miners, or as a backup to build a redundancy in the atmospheric system.
+  [color=#a4885c]Just don't forget to cool the gas before releasing it into the station![/color]
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
index 46d0504757..b66734b7e7 100644
--- a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
@@ -58,7 +58,7 @@
   - Use [color=yellow][bold][keybind="Use"][/bold][/color] to [color=cyan]put[/color] a held item from your active hand somewhere else, or to [color=cyan]use it[/color] on something or someone, depending on the context.
   - Pay attention to your active hand when interacting with the world to prevent accidentally using held items.
 
-  [bold]Items can't be transferred by drag and drop.[/bold]
+  [bold]Items cannot be transferred by drag and drop.[/bold]
 
   ### Dropping and throwing
   Use [color=yellow][bold][keybind="Drop"][/bold][/color] to [color=cyan]drop[/color] (or place) an item from your hand within arm's reach.
@@ -81,8 +81,8 @@
 
   Standard interactions range from clicking [bold]tables[/bold] to put held items onto them, to [bold]using[/bold] objects in the world with empty hands, and most commonly, using held items to interact with mobs and with other items.
 
-  In some situations, you can directly [color=cyan]swap items[/color] by clicking.
-  For example, while holding a beaker, click on a machine that holds another beaker.
+  In some situations, you can directly [color=cyan]swap items[/color] by clicking on a machine while holding an item.
+  For example, while holding a beaker, click on a machine storing another beaker. This also works with air tanks and canisters.
 
   Some items have [color=cyan]alternative interactions[/color] — use [color=yellow][bold][keybind="AltActivateItemInWorld"][/bold][/color] to [bold]lock[/bold] lockers, [bold]eject[/bold] subitems such as batteries from other items, etc.
 
@@ -90,24 +90,25 @@
   Interact with objects such as containers even when your hands are full by performing [color=cyan]activation interactions[/color] with [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color].
   This allows you to, for example, [bold]open containers[/bold] without picking them up, [bold]open doors[/bold] without using the item you're holding, and to [bold]cycle guns[/bold].
 
-  Notably, press [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color] on a mob to open the [color=cyan]strip menu[/color], allowing you to view their inventory — which lets you try to take it.
+  Notably, press [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color] on a mob to open the [color=cyan]strip menu[/color], allowing you to view their inventory — which lets you try to take off or steal items from them.
 
   ### In-hand
-  Many items also have [bold]use-in-hand interactions[/bold], such as opening bottles, [bold]wielding[/bold] two-handed guns and big melee weapons with both hands (clubs, spears, axes, mops, shotguns, etc.), or [bold]cycling[/bold] guns.
+  Many items also have [color=cyan]use-in-hand interactions[/color], such as [bold]opening[/bold] bottles, [bold]wielding[/bold] two-handed guns and big melee weapons with both hands (clubs, spears, axes, mops, shotguns, etc.), [bold]cycling[/bold] guns, or [bold]toggling[/bold] syringes between injecting and drawing.
 
-  You may just perform them by clicking on your active hand, but it's worth remembering the hotkeys — [color=yellow][bold][keybind="ActivateItemInHand"][/bold][/color] and [color=yellow][bold][keybind="AltActivateItemInHand"][/bold][/color] for [color=cyan]standard[/color] and [color=cyan]alternative[/color] in-hand interactions, respectively.
+  You may just perform in-hand interactions by clicking [color=yellow][bold][keybind="Use"][/bold][/color] or [color=yellow][bold][keybind="AltActivateItemInWorld"][/bold][/color] on your active hand, but it's worth remembering the hotkeys — [color=yellow][bold][keybind="ActivateItemInHand"][/bold][/color] and [color=yellow][bold][keybind="AltActivateItemInHand"][/bold][/color] for [color=cyan]standard[/color] and [color=cyan]alternative[/color] in-hand interactions, respectively.
 
   ### Click and drag
-  To "use" a mob (player or NPC) [italic]on[/italic] a static object, click and drag them onto said object with [color=yellow][bold][keybind="Use"][/bold][/color].
-  \n(Not to be confused with [italic]pulling[/italic].)
+  You can "use" an entity on another entity by dragging one onto another with [color=yellow][bold][keybind="Use"][/bold][/color]. (Not to be confused with [italic]pulling[/italic].)
 
   Use it to:
-  - [color=cyan]Put[/color] a mob on a chair, bed, into a cryogenic chamber, etc.
+  - [color=cyan]Place[/color] or force a mob (player or NPC) on a chair, bed, into a cryogenic chamber, disposal unit, etc.
 
   - [color=cyan]Climb[/color] yourself onto a table — you can also click [color=yellow][bold][keybind="AltActivateItemInWorld"][/bold][/color] on the table.
 
   - Open the [color=cyan]strip menu[/color] by dragging another mob onto your character — which is also doable with [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color], as mentioned earlier.
 
+  - [color=cyan]Pour[/color] the contents of a liquid container (janitorial trolley, bucket, beaker) into another container, a drain, a machine, etc. But first, remember to place the container on the ground — you can't do it from your inventory.
+
   ### Pointing
   Use [color=yellow][bold][keybind="Point"][/bold][/color] to [color=cyan]point[/color] at a location in the world, creating a temporary arrow visible to everyone.
 
@@ -118,11 +119,11 @@
   - [bold]activation[/bold] ([color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color]),
   - [bolditalic]use-in-hand[/bolditalic] ([color=yellow][bold][keybind="ActivateItemInHand"][/bold][/color]),
   - [italic]alternative use-in-hand[/italic] ([color=yellow][bold][keybind="AltActivateItemInHand"][/bold][/color]),
-  - click and drag (which is unique for placing mobs onto objects).
+  - click and drag.
 
   Don't worry about having to memorize them — they're usually intuitive and consistent across entity categories, and you'll find that most entities only use one or two interactions.
 
-  [bold]Items are still interactable while stored in containers.[/bold]
+  [bold]Items stored in containers are still interactable.[/bold]
 
   ## Context menus
   Click [color=yellow][bold][keybind="UIRightClick"/][/bold][/color] on any interactive entity to open the [color=cyan]context menu[/color], which shows you additional interaction you can currently perform.
@@ -159,9 +160,12 @@
   If you have a bag or a belt, open their inventories with [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color] or by clicking the mini-icons in the [bold]bottom right[/bold] of their icons.
   You can also use the [color=yellow][bold][keybind="OpenBackpack"][/bold][/color] and [color=yellow][bold][keybind="OpenBelt"][/bold][/color] hotkeys for that.
 
-  Press [color=yellow][bold][keybind="SmartEquipBackpack"][/bold][/color] to [color=cyan]quick-equip[/color] — it quick-stores the item from your active hand into your bag, or if your hand is empty, quick-equips the most recently added item from the bag into your active hand.
-  \n[color=yellow][bold][keybind="SmartEquipBelt"][/bold][/color] does the same for your belt, making tool access faster.
-  \n[italic]Tip: You can also quick-equip single items stored in the back slot.[/italic]
+  ### Smart-equipping
+  You can [color=cyan]quick-move[/color] items between your active hand and a corresponding slot. If that slot has a container in it, this action will [color=cyan]quick-store[/color] or [color=cyan]quick-take[/color] the most recent item from that container (signified with a golden star icon in the container).
+
+  - [color=yellow][bold][keybind="SmartEquipBackpack"][/bold][/color] smart-equips the back slot.
+  - [color=yellow][bold][keybind="SmartEquipBelt"][/bold][/color] smart-equips the belt slot.
+  - [color=yellow][bold][keybind="SmartEquipPocket1"][/bold][/color], [color=yellow][bold][keybind="SmartEquipPocket2"][/bold][/color], and [color=yellow][bold][keybind="SmartEquipSuitStorage"][/bold][/color] smart-equip the left pocket, right pocket, and suit storage slots, respectively.
 
   ### Organizing grid inventories
   [color=cyan]Rearrange[/color] items by dragging them with [color=yellow][bold][keybind="MoveStoredItem"][/bold][/color].
diff --git a/Resources/ServerInfo/Guidebook/ReferenceTables/Lawsets.xml b/Resources/ServerInfo/Guidebook/ReferenceTables/Lawsets.xml
new file mode 100644
index 0000000000..089cc1192a
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ReferenceTables/Lawsets.xml
@@ -0,0 +1,6 @@
+<Document>
+# Common Silicon Lawsets
+
+<GuideLawsetListEmbed/>
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml b/Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml
new file mode 100644
index 0000000000..e1bfece051
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Science/AnalysisConsole.xml
@@ -0,0 +1,22 @@
+<Document>
+  # Analysis Console
+
+  The Analysis Console is a device used to interface with artifacts. It can be used to check nodes, their triggers and effects, and extract points.
+
+  <Box>
+    <GuideEntityEmbed Entity="ComputerAnalysisConsole" Caption="Analysis Console"/>
+  </Box>
+
+  The console displays detailed information about each node in the artifact’s tree structure. This includes:
+  - [bold]ID:[/bold] Unique identifier for use with the Node Scanner.
+  - [bold]Class:[/bold] The layer name, nodes on the same layer share it.
+  - [bold]Status:[/bold]
+  - [italic][color=red]Locked[/color][/italic] by default.
+  - [italic][color=plum]Active[/color][/italic] when first triggered.
+  - [italic][color=lime]Unlocked[/color][/italic] if a deeper node is reached (prevents manual activations).
+  - [bold]Durability:[/bold] Number of manual activations available.
+  - [bold]Effect:[/bold] What happens when the node activates or is manually triggered.
+  - [bold]Triggers:[/bold] Required actions to unlock the node.
+  - [bold]Server:[/bold] Choose the research server where extracted points are sent.
+  - [bold]Extract Points:[/bold] Extracts points from nodes unlocked since the last extraction.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
deleted file mode 100644
index 839c8bb65b..0000000000
--- a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Document>
-# Отчёты об артефактах
-Значительную часть занятия ксеноархеологией составляет интерпретация отчетов об артефактах, которые появляются на [color=#a4885c]аналитической консоли[/color] после сканирования артефактов. Отчеты содержат следующую информацию:
-
-- [color=#a4885c]ID узла:[/color] уникальный числовой идентификатор, соответствующий этому узлу артефакта. Полезен в сочетании со [color=#a4885c]сканером узлов[/color] для быстрого определения повторяющихся узлов.
-
-- [color=#a4885c]Глубина:[/color] расстояние от стартового узла (глубина 0). Удобная короткая подсказка о ценности и опасности узла.
-
-- [color=#a4885c]Статус активации:[/color] был ли узел ранее активирован или нет.
-
-- [color=#a4885c]Стимулятор:[/color] стимулятор для этого узла.
-
-- [color=#a4885c]Реакция:[/color] реакция, вызываемая стимулятором. Она часто имеет расплывчатый характер, поэтому рекомендуется проявлять осторожность.
-
-- [color=#a4885c]Соединения:[/color] количество узлов, которые соединены с текущим узлом. Зная это, можно подсчитать общее количество узлов, а также составить карту их соединений.
-
-- [color=#a4885c]Неизвлеченная ценность:[/color] количество очков исследования, которое артефакт даст при извлечении. При извлечении это значение равно нулю, а при обходе новых узлов оно увеличивается.
-
-Отчёты — полезный инструмент в манипулировании артефактом, особенно на поздних стадиях, когда вы проходите по узлам, которые уже были активированы.
-<Box>
-<GuideEntityEmbed Entity="PaperArtifactAnalyzer"/>
-</Box>
-Чтобы облегчить себе эту задачу, печатайте отчёты, записывайте детали, открывшиеся в ходе исследований, или храните их под рукой в папке.
-
-</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml b/Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml
new file mode 100644
index 0000000000..ca93846b68
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Science/UnlockingNodes.xml
@@ -0,0 +1,48 @@
+<Document>
+  # Unlocking Nodes
+  <Box>
+    <GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
+    <GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
+  </Box>
+
+  To activate and unlock nodes on an artifact, you should:
+  - Check a node on the [bold]Analysis Console[/bold] to check its triggers and effects.
+  - Perform the [bold]triggers[/bold] listed in the console. Some require direct interaction with the artifact, while others may only need the correct environment or a specific action performed nearby.
+  - Once a trigger is successfully performed, the artifact will respond with the message: [italic]"It begins to shift in strange ways..."[/italic]. The [bold]Node Scanner[/bold] will then indicate which specific nodes are being triggered.
+
+  Artifacts enter an unlocking state after the first trigger is met. During this state, any remaining triggers must be completed. The unlocking window initially lasts a few seconds and resets each time a new trigger is activated. This window grows longer with each additional node unlocked, giving more time to complete further triggers.
+
+  Once all required triggers are completed successfully, the artifact will trigger it's effect and a popup will appear saying: [italic]"It slows down, visibly changed."[/italic], and the node will appear as [bold][color=plum]Active[/color][/bold] on the Console.
+
+  If an artifact fails to activate, it will stop resonating and display the message: [italic]"It slows down before uneventfully stopping."[/italic] After this, it enters a cooldown period before it can be activated again.
+
+  The order of trigger activation [bold]does not matter[/bold] for individual nodes. [italic]However[/italic], some triggers affect multiple nodes. As a rule of thumb, start with a trigger that is unique to the node you want to unlock. Activating a trigger for a different node during this phase prevents the target node from unlocking until the artifact’s cooldown ends.
+
+  <GuideReagentEmbed Reagent="Artifexium"/>
+
+  ## Active Nodes
+  Once unlocked, a node is considered active. Only the highest unlocked nodes in a tree’s layer are activatable, lower nodes in the same tree cannot be triggered anymore once a higher node has been activated.
+
+  Artifacts often have multiple trees. Layer precedence applies within each tree, but different trees operate independently. This means nodes in different trees can be activated simultaneously as long as they are the highest unlocked nodes in their respective trees.
+
+  [bold]Manual activation triggers all unlocked nodes at once and consumes durability.[/bold]
+
+  <GuideReagentEmbed Reagent="ArtifactGlue"/>
+
+  ## Triggers
+  Examples include:
+  - Examining the artifact
+  - Playing an instrument
+  - Damaging or throwing it
+  - Exposing it to gases (plasma, tritium, etc.)
+  - Changing pressure or temperature
+  - Using tools (screwdriver, multitool, crowbar, wrench)
+  - Splashing reagents (blood, water, ammonia, etc.)
+  - Killing something nearby
+
+  ## Effects
+  Effects can be:
+  - [color=green]Harmless:[/color] producing plants, animals, or junk
+  - [color=#00ccff]Helpful:[/color] charging batteries, creating instruments or money
+  - [color=red]Hazardous:[/color] anomalies, radiation, explosions, hostile fauna
+</Document>
diff --git a/Resources/Textures/Clothing/Ears/Headsets/ninja.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/ninja.rsi/equipped-EARS.png
new file mode 100644
index 0000000000..eeacb35cfe
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/ninja.rsi/equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/ninja.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/ninja.rsi/icon.png
new file mode 100644
index 0000000000..ca2cdf0d65
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/ninja.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/ninja.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/ninja.rsi/meta.json
new file mode 100644
index 0000000000..5264ee019b
--- /dev/null
+++ b/Resources/Textures/Clothing/Ears/Headsets/ninja.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 and recolored by Alwayswannahunt(github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                0.5,
+                0.35,
+                0.3,
+                0.3,
+                0.35
+                ]
+            ]
+        },
+        {
+            "name": "equipped-EARS",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png
index 6180b00178..13533d2a48 100644
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png
index b091c82268..57ca5d0b23 100644
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
index 00c0c2b912..9f9dba55ca 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
@@ -1,8 +1,8 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites made by SeamLesss, Inhand & equipped-HAND sprites modified by Prole0 (Github)",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/artistry-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/artistry-module.png
new file mode 100644
index 0000000000..d734fdc09f
Binary files /dev/null and b/Resources/Textures/Interface/Actions/actions_borg.rsi/artistry-module.png differ
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index e20fd6ed35..08931eeb94 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, inflatable module by FungiFellow (GitHub), Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github), advclown by ThatGuyUSA.  c20r and esword by RedBookcase on Github.",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, inflatable module by FungiFellow (GitHub), Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github), advclown by ThatGuyUSA.  c20r and esword by RedBookcase on Github, artistry-module by Kittygyat, with help from TiniestShark",
     "copyright": "select-type, clowning-module changed by lzk228",
     "size": {
         "x": 32,
@@ -26,6 +26,9 @@
         {
             "name":"extinguisher-module"
         },
+        {
+            "name":"artistry-module"
+        },
         {
             "name":"geiger-module"
         },
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/CBURN.png b/Resources/Textures/Interface/Misc/job_icons.rsi/CBURN.png
new file mode 100644
index 0000000000..f4dfea6dd2
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/CBURN.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/DeathSquad.png b/Resources/Textures/Interface/Misc/job_icons.rsi/DeathSquad.png
new file mode 100644
index 0000000000..0886bd17b5
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/DeathSquad.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTChaplain.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTChaplain.png
new file mode 100644
index 0000000000..bb38728e3b
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTChaplain.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTEngineer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTEngineer.png
new file mode 100644
index 0000000000..7d0839b3da
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTEngineer.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTJanitor.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTJanitor.png
new file mode 100644
index 0000000000..804b066080
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTJanitor.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTLeader.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTLeader.png
new file mode 100644
index 0000000000..2921a30b35
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTLeader.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTMedical.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTMedical.png
new file mode 100644
index 0000000000..6a54f937ba
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTMedical.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ERTSecurity.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTSecurity.png
new file mode 100644
index 0000000000..ec54208081
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ERTSecurity.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png
index a671977085..3eb3179267 100644
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCommander.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCommander.png
new file mode 100644
index 0000000000..0a7cc2bfe6
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCommander.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCorpsman.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCorpsman.png
new file mode 100644
index 0000000000..93de09c5c3
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateCorpsman.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateOperative.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateOperative.png
new file mode 100644
index 0000000000..6386f9f46d
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SyndicateOperative.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Wizard.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Wizard.png
new file mode 100644
index 0000000000..d2da69ae74
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Wizard.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index eb5a042934..c56d8c43c6 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24",
+    "copyright": "Taken and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github)",
     "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | Pilot icon made by poemota (Discord)  | StationAi resprite to 8x8 size by lunarcomets  | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github)",
     "size": {
         "x": 8,
@@ -9,73 +9,49 @@
     },
     "states": [
         {
-            "name": "Detective"
-        },
-        {
-            "name": "QuarterMaster"
-        },
-        {
-            "name": "Botanist"
-        },
-        {
-            "name": "Borg"
-        },
-        {
-            "name": "Boxer"
+            "name": "Admin"
         },
         {
             "name": "AtmosphericTechnician"
         },
         {
-            "name": "Nanotrasen"
+            "name": "Bartender"
         },
         {
-            "name": "Prisoner"
+            "name": "Borg"
         },
         {
-            "name": "Janitor"
+            "name": "Botanist"
         },
         {
-            "name": "Chemist"
+            "name": "Boxer"
         },
         {
-            "name": "StationEngineer"
+            "name": "Brigmedic"
         },
         {
-            "name": "SecurityOfficer"
-        },
-        {
-            "name": "NoId"
-        },
-        {
-            "name": "ChiefMedicalOfficer"
-        },
-        {
-            "name": "Roboticist"
-        },
-        {
-            "name": "Chaplain"
-        },
-        {
-            "name": "Lawyer"
-        },
-        {
-            "name": "Unknown"
-        },
-        {
-            "name": "Librarian"
+            "name": "Captain"
         },
         {
             "name": "CargoTechnician"
         },
         {
-            "name": "Scientist"
+            "name": "CBURN"
         },
         {
-            "name": "ResearchAssistant"
+            "name": "Chaplain"
         },
         {
-            "name": "Geneticist"
+            "name": "Chef"
+        },
+        {
+            "name": "Chemist"
+        },
+        {
+            "name": "ChiefEngineer"
+        },
+        {
+            "name": "ChiefMedicalOfficer"
         },
         {
             "name": "Clown"
@@ -84,100 +60,61 @@
             "name": "Cluwne"
         },
         {
-            "name": "Captain"
+            "name": "Detective"
         },
         {
+            "name": "DeathSquad"
+        },
+        {
+            "name": "ERTChaplain"
+        },
+        {
+            "name": "ERTEngineer"
+        },
+        {
+            "name": "ERTJanitor"
+        },
+        {
+            "name": "ERTLeader"
+        },
+        {
+            "name": "ERTMedical"
+        },
+        {
+            "name": "ERTSecurity"
+        },
+        {
+            "name": "Geneticist"
+        },
+		{
             "name": "HeadOfPersonnel"
         },
-        {
-            "name": "Virologist"
-        },
-        {
-            "name": "ShaftMiner"
-        },
-        {
-            "name": "Passenger"
-        },
-        {
-            "name": "ChiefEngineer"
-        },
-        {
-            "name": "Bartender"
-        },
         {
             "name": "HeadOfSecurity"
         },
         {
-            "name": "Brigmedic"
+            "name": "HeadRevolutionary"
         },
         {
-            "name": "Pilot"
+            "name": "InitialInfected"
+        },
+        {
+            "name": "Janitor"
+        },
+        {
+            "name": "Lawyer"
+        },
+        {
+            "name": "Librarian"
         },
         {
             "name": "MedicalDoctor"
         },
-        {
-            "name": "Paramedic"
-        },
-        {
-            "name": "Chef"
-        },
-        {
-            "name": "Warden"
-        },
-        {
-            "name": "ResearchDirector"
-        },
-        {
-            "name": "Mime"
-        },
-        {
-            "name": "Musician"
-        },
-        {
-            "name": "Reporter"
-        },
-        {
-            "name": "Psychologist"
-        },
         {
             "name": "MedicalIntern"
         },
         {
-            "name": "TechnicalAssistant"
-        },
-        {
-            "name": "ServiceWorker"
-        },
-        {
-            "name": "SecurityCadet"
-        },
-        {
-            "name": "IAA"
-        },
-        {
-            "name": "Zombie"
-        },
-        {
-            "name": "Zookeeper"
-        },
-        {
-            "name": "SeniorEngineer"
-        },
-        {
-            "name": "SeniorResearcher"
-        },
-        {
-            "name": "SeniorPhysician"
-        },
-        {
-            "name": "SeniorOfficer"
-        },
-        {
-            "name": "Revolutionary"
-        },
-        {
-            "name": "HeadRevolutionary"
+            "name": "Mime"
         },
         {
             "name": "MindShield",
@@ -188,23 +125,122 @@
                 ]
             ]
         },
+        {
+            "name": "Musician"
+        },
+        {
+            "name": "Pilot"
+        },
+        {
+            "name": "MedicalDoctor"
+        },
+        {
+            "name": "NoId"
+        },
+        {
+            "name": "ParadoxClone"
+        },
+        {
+            "name": "Paramedic"
+        },
+        {
+            "name": "Passenger"
+        },
+        {
+            "name": "Prisoner"
+        },
+        {
+            "name": "Psychologist"
+        },
+        {
+            "name": "QuarterMaster"
+        },
+        {
+            "name": "Reporter"
+        },
+        {
+            "name": "ResearchAssistant"
+        },
+        {
+            "name": "ResearchDirector"
+        },
+        {
+            "name": "Revolutionary"
+        },
+        {
+            "name": "Roboticist"
+        },
+        {
+            "name": "Scientist"
+        },
+        {
+            "name": "IAA"
+        },
+        {
+            "name": "Zombie"
+        },
+        {
+            "name": "SecurityOfficer"
+        },
+        {
+            "name": "SeniorEngineer"
+        },
+        {
+            "name": "SeniorOfficer"
+        },
+        {
+            "name": "SeniorPhysician"
+        },
+        {
+            "name": "SeniorResearcher"
+        },
+        {
+            "name": "ServiceWorker"
+        },
+        {
+            "name": "ShaftMiner"
+        },
         {
             "name": "StationAi"
         },
+        {
+            "name": "StationEngineer"
+        },
         {
             "name": "Syndicate"
         },
+        {
+            "name": "SyndicateCommander"
+        },
+        {
+            "name": "SyndicateCorpsman"
+        },
+        {
+            "name": "SyndicateOperative"
+        },
+        {
+            "name": "TechnicalAssistant"
+        },
+        {
+            "name": "Unknown"
+        },
+        {
+            "name": "Virologist"
+        },
         {
             "name": "Visitor"
         },
         {
-            "name": "InitialInfected"
+            "name": "Warden"
         },
         {
-            "name": "Admin"
+            "name": "Wizard"
         },
         {
-            "name": "ParadoxClone"
+            "name": "Zombie"
+        },
+        {
+            "name": "Zookeeper"
         }
     ]
 }
diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_eliminated.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_eliminated.png
new file mode 100644
index 0000000000..b3e0d28659
Binary files /dev/null and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_eliminated.png differ
diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_hostile.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_hostile.png
new file mode 100644
index 0000000000..3875a61f64
Binary files /dev/null and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_hostile.png differ
diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json
index 042eda20c6..c49872cb5d 100644
--- a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/7f654b6e8e59021607a9e888dfeb79920401c372/icons/mob/huds/hud.dmi",
+  "copyright": "Original sprites from https://github.com/tgstation/tgstation/blob/7f654b6e8e59021607a9e888dfeb79920401c372/icons/mob/huds/hud.dmi. hud_hostile and hud_eliminated by B_Kirill",
   "size": {
     "x": 8,
     "y": 8
@@ -21,6 +21,12 @@
     },
     {
       "name": "hud_wanted"
+    },
+    {
+      "name": "hud_hostile"
+    },
+    {
+      "name": "hud_eliminated"
     }
   ]
 }
diff --git a/Resources/Textures/Interface/Nano/Radial/back_hover.png b/Resources/Textures/Interface/Nano/Radial/back_hover.png
new file mode 100644
index 0000000000..7378a60fef
Binary files /dev/null and b/Resources/Textures/Interface/Nano/Radial/back_hover.png differ
diff --git a/Resources/Textures/Interface/Nano/Radial/back_normal.png b/Resources/Textures/Interface/Nano/Radial/back_normal.png
new file mode 100644
index 0000000000..2c4a20048c
Binary files /dev/null and b/Resources/Textures/Interface/Nano/Radial/back_normal.png differ
diff --git a/Resources/Textures/Interface/Nano/Radial/button_hover.png b/Resources/Textures/Interface/Nano/Radial/button_hover.png
new file mode 100644
index 0000000000..49885a26c3
Binary files /dev/null and b/Resources/Textures/Interface/Nano/Radial/button_hover.png differ
diff --git a/Resources/Textures/Interface/Nano/Radial/button_normal.png b/Resources/Textures/Interface/Nano/Radial/button_normal.png
new file mode 100644
index 0000000000..66dc277709
Binary files /dev/null and b/Resources/Textures/Interface/Nano/Radial/button_normal.png differ
diff --git a/Resources/Textures/Interface/Nano/Radial/close_hover.png b/Resources/Textures/Interface/Nano/Radial/close_hover.png
new file mode 100644
index 0000000000..873d20961d
Binary files /dev/null and b/Resources/Textures/Interface/Nano/Radial/close_hover.png differ
diff --git a/Resources/Textures/Interface/Nano/Radial/close_normal.png b/Resources/Textures/Interface/Nano/Radial/close_normal.png
new file mode 100644
index 0000000000..99417f2829
Binary files /dev/null and b/Resources/Textures/Interface/Nano/Radial/close_normal.png differ
diff --git a/Resources/Textures/Interface/Nano/square.png b/Resources/Textures/Interface/Nano/square.png
deleted file mode 100644
index 468260b1e6..0000000000
Binary files a/Resources/Textures/Interface/Nano/square.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Nano/square.svg b/Resources/Textures/Interface/Nano/square.svg
deleted file mode 100644
index 55ba05166b..0000000000
--- a/Resources/Textures/Interface/Nano/square.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   viewBox="0 0 6.3499998 6.35"
-   version="1.1"
-   id="svg1055"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="square.svg"
-   inkscape:export-filename="H:\Code\GitHub\space-station-14\Resources\Nano\square.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <defs
-     id="defs1049" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="10.246658"
-     inkscape:cy="8.604338"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="971"
-     inkscape:window-x="1432"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     units="px"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata1052">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-79.848503,-133.93878)">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.62899995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect816"
-       width="6.3499999"
-       height="6.3499999"
-       x="79.848503"
-       y="133.93878" />
-  </g>
-</svg>
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index dcacd1d743..35ec37005f 100644
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -4,7 +4,7 @@
       "x": 32,
       "y": 32
     },
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14, cube and baby by CoolioDudio",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14, cube and baby by CoolioDudio, overeyepigtail by GovnokradZXC",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -814,6 +814,10 @@
       {
         "name": "longwithbangs",
         "directions": 4
+      },
+      {
+        "name": "overeyepigtail",
+        "directions": 4
       }
     ]
   }
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png
new file mode 100644
index 0000000000..c3c94ba057
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png differ
diff --git a/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png b/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png
new file mode 100644
index 0000000000..4d3dbcfa07
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/hugbot.png differ
diff --git a/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json b/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json
new file mode 100644
index 0000000000..07ab40378d
--- /dev/null
+++ b/Resources/Textures/Mobs/Silicon/Bots/hugbot.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Original sprite made by compilatron (Discord) for SS13, relicensed for SS14/Moffstation; modified by Centronias (GitHub) to have two arms",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "hugbot"
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
index 45aa679ee2..5ec27e00f6 100644
--- a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc, derelict generic sprites modified by GoldenCan(GitHub), xenoborg sprites, created and modified by Samuka-C (github). Derelict Engineer, Janitor, Miner, Medical, and Assault Borg sprites by _miket on Discord.",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc, derelict generic sprites modified by GoldenCan(GitHub), xenoborg sprites, created and modified by Samuka-C (github), Derelict Engineer, Janitor, Miner, Medical, and Assault Borg sprites by _miket on Discord, minor resprite of the service borg by Kittygyat (github).",
     "states": [
         {
             "name": "clown",
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/service.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/service.png
index 0551dd94fd..f0a0f2a988 100644
Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/service.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/service.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
index a9112535f8..ddc468082b 100644
--- a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af, inhands by mubururu_ (github)",
+  "copyright": "brain, ears, eyeball-l, eyeball-r, heart-on, heart-off, kidney-l, kidney-r, liver, lung-l, lung-r, stomach, tongue, taken from /tg/station 13 at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 | appendix, appendix-inflamed, muscle, nerve, vessel taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af | inhands by mubururu_ (github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png
index ebf1d5f514..ca3c4a5510 100644
Binary files a/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png and b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png
index 18ce524dbb..2e7bc14217 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-l.png
similarity index 60%
rename from Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png
rename to Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-l.png
index 04fa520302..f1fe5b98c5 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-l.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-r.png
similarity index 60%
rename from Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png
rename to Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-r.png
index d833be57f9..354b338205 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeball-r.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-left.png
new file mode 100644
index 0000000000..16034e9aea
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-right.png
new file mode 100644
index 0000000000..b5d8e09a86
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/eyeballs-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-left.png
new file mode 100644
index 0000000000..c6aa210a15
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-right.png
new file mode 100644
index 0000000000..5a9ae7c497
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-on.png
similarity index 61%
rename from Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png
rename to Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-on.png
index 3cabb6f3f4..8fdca06320 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/heart-on.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-l.png
similarity index 58%
rename from Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png
rename to Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-l.png
index 003657a138..74433aa1b1 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-l.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-r.png
similarity index 59%
rename from Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png
rename to Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-r.png
index 87b74619eb..a7d32c672b 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidney-r.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-left.png
new file mode 100644
index 0000000000..b567cab521
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-right.png
new file mode 100644
index 0000000000..7fde79991f
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/kidneys-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-left.png
new file mode 100644
index 0000000000..031389ed8f
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-right.png
new file mode 100644
index 0000000000..7aa645a371
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver.png
similarity index 60%
rename from Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png
rename to Resources/Textures/Mobs/Species/Vox/organs.rsi/liver.png
index 3e638f8bab..8f525e692f 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/liver.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png
index 5ae28e9594..f34b9a2f3b 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-l.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png
index 8110a03b47..da3cf4a8e9 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/lung-r.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
index 1d7b44d6ed..3f5b58707b 100644
--- a/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json
@@ -1,12 +1,69 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "made by mubururu_ (github)",
+    "copyright": "Originally from Paradise station, updated and edited for SS14 by MissKay1994 (github)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
+        {
+            "name": "eyeballs-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "eyeballs-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "eyeball-l"
+        },
+        {
+            "name": "eyeball-r"
+        },
+        {
+            "name": "heart-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "heart-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "heart-on",
+            "delays": [
+                [
+                    0.6,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "kidneys-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "kidneys-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "kidney-l"
+        },
+        {
+            "name": "kidney-r"
+        },
+        {
+            "name": "liver"
+        },
+        {
+            "name": "liver-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "liver-inhand-right",
+            "directions": 4
+        },
         {
             "name": "lungs-inhand-left",
             "directions": 4
@@ -20,6 +77,20 @@
         },
         {
             "name": "lung-r"
+        },
+        {
+            "name": "stomach"
+        },
+        {
+            "name": "stomach-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "stomach-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "tongue"
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-left.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-left.png
new file mode 100644
index 0000000000..0a3384fd5c
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-left.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-right.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-right.png
new file mode 100644
index 0000000000..d08f08977e
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach-inhand-right.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach.png
new file mode 100644
index 0000000000..d064feb40c
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/stomach.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/organs.rsi/tongue.png b/Resources/Textures/Mobs/Species/Vox/organs.rsi/tongue.png
new file mode 100644
index 0000000000..eeefc89154
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/organs.rsi/tongue.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/electric.png b/Resources/Textures/Objects/Fun/crayons.rsi/electric.png
new file mode 100644
index 0000000000..d1f1db8a9b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/electric.png differ
diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/meta.json b/Resources/Textures/Objects/Fun/crayons.rsi/meta.json
index fd4cad8ac2..cb583a878e 100644
--- a/Resources/Textures/Objects/Fun/crayons.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/crayons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, tweaked by Ubaser",
+  "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, tweaked by Ubaser, electric crayon by Kittygyat",
   "size": {
     "x": 32,
     "y": 32
@@ -40,6 +40,9 @@
       "name": "box-inhand-right",
       "directions": 4
     },
+    {
+      "name": "electric"
+    },
     {
       "name": "green"
     },
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/griffin.png b/Resources/Textures/Objects/Fun/figurines.rsi/griffin.png
new file mode 100644
index 0000000000..054343eff1
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/griffin.png differ
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/griffinprize.png b/Resources/Textures/Objects/Fun/figurines.rsi/griffinprize.png
deleted file mode 100644
index c7acbf61c7..0000000000
Binary files a/Resources/Textures/Objects/Fun/figurines.rsi/griffinprize.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json
index 31208a764a..01707c6f6e 100644
--- a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, thiefcharacter and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller and holoclown done by brainfood1183. inhand-left and inhand-right sprites made by the_pro_noob678 for SS14.",
+    "copyright": "Sprites made by Flareguy for Space Station 14. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller and holoclown done by brainfood1183. inhand-left and inhand-right sprites made by the_pro_noob678 for SS14. Skeleton, Thief, Griffin, and Owlman Figurines made by YoungThugSS14.",
     "size": {
         "x": 32,
         "y": 32
@@ -151,13 +151,13 @@
             "name": "wizard_fake"
         },
         {
-            "name": "owlprize"
+            "name": "owlman"
         },
         {
-            "name": "griffinprize"
+            "name": "griffin"
         },
         {
-            "name": "skeletonprize"
+            "name": "skeleton"
         },
         {
             "name": "fig_box"
@@ -166,7 +166,7 @@
             "name": "fig_box_unfolded"
         },
         {
-            "name": "thiefcharacter"
+            "name": "thief"
         },
         {
             "name": "figurine_spawner"
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/owlman.png b/Resources/Textures/Objects/Fun/figurines.rsi/owlman.png
new file mode 100644
index 0000000000..b78fb4b01a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/owlman.png differ
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/owlprize.png b/Resources/Textures/Objects/Fun/figurines.rsi/owlprize.png
deleted file mode 100644
index aab05e030f..0000000000
Binary files a/Resources/Textures/Objects/Fun/figurines.rsi/owlprize.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/skeleton.png b/Resources/Textures/Objects/Fun/figurines.rsi/skeleton.png
new file mode 100644
index 0000000000..95ad83597d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/skeleton.png differ
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/skeletonprize.png b/Resources/Textures/Objects/Fun/figurines.rsi/skeletonprize.png
deleted file mode 100644
index 5d8e5f2b94..0000000000
Binary files a/Resources/Textures/Objects/Fun/figurines.rsi/skeletonprize.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/thief.png b/Resources/Textures/Objects/Fun/figurines.rsi/thief.png
new file mode 100644
index 0000000000..0d4ae8bcb9
Binary files /dev/null and b/Resources/Textures/Objects/Fun/figurines.rsi/thief.png differ
diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png b/Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png
deleted file mode 100644
index d0d3f559b8..0000000000
Binary files a/Resources/Textures/Objects/Fun/figurines.rsi/thiefcharacter.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/atmospherictechnician.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/atmospherictechnician.png
new file mode 100644
index 0000000000..362ad05f53
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/atmospherictechnician.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/bartender.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/bartender.png
new file mode 100644
index 0000000000..e3e74681ea
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/bartender.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/botanist.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/botanist.png
new file mode 100644
index 0000000000..8ea155fd57
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/botanist.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/boxer.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/boxer.png
new file mode 100644
index 0000000000..9903eb2945
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/boxer.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/captain.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/captain.png
new file mode 100644
index 0000000000..51658d7ae5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/captain.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/cargotechnician.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/cargotechnician.png
new file mode 100644
index 0000000000..779d492673
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/cargotechnician.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chaplain.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chaplain.png
new file mode 100644
index 0000000000..a3e38f2b9c
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chaplain.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chef.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chef.png
new file mode 100644
index 0000000000..4c2d06ef9b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chef.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chemist.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chemist.png
new file mode 100644
index 0000000000..0890b81bbf
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chemist.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chiefengineer.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chiefengineer.png
new file mode 100644
index 0000000000..0a27df37b7
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chiefengineer.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chiefmedicalofficer.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chiefmedicalofficer.png
new file mode 100644
index 0000000000..2bb803cd39
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/chiefmedicalofficer.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/clown.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/clown.png
new file mode 100644
index 0000000000..683fba15a2
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/clown.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/detective.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/detective.png
new file mode 100644
index 0000000000..2a2ab6475b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/detective.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/headofpersonnel.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/headofpersonnel.png
new file mode 100644
index 0000000000..a404b92a0d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/headofpersonnel.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/headofsecurity.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/headofsecurity.png
new file mode 100644
index 0000000000..82c6c64a97
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/headofsecurity.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/janitor.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/janitor.png
new file mode 100644
index 0000000000..0442d46160
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/janitor.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/lawyer.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/lawyer.png
new file mode 100644
index 0000000000..c0a427bdbe
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/lawyer.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/librarian.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/librarian.png
new file mode 100644
index 0000000000..6f646a7794
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/librarian.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/medicaldoctor.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/medicaldoctor.png
new file mode 100644
index 0000000000..70f88df01f
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/medicaldoctor.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/medicalintern.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/medicalintern.png
new file mode 100644
index 0000000000..cb355b357f
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/medicalintern.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/meta.json b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/meta.json
new file mode 100644
index 0000000000..49c52bed3a
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/meta.json
@@ -0,0 +1,170 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "All job lizard plushies made by seam_less (discord), multiweh from all job lizard plushies by ArtisticRoomba",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "atmospherictechnician"
+        },
+        {
+            "name": "bartender"
+        },
+        {
+            "name": "botanist"
+        },
+        {
+            "name": "boxer"
+        },
+        {
+            "name": "captain"
+        },
+        {
+            "name": "cargotechnician"
+        },
+        {
+            "name": "chaplain"
+        },
+        {
+            "name": "chef"
+        },
+        {
+            "name": "chemist"
+        },
+        {
+            "name": "chiefengineer"
+        },
+        {
+            "name": "chiefmedicalofficer"
+        },
+        {
+            "name": "clown"
+        },
+        {
+            "name": "detective"
+        },
+        {
+            "name": "headofpersonnel"
+        },
+        {
+            "name": "headofsecurity"
+        },
+        {
+            "name": "janitor"
+        },
+        {
+            "name": "lawyer"
+        },
+        {
+            "name": "librarian"
+        },
+        {
+            "name": "medicaldoctor"
+        },
+        {
+            "name": "medicalintern"
+        },
+        {
+            "name": "mime"
+        },
+        {
+            "name": "musician"
+        },
+        {
+            "name": "paramedic"
+        },
+        {
+            "name": "passenger"
+        },
+        {
+            "name": "psychologist"
+        },
+        {
+            "name": "quartermaster"
+        },
+        {
+            "name": "reporter"
+        },
+        {
+            "name": "researchassistant"
+        },
+        {
+            "name": "researchdirector"
+        },
+        {
+            "name": "salvager"
+        },
+        {
+            "name": "scientist"
+        },
+        {
+            "name": "securitycadet"
+        },
+        {
+            "name": "securityofficer"
+        },
+        {
+            "name": "serviceworker"
+        },
+        {
+            "name": "stationengineer"
+        },
+        {
+            "name": "technicalassistant"
+        },
+        {
+            "name": "warden"
+        },
+        {
+            "name": "zookeeper"
+        },
+        {
+            "name": "multiweh",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/mime.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/mime.png
new file mode 100644
index 0000000000..1d0e388aa6
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/mime.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/multiweh.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/multiweh.png
new file mode 100644
index 0000000000..e201809a02
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/multiweh.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/musician.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/musician.png
new file mode 100644
index 0000000000..8cc3c688ba
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/musician.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/paramedic.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/paramedic.png
new file mode 100644
index 0000000000..0cef39bec5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/paramedic.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/passenger.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/passenger.png
new file mode 100644
index 0000000000..35185fe83b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/passenger.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/psychologist.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/psychologist.png
new file mode 100644
index 0000000000..0045efa5d3
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/psychologist.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/quartermaster.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/quartermaster.png
new file mode 100644
index 0000000000..f451feb3b9
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/quartermaster.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/reporter.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/reporter.png
new file mode 100644
index 0000000000..c43ea3adeb
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/reporter.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/researchassistant.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/researchassistant.png
new file mode 100644
index 0000000000..539ec45319
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/researchassistant.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/researchdirector.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/researchdirector.png
new file mode 100644
index 0000000000..7e4d0fac28
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/researchdirector.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/salvager.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/salvager.png
new file mode 100644
index 0000000000..f75c21a7d1
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/salvager.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/scientist.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/scientist.png
new file mode 100644
index 0000000000..1b6805bee8
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/scientist.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/securitycadet.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/securitycadet.png
new file mode 100644
index 0000000000..5683bd12aa
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/securitycadet.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/securityofficer.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/securityofficer.png
new file mode 100644
index 0000000000..b3c856000b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/securityofficer.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/serviceworker.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/serviceworker.png
new file mode 100644
index 0000000000..bcaa4aed52
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/serviceworker.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/stationengineer.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/stationengineer.png
new file mode 100644
index 0000000000..334c721f10
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/stationengineer.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/technicalassistant.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/technicalassistant.png
new file mode 100644
index 0000000000..5dd4a1130f
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/technicalassistant.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/warden.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/warden.png
new file mode 100644
index 0000000000..6702d1605f
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/warden.png differ
diff --git a/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/zookeeper.png b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/zookeeper.png
new file mode 100644
index 0000000000..eeb661bc3b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/plushielizard_jobs.rsi/zookeeper.png differ
diff --git a/Resources/Textures/Objects/Misc/ParcelWrap/wrapped_parcel.rsi/human.png b/Resources/Textures/Objects/Misc/ParcelWrap/wrapped_parcel.rsi/human.png
new file mode 100644
index 0000000000..b8729670b2
Binary files /dev/null and b/Resources/Textures/Objects/Misc/ParcelWrap/wrapped_parcel.rsi/human.png differ
diff --git a/Resources/Textures/Objects/Misc/ParcelWrap/wrapped_parcel.rsi/meta.json b/Resources/Textures/Objects/Misc/ParcelWrap/wrapped_parcel.rsi/meta.json
index f07107aaa8..ec930e60c6 100644
--- a/Resources/Textures/Objects/Misc/ParcelWrap/wrapped_parcel.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/ParcelWrap/wrapped_parcel.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "created for ss14 by ps3moira (github) based on package sprites from vgstation at https://github.com/vgstation-coders/vgstation13/pull/36993",
+    "copyright": "created for ss14 by ps3moira (github) based on package sprites from vgstation at https://github.com/vgstation-coders/vgstation13/pull/36993 | human by Davyei (Discord)",
     "size": {
         "x": 32,
         "y": 32
@@ -34,6 +34,10 @@
         {
             "name": "tall-crate",
             "directions": 1
+        },
+        {
+            "name": "human",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png b/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png
index 99ca993b0b..9823f83fda 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-left.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-left.png
new file mode 100644
index 0000000000..a69cac4c10
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-right.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-right.png
new file mode 100644
index 0000000000..099ffe7f42
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/black-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png
index cc56db775b..044998f2c9 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/black.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png
index ff1e293183..13712f48be 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png
index 95b3d54c27..251e3d5eaa 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png
deleted file mode 100644
index 624bb4864d..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png
deleted file mode 100644
index d9c8b6e261..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png
deleted file mode 100644
index a7c8b68355..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png
deleted file mode 100644
index afbe56e5f0..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png
deleted file mode 100644
index 6fe2ce6698..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png
deleted file mode 100644
index 6bb3134b55..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png
index bb20387315..31637a7a61 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/icon-captain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/icon-captain.png
new file mode 100644
index 0000000000..e5ce2da32b
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/icon-captain.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png
deleted file mode 100644
index 3705c6bf4e..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png
deleted file mode 100644
index 3bd5446a3b..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png
deleted file mode 100644
index 5bd85696a6..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png
deleted file mode 100644
index 1f64eb4845..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png
deleted file mode 100644
index e59e7c3d04..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png
deleted file mode 100644
index cfa0a35dcc..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png
deleted file mode 100644
index 25b7017a70..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png
deleted file mode 100644
index 2dba29c206..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png
deleted file mode 100644
index f105b4f88a..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png
deleted file mode 100644
index 82a608a9a1..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png
deleted file mode 100644
index e037202044..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png
deleted file mode 100644
index d57a7e3d41..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png
deleted file mode 100644
index 56dfc53b29..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png
deleted file mode 100644
index 3b749d582a..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png
deleted file mode 100644
index 1303135aa5..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png
deleted file mode 100644
index 797133b885..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png
deleted file mode 100644
index bb03adc665..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png
deleted file mode 100644
index cebf46fade..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png
deleted file mode 100644
index 15c7cde5e8..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png
deleted file mode 100644
index de67694476..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png
deleted file mode 100644
index f7ed302b23..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png
deleted file mode 100644
index 388cf5f428..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png
deleted file mode 100644
index 9e390bb606..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png
deleted file mode 100644
index fee6d2b010..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png
deleted file mode 100644
index 9a82d447da..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png
deleted file mode 100644
index 1881839e96..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png
deleted file mode 100644
index 88866eb169..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png
deleted file mode 100644
index f9337a37c5..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png
deleted file mode 100644
index 038a5321d4..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png
deleted file mode 100644
index e1fb5e5f62..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png
deleted file mode 100644
index 9dbff4a6df..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png
deleted file mode 100644
index fdb1fd2648..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png
deleted file mode 100644
index a9d6c5facd..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png
deleted file mode 100644
index 893346a9c9..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png
deleted file mode 100644
index 6456d64439..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png
deleted file mode 100644
index 73c8b6d00f..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png
deleted file mode 100644
index f3a87d6fa4..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png
deleted file mode 100644
index 2d00cf7a16..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png
deleted file mode 100644
index 47a2ccb748..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png
deleted file mode 100644
index c232dd439d..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png
deleted file mode 100644
index 2e046fbacd..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png
deleted file mode 100644
index bc792fe1a1..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png
deleted file mode 100644
index 1d4b2f2d47..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idvisitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idvisitor.png
deleted file mode 100644
index 93e38cc6aa..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idvisitor.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png
deleted file mode 100644
index 0b4086478c..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idwizard.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idwizard.png
deleted file mode 100644
index 5213047636..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idwizard.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png
deleted file mode 100644
index 3dd174503b..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index d41d7f95e8..49cd4d68d2 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -1,185 +1,69 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github) | idmime and idmusician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24, syndiop/agent/commander made by Archee1 (Github)",
+	"copyright": "Taken and modified from /tg/station 13 at commit https://github.com/tgstation/tgstation/commit/d917f4c, edited by AJCM-git, CrudeWax, and DinnerCalzone (github) | inhands taken and modified from /vg/station13 at https://github.com/vgstation-coders/vgstation13/blob/2c2b9966ea0d03b10e6e9c59626f72bbe8475d9d/icons/mob/in-hand/left/items_lefthand.dmi | pirate made by brainfood1183 (github) | wizard by ScarkKy0 (github) | stripe_cluwne by brainfood1183 (github) | black-inhands by DinnerCalzone (github)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "default"
+            "name": "admin"
         },
         {
             "name": "black"
         },
+        {
+            "name": "black-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "black-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "blue-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "blue-inhand-right",
+            "directions": 4
+        },
         {
             "name": "centcom"
         },
         {
-            "name": "admin"
+            "name": "default"
         },
         {
-            "name": "ert_chaplain"
+            "name": "default-inhand-left",
+            "directions": 4
         },
         {
-            "name": "ert_commander"
-        },
-        {
-            "name": "ert_engineer"
-        },
-        {
-            "name": "ert_janitor"
-        },
-        {
-            "name": "ert_medic"
-        },
-        {
-            "name": "ert_security"
+            "name": "default-inhand-right",
+            "directions": 4
         },
         {
             "name": "gold"
         },
         {
-            "name": "idpassenger"
+            "name": "gold-inhand-left",
+            "directions": 4
         },
         {
-            "name": "idatmospherictechnician"
+            "name": "gold-inhand-right",
+            "directions": 4
         },
         {
-            "name": "idbartender"
+            "name": "green-inhand-left",
+            "directions": 4
         },
         {
-            "name": "idbotanist"
+            "name": "green-inhand-right",
+            "directions": 4
         },
         {
-            "name": "idboxer"
-        },
-        {
-            "name": "idcaptain"
-        },
-        {
-            "name": "idcargotechnician"
-        },
-        {
-            "name": "idcentcom"
-        },
-        {
-            "name": "idchaplain"
-        },
-        {
-            "name": "idchemist"
-        },
-        {
-            "name": "idchiefengineer"
-        },
-        {
-            "name": "idchiefmedicalofficer"
-        },
-        {
-            "name": "idclown"
-        },
-        {
-            "name": "idcook"
-        },
-        {
-            "name": "idcurator"
-        },
-        {
-            "name": "iddetective"
-        },
-        {
-            "name": "idgeneticist"
-        },
-        {
-            "name": "idheadofpersonnel"
-        },
-        {
-            "name": "idheadofsecurity"
-        },
-        {
-            "name": "idbrigmedic"
-        },
-        {
-            "name": "idjanitor"
-        },
-        {
-            "name": "idlawyer"
-        },
-        {
-            "name": "idmedicaldoctor"
-        },
-        {
-            "name": "idmime"
-        },
-        {
-            "name": "idparamedic"
-        },
-        {
-            "name": "idpsychologist"
-        },
-        {
-            "name": "idreporter"
-        },
-        {
-            "name": "idprisoner"
-        },
-        {
-            "name": "idquartermaster"
-        },
-        {
-            "name": "idresearchdirector"
-        },
-        {
-            "name": "idroboticist"
-        },
-        {
-            "name": "idscientist"
-        },
-        {
-            "name": "idsecurityofficer"
-        },
-        {
-            "name": "idshaftminer"
-        },
-        {
-            "name": "idstationengineer"
-        },
-        {
-            "name": "idunknown"
-        },
-        {
-            "name": "idvirologist"
-        },
-        {
-            "name": "idvisitor"
-        },
-        {
-            "name": "idwarden"
-        },
-        {
-            "name": "idmusician"
-        },
-        {
-            "name": "idzookeeper"
-        },
-        {
-            "name": "idintern-sci"
-        },
-        {
-            "name": "idintern-cadet"
-        },
-        {
-            "name": "idintern-med"
-        },
-        {
-            "name": "idintern-service"
-        },
-        {
-            "name": "idintern-tech"
-        },
-        {
-            "name": "idadmin"
+            "name": "icon-captain"
         },
         {
             "name": "orange"
@@ -252,19 +136,18 @@
         },
         {
             "name": "gold-inhand-left",
+            "name": "orange-inhand-left",
             "directions": 4
         },
         {
-            "name": "gold-inhand-right",
+            "name": "orange-inhand-right",
             "directions": 4
         },
         {
-            "name": "default-inhand-left",
-            "directions": 4
+            "name": "pirate"
         },
         {
-            "name": "default-inhand-right",
-            "directions": 4
+            "name": "silver"
         },
         {
             "name": "silver-inhand-left",
@@ -275,28 +158,16 @@
             "directions": 4
         },
         {
-            "name": "orange-inhand-left",
-            "directions": 4
+            "name": "stripe_bottom"
         },
         {
-            "name": "orange-inhand-right",
-            "directions": 4
+            "name": "stripe_clown"
         },
         {
-            "name": "blue-inhand-left",
-            "directions": 4
+            "name": "stripe_top"
         },
         {
-            "name": "blue-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "green-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "green-inhand-right",
-            "directions": 4
+            "name": "wizard"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png
index a44da608ec..bcb2261e22 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png
index d5670a71aa..b7029d819f 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png
deleted file mode 100644
index 67dd3e8862..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_001.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png
deleted file mode 100644
index 004677ba4a..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_002.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png
deleted file mode 100644
index 23c998f150..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_003.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png
deleted file mode 100644
index c6e31412cc..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_004.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png
deleted file mode 100644
index d1d29bb055..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_005.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png
deleted file mode 100644
index 8b2305d758..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_006.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png
deleted file mode 100644
index a5041faa88..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner_007.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png
index b13153a246..a13eab6d8d 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_bottom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_bottom.png
new file mode 100644
index 0000000000..e932dc60b0
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_bottom.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_clown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_clown.png
new file mode 100644
index 0000000000..ec4149c516
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_clown.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_top.png b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_top.png
new file mode 100644
index 0000000000..138fcbf636
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/stripe_top.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi.png
deleted file mode 100644
index ff49afaf60..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_commander.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_commander.png
deleted file mode 100644
index da0b9f1dd8..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_commander.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_corpsman.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_corpsman.png
deleted file mode 100644
index 95ec8ff75e..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_corpsman.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_operative.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_operative.png
deleted file mode 100644
index b2aa56a268..0000000000
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_operative.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png b/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png
index d13faa3ab1..58c4a82642 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-artistry.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-artistry.png
new file mode 100644
index 0000000000..1af13433c1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-artistry.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 9229815601..345a622f3f 100644
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). icon-chem.png & icon-mining-adv.png created by mubururu_ (github) icon-inflatable.png made by FungiFellow (GitHub), Xenoborg modules sprites by Samuka-C (github)",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). icon-chem.png & icon-mining-adv.png created by mubururu_ (github) icon-inflatable.png made by FungiFellow (GitHub), Xenoborg modules sprites by Samuka-C (github), icon-artistry by Kittygyat",
     "size": {
         "x": 32,
         "y": 32
@@ -55,6 +55,9 @@
         {
             "name": "icon-fire-extinguisher"
         },
+        {
+            "name": "icon-artistry"
+        },
         {
             "name": "icon-gardening"
         },
diff --git a/Resources/Textures/Objects/Tools/emag.rsi/icon.png b/Resources/Textures/Objects/Tools/emag.rsi/icon.png
index 61c283cfd0..d0c49d84b0 100644
Binary files a/Resources/Textures/Objects/Tools/emag.rsi/icon.png and b/Resources/Textures/Objects/Tools/emag.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/emag.rsi/meta.json b/Resources/Textures/Objects/Tools/emag.rsi/meta.json
index 66fc62d663..e9e761fd86 100644
--- a/Resources/Textures/Objects/Tools/emag.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/emag.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation wiki at https://tgstation13.org/wiki/File:Emag.png, inhand sprites modified from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e",
+  "copyright": "Taken from tgstation wiki at https://tgstation13.org/wiki/File:Emag.png, inhand sprites modified from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e , icon by CrudeWax (github), edited by DinnerCalzone (github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Parallaxes/purple_nebula.png.yml b/Resources/Textures/Parallaxes/purple_nebula.png.yml
new file mode 100644
index 0000000000..33ec7fbea5
--- /dev/null
+++ b/Resources/Textures/Parallaxes/purple_nebula.png.yml
@@ -0,0 +1,3 @@
+preload: false
+sample:
+  filter: true
diff --git a/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/closed.png
new file mode 100644
index 0000000000..50be2682e3
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/meta.json
new file mode 100644
index 0000000000..f6c3af7f27
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Derived from white curtain, created by TheShuEd (github) for Space Station14, by Quasr",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/open.png
new file mode 100644
index 0000000000..062b496e7d
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/skyblue.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png
new file mode 100644
index 0000000000..65ca749e5c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png
new file mode 100644
index 0000000000..b65261aea9
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png
new file mode 100644
index 0000000000..b67f2ac91f
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png
new file mode 100644
index 0000000000..116926929f
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png
new file mode 100644
index 0000000000..d7e02df93f
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png
new file mode 100644
index 0000000000..f74a94b60a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png
new file mode 100644
index 0000000000..f4851a0ea0
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png
new file mode 100644
index 0000000000..ea36a649ac
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json
new file mode 100644
index 0000000000..aff7c8e57a
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/meta.json
@@ -0,0 +1,198 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Hyenh",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png
new file mode 100644
index 0000000000..c56c1f8890
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png
new file mode 100644
index 0000000000..2932611c4e
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png
new file mode 100644
index 0000000000..05add9c5dc
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png
new file mode 100644
index 0000000000..c53b5a692b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png
new file mode 100644
index 0000000000..bd90e262c8
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png
new file mode 100644
index 0000000000..02b488b9c9
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/panel_opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png
new file mode 100644
index 0000000000..dd67e88a31
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png
new file mode 100644
index 0000000000..c41fa18ca1
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_broken.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png
new file mode 100644
index 0000000000..f16a028dee
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_damaged.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png
new file mode 100644
index 0000000000..40d559f7a3
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/sparks_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png
new file mode 100644
index 0000000000..f19a0b8caf
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_syndicate.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/full.png
new file mode 100644
index 0000000000..ca7935c7b0
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/meta.json
new file mode 100644
index 0000000000..ecdc3d74de
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi, and modified by Quasr",
+  "states": [
+    {
+      "name": "full",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "state_0",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_1",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_2",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_3",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_4",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_5",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_6",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "state_7",
+      "directions": 4,
+      "delays": [
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ],
+        [
+          1.0
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_0.png
new file mode 100644
index 0000000000..4fb072ffc9
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_1.png
new file mode 100644
index 0000000000..2d10bee3ae
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_2.png
new file mode 100644
index 0000000000..4fb072ffc9
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_3.png
new file mode 100644
index 0000000000..2d10bee3ae
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_4.png
new file mode 100644
index 0000000000..371a275b08
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_5.png
new file mode 100644
index 0000000000..f5e208b2a0
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_6.png
new file mode 100644
index 0000000000..222b24c6d4
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_7.png
new file mode 100644
index 0000000000..ec3dab4e8a
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/skyblue.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Shuttles/thruster_large.rsi/base.png b/Resources/Textures/Structures/Shuttles/thruster_large.rsi/base.png
new file mode 100644
index 0000000000..c5919ee6a4
Binary files /dev/null and b/Resources/Textures/Structures/Shuttles/thruster_large.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Shuttles/thruster_large.rsi/meta.json b/Resources/Textures/Structures/Shuttles/thruster_large.rsi/meta.json
new file mode 100644
index 0000000000..963696abf1
--- /dev/null
+++ b/Resources/Textures/Structures/Shuttles/thruster_large.rsi/meta.json
@@ -0,0 +1,75 @@
+{
+  "version": 1,
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "copyright": "Base taken from https://github.com/tgstation/tgstation/blob/c0f54449f9cbe4ca84355e0251dc90d7c806fffb/icons/obj/fluff/2x2.dmi, thrust and thrust_burn_unshaded were made by AsnDen (github)",
+  "license": "CC-BY-SA-3.0",
+  "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "thrust",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "thrust_burn_unshaded",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Shuttles/thruster_large.rsi/thrust.png b/Resources/Textures/Structures/Shuttles/thruster_large.rsi/thrust.png
new file mode 100644
index 0000000000..a69a611fc5
Binary files /dev/null and b/Resources/Textures/Structures/Shuttles/thruster_large.rsi/thrust.png differ
diff --git a/Resources/Textures/Structures/Shuttles/thruster_large.rsi/thrust_burn_unshaded.png b/Resources/Textures/Structures/Shuttles/thruster_large.rsi/thrust_burn_unshaded.png
new file mode 100644
index 0000000000..b4f689c011
Binary files /dev/null and b/Resources/Textures/Structures/Shuttles/thruster_large.rsi/thrust_burn_unshaded.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png
new file mode 100644
index 0000000000..c1ea06389c
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png
new file mode 100644
index 0000000000..08cabeb4c6
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_MOTH.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png
new file mode 100644
index 0000000000..c8ed6a3daf
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png
new file mode 100644
index 0000000000..ae0c2e7beb
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_MOTH.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png
new file mode 100644
index 0000000000..5549b1481d
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png
new file mode 100644
index 0000000000..a912a16712
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_MOTH.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png
new file mode 100644
index 0000000000..36a9a8520e
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png
new file mode 100644
index 0000000000..d6e96dc028
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_MOTH.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png
new file mode 100644
index 0000000000..a12a57e578
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png
new file mode 100644
index 0000000000..9f20329d78
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_MOTH.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png
new file mode 100644
index 0000000000..057fce5807
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png
new file mode 100644
index 0000000000..01dc58d192
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_MOTH.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
index 4aa15c86cd..e1e3a0f546 100644
--- a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
+++ b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json
@@ -1,656 +1,1288 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by TheShuEd (github) for Space Station 14",
-  "states": [
-    {
-      "name": "bluespace",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "bluespace_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "fire",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "fire_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "flesh",
-      "directions": 4,
-      "delays": [
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "flesh_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ],
-        [
-          0.8,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "flora",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "flora_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "frost",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "frost_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "grav",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "grav_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ],
-        [
-          0.3,
-          0.3,
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "rock",
-      "directions": 4,
-      "delays": [
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "rock_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.9,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "santa",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "shadow",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "shadow_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "shock",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "shock_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "tech",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ]
-      ]
-    },
-    {
-      "name": "tech_VOX",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ],
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ]
-      ]
-    }
-  ]
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by TheShuEd (github) for Space Station 14, originals modified by HTMLSystem to fit arachnids and moths",
+    "states": [
+        {
+            "name": "bluespace",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "bluespace_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "bluespace_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "bluespace_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "fire",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "fire_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "fire_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "fire_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flesh",
+            "directions": 4,
+            "delays": [
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flesh_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flesh_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flesh_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.8,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "flora",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "flora_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "flora_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "flora_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "frost",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "frost_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "frost_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "frost_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "grav",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "grav_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "grav_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "grav_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "rock",
+            "directions": 4,
+            "delays": [
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "rock_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "rock_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "rock_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.9,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "santa",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shadow",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shadow_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shadow_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shadow_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shock",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shock_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shock_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "shock_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "tech",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "tech_VOX",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "tech_ARACHNID",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "tech_MOTH",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ],
+                [
+                    0.2,
+                    0.4,
+                    0.2,
+                    0.4
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png
new file mode 100644
index 0000000000..c01cb92e34
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png
new file mode 100644
index 0000000000..ac492e7626
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_MOTH.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png
new file mode 100644
index 0000000000..8fb0836e52
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png
new file mode 100644
index 0000000000..e9a592a85f
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_MOTH.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png
new file mode 100644
index 0000000000..cfead742e3
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png
new file mode 100644
index 0000000000..459709829d
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_MOTH.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png
new file mode 100644
index 0000000000..b8e251e02e
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_ARACHNID.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png
new file mode 100644
index 0000000000..a3ea54713a
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_MOTH.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
index 313e1e3c04..6134a63a98 100644
--- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
@@ -1,8 +1,8 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b.     poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi.     originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460,     poster63_contraband by discord foboscheshir_,     poster4_contraband edited, poster36_contraband and poster52_legit made by SlamBamActionman,     poster53_legit and the original version by @RCOI on discord, modified by Spessmann,     poster54_legit by hex_reject on Discord,     poster64_contraband, poster65_contraband, poster66_contraband by JuneSzalkowska (Discord), poster55_legit by FairlySadPanda (Github), based on art and a character owned by Vytian (Discord), poster56_legit by aksosotl (Discord).",
   "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b.     poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi.     originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460,     poster63_contraband by discord foboscheshir_,     poster52_legit by SlamBamActionman. poster1_legit, poster3_contraband, poster3_legit, poster4_legit, poster5_contraband, poster5_legit, poster6_contraband, poster6_legit, poster7_contraband, poster7_legit, poster8_contraband, poster8_legit, poster9_contraband, poster9_legit, poster10_legit, poster11_legit, poster12_legit, poster13_legit, poster14_contraband, poster15_legit, poster16_contraband, poster16_legit, poster17_legit, poster19_legit, poster20_contraband, poster20_legit, poster21_contraband, poster21_legit, poster22_contraband, poster22_legit, poster23_contraband, poster23_legit, poster24_legit, poster25_contraband, poster26_legit, poster28_legit, poster29_contraband, poster29_legit, poster30_contraband, poster31_contraband, poster31_legit, poster32_contraband, poster32_legit, poster33_contraband, poster33_legit, poster34_legit, poster35_contraband, poster36_legit, poster37_legit, poster39_legit, poster43_contraband, poster44_contraband, poster46_contraband, poster48_contraband, poster50_legit, poster51_legit, poster53_contraband, poster55_contraband, poster56_contraband, poster59_contraband, poster60_contraband, poster63_contraband edited and localised by github:lapatison. vox, genpop, direction_pods, poster4_contraband and detective edited by lzk228. poster53_legit and the original version by @RCOI on discord, modified by Spessmann. poster54_legit by hex_reject on Discord.",
-  "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b.     poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi.     originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460,     poster63_contraband by discord foboscheshir_,     poster4_contraband edited, poster36_contraband and poster52_legit made by SlamBamActionman,     poster53_legit and the original version by @RCOI on discord, modified by Spessmann,     poster54_legit by hex_reject on Discord,     poster64_contraband, poster65_contraband, poster66_contraband by JuneSzalkowska (Discord).",
   "size": {
     "x": 32,
     "y": 32
@@ -403,6 +403,9 @@
     {
       "name": "poster55_legit"
     },
+    {
+      "name": "poster56_legit"
+    },
     {
       "name": "random_legit"
     },
diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster56_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster56_legit.png
new file mode 100644
index 0000000000..7ec9838041
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster56_legit.png differ
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 6cbf3206ed..a88e498413 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -754,5 +754,12 @@ PrefilledSyringe: Syringe
 BibleTanakh: null
 BibleSatanic: null
 
-# 2025-10-8
+
+# 2025-10-08
 ClothingBeltAssault: ClothingBeltMilitaryWebbing
+WarpPointBombing: null
+
+# 2025-10-13
+ToyGriffin: ToyFigurineGriffin
+ToyOwlman: ToyFigurineOwlman
+ToySkeleton: ToyFigurineSkeleton
diff --git a/RobustToolbox b/RobustToolbox
index 9e8f7092ea..feb9e1db69 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 9e8f7092ea32a2653776292703d20320f3f34cf5
+Subproject commit feb9e1db69ab97acfd07580918f5d20ffaa6b770
diff --git a/Tools/dump_patrons.ps1 b/Tools/dump_patrons.ps1
index d08e095421..21b8b7b1cb 100755
--- a/Tools/dump_patrons.ps1
+++ b/Tools/dump_patrons.ps1
@@ -5,4 +5,4 @@ param([string]$csvPath)
 # Dumps Patreon's CSV download into a YAML file the game reads.
 
 # Have to trim patron names because apparently Patreon doesn't which is quite ridiculous.
-Get-content $csvPath | ConvertFrom-Csv -Delimiter "," | select @{l="Name";e={$_.Name.Trim()}},Tier | where-object Tier -ne "" | ConvertTo-Yaml
+Get-content $csvPath | ConvertFrom-Csv -Delimiter "," | select @{l="Name";e={$_.Name.Trim()}},Tier | where-object Tier -ne "" | where-object Tier -ne "Free" | ConvertTo-Yaml
diff --git a/Tools/github_repo_stats.py b/Tools/github_repo_stats.py
new file mode 100644
index 0000000000..75bc0a1df8
--- /dev/null
+++ b/Tools/github_repo_stats.py
@@ -0,0 +1,241 @@
+#!/usr/bin/env python3
+
+import argparse
+import requests
+import itertools
+import signal
+import sdnotify
+import os
+from io import StringIO
+from abc import ABC, abstractmethod
+from enum import Enum
+from dataclasses import dataclass
+from typing import Iterable, TypeVar, Callable, Any, Optional
+from prometheus_client import start_http_server, CollectorRegistry
+from prometheus_client.core import Metric, GaugeMetricFamily
+import time
+# from prometheus_client.registry import Collector
+
+GITHUB_API_URL = "https://api.github.com/graphql"
+GITHUB_TOKEN = os.environ["SS14_REPO_STATS_GITHUB_TOKEN"]
+USER_AGENT = "github_repo_stats.py/1.0.0"
+
+# We have a GraphQL client at home
+
+class AbstractQuery(ABC):
+    @abstractmethod
+    def get_selector(self, alias: str):
+        pass
+
+class IssueState(Enum):
+    CLOSED = 1,
+    OPEN = 2,
+
+class IssueQuery(AbstractQuery):
+    def __init__(self, states: Optional[list[IssueState]] = None, labels: Optional[list[str]] = None) -> None:
+        super().__init__()
+
+        self.states = states
+        self.labels = labels
+
+    def get_selector(self, alias: str):
+        query_args = []
+        if self.states and len(self.states):
+            query_args.append(f"states:{enum_join(self.states)}")
+        if self.labels and len(self.labels):
+            query_args.append(f"labels:{labels_join(self.labels)}")
+
+        args = f"({','.join(query_args)})" if len(query_args) else ""
+
+        return f"{alias}: issues{args}"
+
+class PullRequestState(Enum):
+    CLOSED = 1,
+    MERGED = 2
+    OPEN = 3,
+
+class PullRequestQuery(AbstractQuery):
+    def __init__(self, states: Optional[list[PullRequestState]] = None, labels: Optional[list[str]] = None) -> None:
+        super().__init__()
+
+        self.states = states
+        self.labels = labels
+
+    def get_selector(self, alias: str):
+        query_args = []
+        if self.states and len(self.states):
+            query_args.append(f"states:{enum_join(self.states)}")
+
+        if self.labels and len(self.labels):
+            query_args.append(f"labels:{labels_join(self.labels)}")
+
+        args = f"({','.join(query_args)})" if len(query_args) else ""
+
+        return f"{alias}: pullRequests{args}"
+
+@dataclass
+class Repo:
+    owner: str
+    name: str
+
+    queries: dict[str, AbstractQuery]
+
+LABEL_UNTRIAGED = "S: Untriaged"
+LABEL_NEEDS_REVIEW = "S: Needs Review"
+LABEL_AWAITING_CHANGES = "S: Awaiting Changes"
+LABEL_APPROVED = "S: Approved"
+LABEL_P0 = "P0: Critical"
+LABEL_P1 = "P1: High"
+LABEL_CONFLICT = "S: Merge Conflict"
+
+REPO_CONFIG = [
+    Repo("space-wizards", "space-station-14", queries={
+        # Issue queries
+        "issue_total_count": IssueQuery(),
+        "issue_open_count": IssueQuery(states=[IssueState.OPEN]),
+        "issue_closed_count": IssueQuery(states=[IssueState.CLOSED]),
+        "issue_untriaged_count": IssueQuery(states=[IssueState.OPEN], labels=[LABEL_UNTRIAGED]),
+
+        # PR queries
+        "pr_total_count": PullRequestQuery(),
+        "pr_open_count": PullRequestQuery(states=[PullRequestState.OPEN]),
+        "pr_closed_count": PullRequestQuery(states=[PullRequestState.CLOSED]),
+        "pr_merged_count": PullRequestQuery(states=[PullRequestState.MERGED]),
+        "pr_untriaged_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_UNTRIAGED]),
+        "pr_needs_review_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_NEEDS_REVIEW]),
+        "pr_awaiting_changes_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_AWAITING_CHANGES]),
+        "pr_approved_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_APPROVED]),
+        "pr_p0_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_P0]),
+        "pr_p1_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_P1]),
+        "pr_conflict_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_CONFLICT]),
+    }),
+    Repo("space-wizards", "RobustToolbox", queries={
+        # Issue queries
+        "issue_total_count": IssueQuery(),
+        "issue_open_count": IssueQuery(states=[IssueState.OPEN]),
+        "issue_closed_count": IssueQuery(states=[IssueState.CLOSED]),
+        "issue_untriaged_count": IssueQuery(states=[IssueState.OPEN], labels=[LABEL_UNTRIAGED]),
+
+        # PR queries
+        "pr_total_count": PullRequestQuery(),
+        "pr_open_count": PullRequestQuery(states=[PullRequestState.OPEN]),
+        "pr_closed_count": PullRequestQuery(states=[PullRequestState.CLOSED]),
+        "pr_merged_count": PullRequestQuery(states=[PullRequestState.MERGED]),
+        "pr_untriaged_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_UNTRIAGED]),
+        "pr_needs_review_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_NEEDS_REVIEW]),
+        "pr_awaiting_changes_count": PullRequestQuery(states=[PullRequestState.OPEN], labels=[LABEL_AWAITING_CHANGES]),
+    }),
+    Repo("space-wizards", "docs", queries={
+        # Issue queries
+        "issue_total_count": IssueQuery(),
+        "issue_open_count": IssueQuery(states=[IssueState.OPEN]),
+        "issue_closed_count": IssueQuery(states=[IssueState.CLOSED]),
+
+        # PR queries
+        "pr_total_count": PullRequestQuery(),
+        "pr_open_count": PullRequestQuery(states=[PullRequestState.OPEN]),
+        "pr_closed_count": PullRequestQuery(states=[PullRequestState.CLOSED]),
+        "pr_merged_count": PullRequestQuery(states=[PullRequestState.MERGED]),
+    }),
+]
+
+E = TypeVar("E", bound=Enum)
+def enum_join(iterable: Iterable[E]) -> str:
+    return f"[{','.join((e.name for e in iterable))}]"
+
+def labels_join(iterable: Iterable[str]) -> str:
+    contents = ','.join(map(graphql_string, iterable))
+    return f"[{contents}]"
+
+T = TypeVar("T")
+def first_or_default(iterable: Iterable[T], func: Callable[[T], bool]) -> Optional[T]:
+    for val in iterable:
+        if func(val):
+            return val
+
+    return None
+
+REQUESTS_SESSION = requests.Session()
+REQUESTS_SESSION.headers["User-Agent"] = USER_AGENT
+
+def graphql_string(val: str) -> str:
+    # This is probably good enough.
+    # Note that this script doesn't accept (potentially malicious) user input.
+    # If it did, I wouldn't be doing it like this.
+    val_replaced = val.replace('"', '\\"')
+    return f"\"{val_replaced}\""
+
+def generate_graphql_query_for_repo(repo: Repo) -> str:
+    strio = StringIO()
+
+    strio.write("query {\n")
+    strio.write(f"\trepository(owner: {graphql_string(repo.owner)}, name: {graphql_string(repo.name)})" + " {\n")
+
+    for key, query in repo.queries.items():
+        strio.write(f"\t\t{query.get_selector(key)}" + " {\n")
+        strio.write("\t\t\ttotalCount\n")
+        strio.write("\t\t}\n")
+
+    strio.write("\t}\n")
+    strio.write("}\n")
+
+    return strio.getvalue()
+
+def repo_key(repo: Repo) -> str:
+    return f"{repo.owner}/{repo.name}"
+
+def do_graphql_query(query: str) -> Any:
+    with REQUESTS_SESSION.post(GITHUB_API_URL, headers={"Authorization": f"Bearer {GITHUB_TOKEN}"}, json={"query": query}) as resp:
+        resp.raise_for_status()
+        return resp.json()
+
+CACHED_QUERIES = {repo_key(repo): generate_graphql_query_for_repo(repo) for repo in REPO_CONFIG}
+
+# RHEL 9 ships with an old version of prometheus_client that doesn't have the "Collector" type...
+class StatsCollector: #(Collector):
+    def collect(self) -> Iterable[Metric]:
+        query_time_metric = GaugeMetricFamily("repo_stats_query_time", "Time the GitHub query API call took", labels=["repo"])
+        metrics: dict[str, GaugeMetricFamily] = {}
+        # Make all the metric families.
+        for repo in REPO_CONFIG:
+            r_key = repo_key(repo)
+            for key in repo.queries.keys():
+                if key not in metrics:
+                    metrics[key] = GaugeMetricFamily(f"repo_stats_{key}", key, labels=["repo"])
+
+            # Do the requests and fill out the stats.
+            query = CACHED_QUERIES[r_key]
+            start_time = time.monotonic_ns()
+            query_data = do_graphql_query(query)
+            end_time = time.monotonic_ns()
+            repo_data = query_data["data"]["repository"]
+
+            for key in repo.queries.keys():
+                value = repo_data[key]["totalCount"]
+                metrics[key].add_metric([r_key], float(value))
+
+            query_time_metric.add_metric([r_key], (end_time - start_time) / 1_000_000_000)
+
+        yield from metrics.values()
+        yield query_time_metric
+
+def main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("port", type=int)
+    parser.add_argument("--host", default="0.0.0.0")
+
+    args = parser.parse_args()
+
+    port = args.port
+    host = args.host
+
+    registry = CollectorRegistry(auto_describe=True)
+    registry.register(StatsCollector())
+
+    start_http_server(port, host, registry)
+
+    sdnotify.SystemdNotifier().notify("READY=1")
+
+    signal.pause()
+
+main()
diff --git a/Tools/mapping-merge-driver.sh b/Tools/mapping-merge-driver.sh
index 0421278f31..fe114ac9cd 100755
--- a/Tools/mapping-merge-driver.sh
+++ b/Tools/mapping-merge-driver.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Add this to .git/config:
 # [merge "mapping-merge-driver"]
diff --git a/runclient-Tools.sh b/runclient-Tools.sh
index cc0c958b86..b564c35438 100755
--- a/runclient-Tools.sh
+++ b/runclient-Tools.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 dotnet run --project Content.Client --configuration Tools
 read -p "Press enter to continue"
diff --git a/runclient.sh b/runclient.sh
index 9417cc9218..5df80bb08e 100755
--- a/runclient.sh
+++ b/runclient.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 dotnet run --project Content.Client
 read -p "Press enter to continue"
diff --git a/runserver-Tools.sh b/runserver-Tools.sh
index 6280dc4279..3a786920a7 100755
--- a/runserver-Tools.sh
+++ b/runserver-Tools.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 dotnet run --project Content.Server --configuration Tools
 read -p "Press enter to continue"
diff --git a/runserver.sh b/runserver.sh
index 33258e3190..33638d6bb5 100755
--- a/runserver.sh
+++ b/runserver.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 dotnet run --project Content.Server
 read -p "Press enter to continue"