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/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/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/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..e990263bf3 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;
+            _crayon = crayon;
+            _charges = charges;
+            _capacity = entityManage.GetComponent<LimitedChargesComponent>(_crayon.Owner).MaxCharges;
             _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
             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/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs
index 050d801170..6035bcc2bd 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);
 
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/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/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/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 821722ec35..b568491b67 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -607,6 +607,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++)
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..7b69d08267 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -155,7 +155,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
                 HorizontalExpand = true,
             };
 
-            deparmentLabel.SetMessage(Loc.GetString("crew-monitoring-user-interface-no-department"));
+            deparmentLabel.SetMessage(Loc.GetString("crew-monitoring-ui-no-department-label"));
             deparmentLabel.StyleClasses.Add(StyleNano.StyleClassTooltipActionDescription);
 
             SensorsTable.AddChild(deparmentLabel);
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/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/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/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/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/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/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
index 17cbcc38ac..3f0afc2fab 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
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/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.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index 082baf7e64..5cf9831077 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 =
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 176d4fd04c..6563d7b452 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,13 +405,13 @@ 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);
                     });
@@ -424,7 +424,7 @@ 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 = () =>
@@ -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/Chat/Systems/AutoEmoteSystem.cs b/Content.Server/Chat/Systems/AutoEmoteSystem.cs
index 3d6bd53540..1e1b7b9034 100644
--- a/Content.Server/Chat/Systems/AutoEmoteSystem.cs
+++ b/Content.Server/Chat/Systems/AutoEmoteSystem.cs
@@ -46,7 +46,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/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..e51a01a1d4 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -7,7 +7,6 @@ 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;
@@ -21,7 +20,6 @@ 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 +46,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 +62,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);
+        }
+        
+        EnsureComp<ClumsyComponent>(ent.Owner);
 
-        _outfitSystem.SetOutfit(uid, "CluwneGear");
+        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/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..07b580fba5 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,23 +24,27 @@ 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, 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);
     }
 
     private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, AfterInteractEvent args)
@@ -48,7 +52,7 @@ public sealed class CrayonSystem : SharedCrayonSystem
         if (args.Handled || !args.CanReach)
             return;
 
-        if (component.Charges <= 0)
+        if (_charges.IsEmpty(uid))
         {
             if (component.DeleteEmpty)
                 UseUpCrayon(uid, args.User);
@@ -72,17 +76,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 +93,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 +109,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/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/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index 5a4f4d93ce..630141d003 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -404,6 +404,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/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/SpeakOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
index 8a4c655a39..f69a0771f9 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
@@ -1,13 +1,21 @@
 using Content.Server.Chat.Systems;
+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 +26,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/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..81f9415121 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -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/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/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index 2bf9046cc3..df0980883d 100644
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -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/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/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/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/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 0625ced087..10060dc7d3 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();
@@ -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/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 1e8f3334ac..31d289217c 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -1,7 +1,5 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Movement.Systems;
-using Content.Shared.Damage.Events;
-using Content.Shared.Damage.Systems;
 using Content.Shared.Effects;
 using Content.Shared.Speech.Components;
 using Content.Shared.Weapons.Melee;
@@ -16,28 +14,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/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 885186f79c..05bb2327e6 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);
@@ -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.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/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/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/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/Destructible/SharedDestructibleSystem.cs b/Content.Shared/Destructible/SharedDestructibleSystem.cs
index 572ed9d560..f37561e0d8 100644
--- a/Content.Shared/Destructible/SharedDestructibleSystem.cs
+++ b/Content.Shared/Destructible/SharedDestructibleSystem.cs
@@ -1,9 +1,9 @@
-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)
     {
@@ -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/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/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..a762a94e58 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -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/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/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/Systems/ParcelWrappingSystem.WrappedParcel.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs
index bb0c9437ff..3f1aa2fa80 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.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/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/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
index 12a7928c0b..fa6b809016 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs
@@ -120,5 +120,24 @@ public abstract class SharedBorgSwitchableTypeSystem : EntitySystem
         {
             footstepModifier.FootstepSoundCollection = prototype.FootstepCollection;
         }
+
+        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/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index d72380da62..5b95935ec4 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -1,15 +1,25 @@
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Stacks;
 
 [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"
     /// </summary>
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index e4f0aa8b23..fcda7eb0ac 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,
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/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/Systems/DnaScrambleOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
index db27bd7f74..af5a73ffb6 100644
--- a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
+++ b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
@@ -58,5 +58,17 @@ public sealed class DnaScrambleOnTriggerSystem : EntitySystem
 
         // Can't use PopupClient or PopupPredicted because the trigger might be unpredicted.
         _popup.PopupEntity(Loc.GetString("scramble-on-trigger-popup"), target.Value, target.Value);
+
+        var ev = new DnaScrambledEvent(target.Value);
+        RaiseLocalEvent(target.Value, 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/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.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/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/Systems/SharedGunSystem.Battery.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
index ea865fced6..cb4e42f3cf 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
@@ -1,8 +1,12 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
 using Content.Shared.Examine;
+using Content.Shared.Projectiles;
 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 +22,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 +30,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 +59,51 @@ 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<HitscanPrototype>(hitscan.Prototype).Damage;
+            return dmg == null ? dmg : dmg * Damageable.UniversalHitscanDamageModifier;
+        }
+
+        return null;
+    }
+
     private void OnBatteryTakeAmmo(EntityUid uid, BatteryAmmoProviderComponent component, TakeAmmoEvent args)
     {
         var shots = Math.Min(args.Shots, component.Shots);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index e3fbec0d5d..952b53acf2 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -65,6 +65,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 +454,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>
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/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b60c29e299..d4e49c44b1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,15 +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
@@ -3960,3 +3949,183 @@
   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
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 6d59319598..d7a91135e1 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -764,4 +764,25 @@
   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
 Order: 1
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index ca08fb2939..f97c69933d 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, 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, 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, mqole, 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, 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, thanosdegraf, 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
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/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/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/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/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/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index a148c3aba8..d5addd38bf 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -79,6 +79,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
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/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/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/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
index 1200d25dee..ea4e94e224 100644
--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -36,11 +36,10 @@ 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-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-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.
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 65104c7918..c7a697fa6f 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -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/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/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/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/packed.yml b/Resources/Maps/packed.yml
index c371d2f04c..d15f3f7aab 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
@@ -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..d8873dee61 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/09/2025 01:25:34
+  entityCount: 26492
 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: -61511.09
       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
@@ -122715,11 +122502,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 +125836,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 +125881,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 +125918,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 +125952,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 +128159,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 +128403,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 +128479,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 +128517,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 +129920,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 +129945,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 +130245,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 +131133,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 +131336,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 +131392,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 +131573,7 @@ entities:
       pos: -14.584713,16.470493
       parent: 2
     - type: MeleeWeapon
-      attackRate: 10
+      attackRate: 2
       autoAttack: True
     - type: Item
       size: Huge
@@ -135510,18 +135306,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 +136764,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 +137592,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 +137640,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 +140914,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 +141081,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 +141119,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 +141157,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 +141167,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 +141177,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 +141187,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 +141197,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 +141207,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 +141217,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 +141227,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 +141237,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 +141247,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 +141256,8 @@ entities:
     - type: Transform
       pos: -120.5,-81.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 4459
@@ -140396,6 +141266,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 +141276,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 +141286,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 +141296,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 +141306,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 +141315,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 +141381,8 @@ entities:
     - type: Transform
       pos: -28.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11620
@@ -140490,6 +141390,8 @@ entities:
     - type: Transform
       pos: -28.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11621
@@ -140497,6 +141399,8 @@ entities:
     - type: Transform
       pos: -30.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11622
@@ -140505,6 +141409,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 +141419,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 +141429,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 +141439,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 +141465,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 +141475,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 +141485,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 +141495,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 +141505,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 +141515,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 +141525,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 +141621,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 +141631,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 +141641,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 +141651,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 +141661,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 +141671,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 +141681,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 +141691,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 +141724,8 @@ entities:
     - type: Transform
       pos: -25.5,-22.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: ShuttersWindowOpen
   entities:
   - uid: 11617
@@ -140757,6 +141733,8 @@ entities:
     - type: Transform
       pos: -29.5,4.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
   - uid: 11618
@@ -140764,6 +141742,8 @@ entities:
     - type: Transform
       pos: -29.5,8.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSink
       invokeCounter: 1
 - proto: ShuttleConsoleCircuitboard
@@ -140780,6 +141760,8 @@ entities:
     - type: Transform
       pos: -42.5,-73.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: SignAi
   entities:
   - uid: 21670
@@ -147823,18 +148805,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 +148858,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 +148886,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 +148914,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 +148942,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 +150903,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 +150918,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 +153551,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 +171300,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 +171991,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 +172021,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 +172036,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -50.5,-60.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorHydroponicsLocked
   entities:
   - uid: 6138
@@ -171052,11 +172046,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: -261617.84
       state: Opening
     - type: Airlock
       autoClose: False
@@ -171066,18 +172062,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 +172087,8 @@ entities:
     - type: Transform
       pos: -54.5,-25.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecure
   entities:
   - uid: 1715
@@ -171093,6 +172097,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 +172114,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 +172129,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 +172155,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 +172173,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 +172198,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 +172230,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 +172255,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 +172272,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 +172290,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 +172307,8 @@ entities:
     - type: Transform
       pos: -38.5,-72.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
     - type: DeviceLinkSource
       linkedPorts:
         21056:
@@ -171272,6 +172322,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -95.5,26.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: WindoorSecureScienceLocked
   entities:
   - uid: 7302
@@ -171279,12 +172331,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 +172349,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 +172366,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 +172400,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 +172418,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -62.5,-35.5
       parent: 2
+    - type: DeltaPressure
+      gridUid: 2
 - proto: Window
   entities:
   - uid: 162
@@ -171355,226 +172427,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 +172745,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 +172925,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 +172989,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/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/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/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 c499f54db6..f245b1082c 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/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/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index bb3829a2dd..e6e3ec8c6f 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -329,6 +329,7 @@
       weight: 95
       children:
       - id: Machete
+      - id: Claymore
       - id: BaseBallBat
       - id: CombatKnife
       - id: Spear
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/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/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 9b0bfb05ca..04b1554cef 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -66,6 +66,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/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/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index 5dc127878f..d223293862 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -102,6 +102,7 @@
   - type: FireVisuals
     alternateState: Standing
   - type: FlashImmunity
+    showInExamine: false
   - type: Inventory
     femaleDisplacements:
       jumpsuit:
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/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 870e66654f..ff6d5a6a4a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -455,6 +455,9 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-solars
+  - type: Tag
+    tags:
+    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeaconEngineering
@@ -673,6 +676,9 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-arrivals
+  - type: Tag
+    tags:
+    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeacon
@@ -761,6 +767,9 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-cryosleep
+  - type: Tag
+    tags:
+    - NinjaBombingTargetBlocker
 
 - type: entity
   parent: DefaultStationBeacon
diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index a32e3ba89c..85be8ece45 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -21,7 +21,9 @@
       enum.CrayonUiKey.Key:
         type: CrayonBoundUserInterface
   - type: Crayon
-    capacity: 25
+    selectedState: like
+  - type: LimitedCharges
+    maxCharges: 25
   - type: Food
   - type: FlavorProfile
     flavors:
@@ -88,7 +90,8 @@
   - type: Crayon
     color: Red
     selectableColor: true
-    capacity: 30
+  - type: LimitedCharges
+    maxCharges: 30
   - type: Tag
     tags:
     - Write
@@ -96,6 +99,16 @@
     - 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: Crayon
   id: CrayonBlack
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 6aec812b77..2ba5acfbf1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -58,6 +58,9 @@
     - Common
   - type: DoAfter
   - type: Actions
+  - type: ActionGrant
+    actions:
+    - ActionPAIOpenShop
   - type: Store
     categories:
     - PAIAbilities
@@ -188,15 +191,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/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 6c01a2a8dd..1afe45e5ef 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -256,13 +256,9 @@
             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
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index cd7dc74a75..9cbb4a83d1 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -128,9 +128,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/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/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/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/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index e275bef0e9..4e50a7e60b 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
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d7fec6aa8c..60e52c772d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -586,6 +586,10 @@
     staticPacks:
     - BioGenIngredientsStatic
     - BioGenMaterialsStatic
+  - type: EmagLatheRecipes
+    emagStaticPacks:
+    - BioGenEmagStatic
+    - HostileCubesStatic
 
 - type: entity
   parent: BaseLathe
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/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/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/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/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/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index 76d74876b0..f015dd8f72 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/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 80879aae99..fde0779151 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/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index f49e9f9671..464aa93dbb 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -469,16 +469,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/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/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/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/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/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/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/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/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/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml
index 08f4a51c99..094d096b28 100644
--- a/Resources/Prototypes/silicon-laws.yml
+++ b/Resources/Prototypes/silicon-laws.yml
@@ -250,11 +250,6 @@
   order: 4
   lawString: law-paladin-4
 
-- type: siliconLaw
-  id: Paladin5
-  order: 5
-  lawString: law-paladin-5
-
 
 - type: siliconLawset
   id: PaladinLawset
@@ -263,7 +258,6 @@
   - Paladin2
   - Paladin3
   - Paladin4
-  - Paladin5
   obeysTo: laws-owner-crew
 
  # Live and Let Live laws
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 4f6c018f23..08539f50cf 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1024,6 +1024,8 @@
   id: Mushroom
 
 ## N ##
+- type: Tag
+  id: NinjaBombingTargetBlocker # Ninjas will not target this warp point
 
 - type: Tag
   id: NoBlockAnchoring
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 b010e20abc..0000000000
--- a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Document>
-  # Artifact Reports
-  A large portion of Xenoarchaeology gameplay revolves around the interpretation of artifact reports, which are created at the [color=#a4885c]analysis console[/color] after an artifact is scanned. Reports contain the following information:
-
-  - [color=#a4885c]Node ID:[/color] a unique numeric ID corresponding to this artifact's node. Useful in conjunction with a [color=#a4885c]node scanner[/color] for quickly identifying recurring nodes.
-
-  - [color=#a4885c]Depth:[/color] a distance from the starting node (depth 0). This is a good shorthand for the value and danger of a node.
-
-  - [color=#a4885c]Activation status:[/color] whether or not a node has been activated in the past.
-
-  - [color=#a4885c]Stimulus:[/color] the stimulus for that particular node.
-
-  - [color=#a4885c]Reaction:[/color] the reaction the stimulus induces. This is often vague, so caution is advised.
-
-  - [color=#a4885c]Edges:[/color] the amount of nodes that are connected to the current node. Using this, you can calculate the total number of nodes as well as organize a map of their connections.
-
-  - [color=#a4885c]Unextracted value:[/color] the amount of research points an artifact will give when extracted. Extracting sets this to zero and traversing new nodes increases it.
-
-  Reports are a helpful tool in manipulating an artifact, especially in the later stages where you are traversing nodes that have already been activated.
-  <Box>
-  <GuideEntityEmbed Entity="PaperArtifactAnalyzer"/>
-  </Box>
-  To help with this process, consider printing out reports, writing down details uncovered during activation, or storing them in a folder nearby.
-</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/ServerInfo/Guidebook/Science/Xenoarchaeology.xml b/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
index cd717511c3..19c04cfdc7 100644
--- a/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
@@ -1,57 +1,51 @@
 <Document>
-# Xenoarchaeology
-Xenoarchaeology is a science subdepartment focused on researching and experimenting on alien artifacts.
+  # Xenoarchaeology
 
-At the start of each shift, the Science department will usually have access to at least two artifacts to experiment on. You can buy more by talking to the Cargo department.
+  Xenoarchaeology is a branch of Science focused on researching alien [bold]artifacts[/bold].
 
-By researching the unique things each artifact can do, you gain Research Points, increase the artifact's sale value, and potentially discover a useful ability or two that can help your department or the whole station!
+  Unlocking their secrets grants research points and reveals strange, potentially useful, or dangerous effects.
 
-## Artifact Nodes
-<Box>
-<GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
-<GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
-</Box>
-Artifacts consist of a randomly-generated tree of nodes. These nodes have a "[color=#a4885c]depth[/color]", representing how dangerous the node is, and the number of other nodes connected to it, called "[color=#a4885c]edges[/color]",
+  At round start, Science usually has one or two artifacts in the lab. More can be:
+  - Ordered from [color=orange]Cargo[/color]
+  - Found by [color=orange]Salvage[/color]
+  - Assembled from [bold]fragments[/bold]
+  - Appear during certain station events
 
-Artifacts always start at depth zero, the root of the tree. Travelling the tree to find as many nodes as possible is the main goal of the scientists working on them. Knowledge is extracted from nodes to gain Research Points and increase the artifact's sale value.
+  ## Artifacts
+  <Box>
+    <GuideEntityEmbed Entity="ComplexXenoArtifact" Caption=""/>
+    <GuideEntityEmbed Entity="ComplexXenoArtifactItem" Caption=""/>
+  </Box>
 
-Each node has two components: its [color=#a4885c]stimulus[/color] and a [color=#a4885c]reaction[/color].
+  Artifacts contain [bold]nodes[/bold] arranged in [bold]layers[/bold].
+  - Unlocking a node unlocks connected nodes on upper layers.
+  - Each node has [bold]triggers[/bold], actions that must be performed near the artifact to unlock a node.
+  - When a node is unlocked, its [bold]effect[/bold] will trigger, and the node becomes [bold][color=plum]Active[/color][/bold].
+  - Each node has [bold]durability[/bold]: the number of times it can be manually activated after being unlocked.
+  - Higher nodes are harder to reach but give more [bold]research points[/bold].
+  - Unlocking all nodes provides no special bonus, but every node yields research points.
 
-A stimulus is the external behavior that triggers the reaction. There's a variety of these, and higher depth nodes have more difficult to accomplish stimuli. Some stimuli will need improvisation to trigger, and you may need to talk to other departments to get everything you need.
+  ## Equipment
+  <Box>
+    <GuideEntityEmbed Entity="MachineArtifactAnalyzer" Caption="Analyzer"/>
+    <GuideEntityEmbed Entity="ComputerAnalysisConsole" Caption="Analysis Console"/>
+    <GuideEntityEmbed Entity="NodeScanner" Caption="Node Scanner"/>
+  </Box>
+  - [bold]Artifact Analyzer:[/bold] Stationary device that scans artifacts, sending data to the Console.
+  - [bold][textlink="Analysis Console:" link="AnalysisConsole"][/bold] Stationary device that is used to display the node tree. Must be linked to an Analyzer with a multitool.
+  - [bold]Node Scanner:[/bold] Small hand-held device that can show the ID of the node currently being activated and whether the artifact is ready to trigger, letting scientist have minimal required knowledge for operating inside chamber near artifact and far without direct access to console.
 
-Some reactions are instantaneous effects while others are permanent changes. Once an artifact is triggered, the reaction causes the artifact to randomly move to another node it is linked to.
-
-With some experimental science, you can begin to grasp how the different nodes of an artifact are connected, and how to move between them by repeatedly activating nodes.
-
-All non-zero-depth nodes will have exactly one edge that leads up to its parent node. All other edges a node has lead down to the next depth.
-
-## Artifact Analyzer and Analysis Console
-<Box>
-<GuideEntityEmbed Entity="MachineArtifactAnalyzer"/>
-<GuideEntityEmbed Entity="ComputerAnalysisConsole"/>
-</Box>
-The main equipment that you'll be using for Xenoarchaeology is the [color=#a4885c]artifact analyzer[/color] and the [color=#a4885c]analysis console[/color]. You can use these to create reports that contain valuable information about an artifact.
-
-To set them up, simply link them with a network configurator and set an artifact on top of the analyzer. Every station has at least one of these machines already set up.
-
-Use the console's [color=#a4885c]scan[/color] button to discover what stimulus the artifact needs and what its reaction will do. Scanning takes thirty seconds.
-
-Use the [color=#a4885c]print[/color] button to save the scan result, so you can refer to it later.
-
-Once you've discovered a new node, you can extract points from the artifact using the [color=#a4885c]Extract[/color] button.
-
-## Assembling Artifacts
-<GuideEntityEmbed Entity="ArtifactFragment" Caption="Artifact Fragment"/>
-
-It is possible to gather multiple artifact fragments and assemble them into a working artifact. You can ask for these from Salvage, who usually find these while mining asteroids or on Expeditions.
-
-## Traversal Bias
-<Box>
-  <GuideEntityEmbed Entity="MachineArtifactAnalyzer"/>
-</Box>
-Artifacts placed on top of a powered artifact analyzer are subjected to a bias which affects which node they will move to after being activated. The bias can be set in the artifact console.
-
-There are two types of biases:
-- [color=#a4885c]Up:[/color] favors nodes closer to the origin. Results in a decrease of depth.
-- [color=#a4885c]Down:[/color] favors nodes farther away from the origin. Results in an increase of depth.
+  <Box>
+    <GuideEntityEmbed Entity="CrateArtifactContainer" Caption="Artifact Container"/>
+    <GuideEntityEmbed Entity="HandheldArtifactContainer" Caption="Handheld Container"/>
+  </Box>
+  - [bold]Artifact Containers:[/bold] Safely store and transports artifacts and prevent nodes from triggering.
+  <Box>
+    <GuideEntityEmbed Entity="MachineArtifactCrusher" Caption="Crusher"/>
+  </Box>
+  - [bold]Artifact Crusher:[/bold] Crushes artifacts into fragments. Four fragments can be rebuilt into a new artifact.
+  <Box>
+    <GuideEntityEmbed Entity="ArtifactFragment" Caption="Artifact Fragment"/>
+  </Box>
+  - [bold]Artifact Fragment:[/bold] Pieces of destroyed artifacts. Four fragments can be rebuilt into a new artifact using the craft menu.
 </Document>
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png
index 33e36a316f..b9d92b8047 100644
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png differ
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 c8396d7835..6474b1f2e7 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)",
+  "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)",
   "size": {
     "x": 32,
     "y": 32
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/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/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/migration.yml b/Resources/migration.yml
index d05795def4..bbf331d5b6 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -726,5 +726,7 @@ PrefilledSyringe: Syringe
 BibleTanakh: null
 BibleSatanic: null
 
-# 2025-10-8
+
+# 2025-10-08
 ClothingBeltAssault: ClothingBeltMilitaryWebbing
+WarpPointBombing: null
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