From faca40b8d518aa7bff4213035fed1e2446bdd3a1 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 24 Dec 2022 23:28:21 -0500
Subject: [PATCH] more component ref removal + combining server/client comps
 (#13178)

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
---
 Content.Client/Flash/FlashSystem.cs           |   2 -
 Content.Client/Flash/FlashableComponent.cs    |  12 -
 Content.Client/Humanoid/HumanoidComponent.cs  |  15 --
 .../Humanoid/HumanoidVisualizerSystem.cs      |  40 +--
 .../Projectiles/ProjectileComponent.cs        |   8 -
 .../Components/SingularityComponent.cs        |  13 -
 .../Singularity/Systems/SingularitySystem.cs  |   4 +-
 Content.Client/Stack/StackComponent.cs        |  18 --
 Content.Client/Stack/StackStatusControl.cs    |   1 +
 Content.Client/Stack/StackSystem.cs           |   2 +-
 .../Tools/Components/MultipleToolComponent.cs |  11 -
 Content.Client/Tools/ToolSystem.cs            |   4 +-
 .../VendingMachineComponent.cs                |  60 -----
 .../VendingMachines/VendingMachineSystem.cs   |  16 --
 .../Ranged/Systems/FlyBySoundSystem.cs        |   4 +-
 .../Systems/AdminVerbSystem.Tools.cs          |   1 +
 Content.Server/Advertise/AdvertiseSystem.cs   |   1 +
 Content.Server/Cargo/Systems/PricingSystem.cs |   1 +
 Content.Server/Cloning/CloningSystem.cs       |   1 +
 .../Construction/Completions/GivePrototype.cs |   1 +
 .../Completions/SpawnPrototype.cs             |   1 +
 .../Construction/MachineFrameSystem.cs        |   1 +
 Content.Server/Construction/RefiningSystem.cs |   1 +
 .../Thresholds/Behaviors/EjectVendorItems.cs  |   1 +
 .../Behaviors/SpawnEntitiesBehavior.cs        |   1 +
 Content.Server/Dragon/DragonSystem.cs         |   2 +-
 .../EntitySystems/SpawnAfterInteractSystem.cs |   2 +-
 .../Flash/Components/FlashableComponent.cs    |  10 -
 .../GameTicking/Rules/ZombieRuleSystem.cs     |   3 +-
 Content.Server/Hands/Systems/HandsSystem.cs   |   1 +
 .../Humanoid/Components/HumanoidComponent.cs  |  38 ---
 .../Systems/RandomHumanoidAppearanceSystem.cs |   1 +
 .../IdentityManagement/IdentitySystem.cs      |   3 +-
 .../EntitySystems/ReagentGrinderSystem.cs     |   1 +
 .../MagicMirror/MagicMirrorSystem.cs          |   1 +
 .../BiomassReclaimerSystem.cs                 |   3 +-
 Content.Server/Medical/HealingSystem.cs       |   2 +-
 .../Components/ParticleProjectileComponent.cs |   2 +-
 .../Power/EntitySystems/CableSystem.Placer.cs |   1 +
 .../Components/ProjectileComponent.cs         |  29 ---
 .../Projectiles/SharedProjectileSystem.cs     |   1 -
 .../EntitySystems/RevenantSystem.Abilities.cs |   1 +
 .../EntitySystems/EmitterSystem.cs            |   3 +-
 .../EntitySystems/SingularitySystem.cs        |  10 +-
 Content.Server/Stack/StackComponent.cs        |  13 -
 Content.Server/Stack/StackSystem.cs           |   6 +-
 .../Store/Conditions/BuyerSpeciesCondition.cs |   1 +
 Content.Server/Store/Systems/StoreSystem.cs   |   1 +
 Content.Server/Tiles/FloorTileSystem.cs       |   1 +
 .../Tools/Components/MultipleToolComponent.cs |   9 -
 .../VendingMachineComponent.cs                |  80 ------
 .../VendingMachines/VendingMachineSystem.cs   |   7 +-
 .../Ranged/Systems/GunSystem.Battery.cs       |   2 +-
 .../Ranged/Systems/GunSystem.Cartridges.cs    |   2 +-
 .../Weapons/Ranged/Systems/GunSystem.cs       |   3 +-
 .../Steps/MaterialConstructionGraphStep.cs    |   6 +-
 ...ableComponent.cs => FlashableComponent.cs} |   8 +-
 Content.Shared/Flash/SharedFlashSystem.cs     |   4 +-
 ...anoidComponent.cs => HumanoidComponent.cs} |  40 ++-
 .../Materials/SharedMaterialStorageSystem.cs  |   2 +-
 ...ileComponent.cs => ProjectileComponent.cs} |  24 +-
 .../Projectiles/SharedProjectileSystem.cs     |   6 +-
 .../Components/SharedSingularityComponent.cs  |  32 ---
 .../Components/SingularityComponent.cs        |  51 ++--
 .../EntitySystems/SharedSingularitySystem.cs  |  44 ++--
 .../Events/SingularityLevelChangedEvent.cs    |   4 +-
 Content.Shared/Stacks/SharedStackSystem.cs    |  48 ++--
 ...redStackComponent.cs => StackComponent.cs} |  10 +-
 Content.Shared/Stacks/StackPrototype.cs       |   2 +-
 ...lComponent.cs => MultipleToolComponent.cs} |  20 +-
 .../Systems/SharedToolSystem.MultipleTool.cs  |  20 +-
 .../SharedVendingMachineComponent.cs          | 100 --------
 .../SharedVendingMachineSystem.cs             |  13 +-
 .../VendingMachineComponent.cs                | 241 ++++++++++++++++++
 .../Objects/Consumable/Food/Baked/misc.yml    |   3 -
 .../Smokeables/Cigarettes/rolling_paper.yml   |   2 -
 .../Structures/Machines/vending_machines.yml  |   2 +-
 .../Prototypes/Stacks/consumable_stacks.yml   |   6 +-
 78 files changed, 504 insertions(+), 643 deletions(-)
 delete mode 100644 Content.Client/Flash/FlashableComponent.cs
 delete mode 100644 Content.Client/Humanoid/HumanoidComponent.cs
 delete mode 100644 Content.Client/Projectiles/ProjectileComponent.cs
 delete mode 100644 Content.Client/Singularity/Components/SingularityComponent.cs
 delete mode 100644 Content.Client/Stack/StackComponent.cs
 delete mode 100644 Content.Client/VendingMachines/VendingMachineComponent.cs
 delete mode 100644 Content.Server/Flash/Components/FlashableComponent.cs
 delete mode 100644 Content.Server/Humanoid/Components/HumanoidComponent.cs
 delete mode 100644 Content.Server/Projectiles/Components/ProjectileComponent.cs
 delete mode 100644 Content.Server/Stack/StackComponent.cs
 delete mode 100644 Content.Server/Tools/Components/MultipleToolComponent.cs
 delete mode 100644 Content.Server/VendingMachines/VendingMachineComponent.cs
 rename Content.Shared/Flash/{SharedFlashableComponent.cs => FlashableComponent.cs} (70%)
 rename Content.Shared/Humanoid/{SharedHumanoidComponent.cs => HumanoidComponent.cs} (57%)
 rename Content.Shared/Projectiles/{SharedProjectileComponent.cs => ProjectileComponent.cs} (50%)
 delete mode 100644 Content.Shared/Singularity/Components/SharedSingularityComponent.cs
 rename {Content.Server => Content.Shared}/Singularity/Components/SingularityComponent.cs (55%)
 rename Content.Shared/Stacks/{SharedStackComponent.cs => StackComponent.cs} (84%)
 rename Content.Shared/Tools/Components/{SharedMultipleToolComponent.cs => MultipleToolComponent.cs} (67%)
 delete mode 100644 Content.Shared/VendingMachines/SharedVendingMachineComponent.cs
 create mode 100644 Content.Shared/VendingMachines/VendingMachineComponent.cs

diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs
index 9cdfd61e03..3393662fa4 100644
--- a/Content.Client/Flash/FlashSystem.cs
+++ b/Content.Client/Flash/FlashSystem.cs
@@ -1,9 +1,7 @@
 using Content.Shared.Flash;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
-using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
-using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Flash
diff --git a/Content.Client/Flash/FlashableComponent.cs b/Content.Client/Flash/FlashableComponent.cs
deleted file mode 100644
index 714d2d7c1c..0000000000
--- a/Content.Client/Flash/FlashableComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Flash;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-
-namespace Content.Client.Flash
-{
-    [ComponentReference(typeof(SharedFlashableComponent))]
-    [RegisterComponent, Access(typeof(FlashSystem))]
-    public sealed class FlashableComponent : SharedFlashableComponent
-    {
-    }
-}
diff --git a/Content.Client/Humanoid/HumanoidComponent.cs b/Content.Client/Humanoid/HumanoidComponent.cs
deleted file mode 100644
index d433013c9d..0000000000
--- a/Content.Client/Humanoid/HumanoidComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Content.Shared.Humanoid.Prototypes;
-
-namespace Content.Client.Humanoid;
-
-[RegisterComponent]
-public sealed class HumanoidComponent : SharedHumanoidComponent
-{
-    [ViewVariables] public List<Marking> CurrentMarkings = new();
-
-    public Dictionary<HumanoidVisualLayers, HumanoidSpeciesSpriteLayer> BaseLayers = new();
-
-    public string LastSpecies = default!;
-}
diff --git a/Content.Client/Humanoid/HumanoidVisualizerSystem.cs b/Content.Client/Humanoid/HumanoidVisualizerSystem.cs
index 808a5a1ba7..5539ec27d1 100644
--- a/Content.Client/Humanoid/HumanoidVisualizerSystem.cs
+++ b/Content.Client/Humanoid/HumanoidVisualizerSystem.cs
@@ -108,23 +108,23 @@ public sealed class HumanoidVisualizerSystem : VisualizerSystem<HumanoidComponen
         SpriteComponent sprite)
     {
         // skip this entire thing if both sets are empty
-        if (humanoid.CurrentMarkings.Count == 0 && newMarkings.Count == 0)
+        if (humanoid.CurrentClientMarkings.Count == 0 && newMarkings.Count == 0)
         {
             return;
         }
 
         var dirtyMarkings = new List<int>();
-        var dirtyRangeStart = humanoid.CurrentMarkings.Count == 0 ? 0 : -1;
+        var dirtyRangeStart = humanoid.CurrentClientMarkings.Count == 0 ? 0 : -1;
 
         // edge cases:
-        // humanoid.CurrentMarkings < newMarkings.Count
+        // humanoid.CurrentClientMarkings < newMarkings.Count
         // - check if count matches this condition before diffing
-        // - if count is unequal, set dirty range to start from humanoid.CurrentMarkings.Count
-        // humanoid.CurrentMarkings > newMarkings.Count, no dirty markings
+        // - if count is unequal, set dirty range to start from humanoid.CurrentClientMarkings.Count
+        // humanoid.CurrentClientMarkings > newMarkings.Count, no dirty markings
         // - break count upon meeting this condition
-        // - clear markings from newMarkings.Count to humanoid.CurrentMarkings.Count - newMarkings.Count
+        // - clear markings from newMarkings.Count to humanoid.CurrentClientMarkings.Count - newMarkings.Count
 
-        for (var i = 0; i < humanoid.CurrentMarkings.Count; i++)
+        for (var i = 0; i < humanoid.CurrentClientMarkings.Count; i++)
         {
             // if we've reached the end of the new set of markings,
             // then that means it's time to finish
@@ -135,7 +135,7 @@ public sealed class HumanoidVisualizerSystem : VisualizerSystem<HumanoidComponen
 
             // if the marking is different here, set the range start to i and break, we need
             // to rebuild all markings starting from i
-            if (humanoid.CurrentMarkings[i].MarkingId != newMarkings[i].MarkingId)
+            if (humanoid.CurrentClientMarkings[i].MarkingId != newMarkings[i].MarkingId)
             {
                 dirtyRangeStart = i;
                 break;
@@ -146,7 +146,7 @@ public sealed class HumanoidVisualizerSystem : VisualizerSystem<HumanoidComponen
             // however: if the hidden layers are set to dirty, then we need to
             // instead just add every single marking, since we don't know ahead of time
             // where these markings go
-            if (humanoid.CurrentMarkings[i] != newMarkings[i] || layersDirty)
+            if (humanoid.CurrentClientMarkings[i] != newMarkings[i] || layersDirty)
             {
                 dirtyMarkings.Add(i);
             }
@@ -162,49 +162,49 @@ public sealed class HumanoidVisualizerSystem : VisualizerSystem<HumanoidComponen
             ApplyMarking(uid, dirtyMarking, newMarkings[i].MarkingColors, newMarkings[i].Visible, humanoid, sprite);
         }
 
-        if (humanoid.CurrentMarkings.Count < newMarkings.Count && dirtyRangeStart < 0)
+        if (humanoid.CurrentClientMarkings.Count < newMarkings.Count && dirtyRangeStart < 0)
         {
-            dirtyRangeStart = humanoid.CurrentMarkings.Count;
+            dirtyRangeStart = humanoid.CurrentClientMarkings.Count;
         }
 
         if (dirtyRangeStart >= 0)
         {
             var range = newMarkings.GetRange(dirtyRangeStart, newMarkings.Count - dirtyRangeStart);
 
-            if (humanoid.CurrentMarkings.Count > 0)
+            if (humanoid.CurrentClientMarkings.Count > 0)
             {
-                var oldRange = humanoid.CurrentMarkings.GetRange(dirtyRangeStart, humanoid.CurrentMarkings.Count - dirtyRangeStart);
+                var oldRange = humanoid.CurrentClientMarkings.GetRange(dirtyRangeStart, humanoid.CurrentClientMarkings.Count - dirtyRangeStart);
                 ClearMarkings(uid, oldRange, humanoid, sprite);
             }
 
             ApplyMarkings(uid, range, humanoid, sprite);
         }
-        else if (humanoid.CurrentMarkings.Count != newMarkings.Count)
+        else if (humanoid.CurrentClientMarkings.Count != newMarkings.Count)
         {
             if (newMarkings.Count == 0)
             {
                 ClearAllMarkings(uid, humanoid, sprite);
             }
-            else if (humanoid.CurrentMarkings.Count > newMarkings.Count)
+            else if (humanoid.CurrentClientMarkings.Count > newMarkings.Count)
             {
                 var rangeStart = newMarkings.Count;
-                var rangeCount = humanoid.CurrentMarkings.Count - newMarkings.Count;
-                var range = humanoid.CurrentMarkings.GetRange(rangeStart, rangeCount);
+                var rangeCount = humanoid.CurrentClientMarkings.Count - newMarkings.Count;
+                var range = humanoid.CurrentClientMarkings.GetRange(rangeStart, rangeCount);
 
                 ClearMarkings(uid, range, humanoid, sprite);
             }
         }
 
-        if (dirtyMarkings.Count > 0 || dirtyRangeStart >= 0 || humanoid.CurrentMarkings.Count != newMarkings.Count)
+        if (dirtyMarkings.Count > 0 || dirtyRangeStart >= 0 || humanoid.CurrentClientMarkings.Count != newMarkings.Count)
         {
-            humanoid.CurrentMarkings = newMarkings;
+            humanoid.CurrentClientMarkings = newMarkings;
         }
     }
 
     private void ClearAllMarkings(EntityUid uid, HumanoidComponent humanoid,
         SpriteComponent spriteComp)
     {
-        ClearMarkings(uid, humanoid.CurrentMarkings, humanoid, spriteComp);
+        ClearMarkings(uid, humanoid.CurrentClientMarkings, humanoid, spriteComp);
     }
 
     private void ClearMarkings(EntityUid uid, List<Marking> markings, HumanoidComponent humanoid,
diff --git a/Content.Client/Projectiles/ProjectileComponent.cs b/Content.Client/Projectiles/ProjectileComponent.cs
deleted file mode 100644
index d0fa12d50b..0000000000
--- a/Content.Client/Projectiles/ProjectileComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Projectiles;
-
-namespace Content.Client.Projectiles
-{
-    [RegisterComponent]
-    [ComponentReference(typeof(SharedProjectileComponent))]
-    public sealed class ProjectileComponent : SharedProjectileComponent {}
-}
diff --git a/Content.Client/Singularity/Components/SingularityComponent.cs b/Content.Client/Singularity/Components/SingularityComponent.cs
deleted file mode 100644
index 4b83d0a184..0000000000
--- a/Content.Client/Singularity/Components/SingularityComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Shared.Singularity.Components;
-using Content.Client.Singularity.EntitySystems;
-
-namespace Content.Client.Singularity.Components;
-
-/// <summary>
-/// The client-side version of <see cref="SharedSingularityComponent"/>.
-/// Primarily managed by <see cref="SingularitySystem"/>.
-/// </summary>
-[RegisterComponent]
-[ComponentReference(typeof(SharedSingularityComponent))]
-public sealed class SingularityComponent : SharedSingularityComponent
-{}
diff --git a/Content.Client/Singularity/Systems/SingularitySystem.cs b/Content.Client/Singularity/Systems/SingularitySystem.cs
index 4aad041653..fc242a2066 100644
--- a/Content.Client/Singularity/Systems/SingularitySystem.cs
+++ b/Content.Client/Singularity/Systems/SingularitySystem.cs
@@ -14,7 +14,7 @@ public sealed class SingularitySystem : SharedSingularitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SharedSingularityComponent, ComponentHandleState>(HandleSingularityState);
+        SubscribeLocalEvent<SingularityComponent, ComponentHandleState>(HandleSingularityState);
     }
 
     /// <summary>
@@ -23,7 +23,7 @@ public sealed class SingularitySystem : SharedSingularitySystem
     /// <param name="uid">The uid of the singularity to sync.</param>
     /// <param name="comp">The state of the singularity to sync.</param>
     /// <param name="args">The event arguments including the state to sync the singularity with.</param>
-    private void HandleSingularityState(EntityUid uid, SharedSingularityComponent comp, ref ComponentHandleState args)
+    private void HandleSingularityState(EntityUid uid, SingularityComponent comp, ref ComponentHandleState args)
     {
         if (args.Current is not SingularityComponentState state)
             return;
diff --git a/Content.Client/Stack/StackComponent.cs b/Content.Client/Stack/StackComponent.cs
deleted file mode 100644
index 094179ba43..0000000000
--- a/Content.Client/Stack/StackComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Client.Items.Components;
-using Content.Client.Message;
-using Content.Client.Stylesheets;
-using Content.Shared.Stacks;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Timing;
-
-namespace Content.Client.Stack
-{
-    [RegisterComponent, Access(typeof(StackSystem), typeof(StackStatusControl))]
-    [ComponentReference(typeof(SharedStackComponent))]
-    public sealed class StackComponent : SharedStackComponent
-    {
-        [ViewVariables]
-        public bool UiUpdateNeeded { get; set; }
-    }
-}
diff --git a/Content.Client/Stack/StackStatusControl.cs b/Content.Client/Stack/StackStatusControl.cs
index c0254df202..8006226832 100644
--- a/Content.Client/Stack/StackStatusControl.cs
+++ b/Content.Client/Stack/StackStatusControl.cs
@@ -1,5 +1,6 @@
 using Content.Client.Message;
 using Content.Client.Stylesheets;
+using Content.Shared.Stacks;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
diff --git a/Content.Client/Stack/StackSystem.cs b/Content.Client/Stack/StackSystem.cs
index 9025f74934..9da7d8d63e 100644
--- a/Content.Client/Stack/StackSystem.cs
+++ b/Content.Client/Stack/StackSystem.cs
@@ -18,7 +18,7 @@ namespace Content.Client.Stack
             args.Controls.Add(new StackStatusControl(component));
         }
 
-        public override void SetCount(EntityUid uid, int amount, SharedStackComponent? component = null)
+        public override void SetCount(EntityUid uid, int amount, StackComponent? component = null)
         {
             if (!Resolve(uid, ref component))
                 return;
diff --git a/Content.Client/Tools/Components/MultipleToolComponent.cs b/Content.Client/Tools/Components/MultipleToolComponent.cs
index 0c088c480c..5a7aeb5cb4 100644
--- a/Content.Client/Tools/Components/MultipleToolComponent.cs
+++ b/Content.Client/Tools/Components/MultipleToolComponent.cs
@@ -7,17 +7,6 @@ using Robust.Shared.Timing;
 
 namespace Content.Client.Tools.Components
 {
-    [RegisterComponent]
-    [ComponentReference(typeof(SharedMultipleToolComponent))]
-    public sealed class MultipleToolComponent : SharedMultipleToolComponent
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool UiUpdateNeeded;
-
-        [DataField("statusShowBehavior")]
-        public bool StatusShowBehavior = true;
-    }
-
     public sealed class MultipleToolStatusControl : Control
     {
         private readonly MultipleToolComponent _parent;
diff --git a/Content.Client/Tools/ToolSystem.cs b/Content.Client/Tools/ToolSystem.cs
index db56149f79..22e7740d05 100644
--- a/Content.Client/Tools/ToolSystem.cs
+++ b/Content.Client/Tools/ToolSystem.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Tools
         }
 
         public override void SetMultipleTool(EntityUid uid,
-        SharedMultipleToolComponent? multiple = null,
+        MultipleToolComponent? multiple = null,
         ToolComponent? tool = null,
         bool playSound = false,
         EntityUid? user = null)
@@ -29,7 +29,7 @@ namespace Content.Client.Tools
                 return;
 
             base.SetMultipleTool(uid, multiple, tool, playSound, user);
-            ((MultipleToolComponent)multiple).UiUpdateNeeded = true;
+            multiple.UiUpdateNeeded = true;
 
             // TODO replace this with appearance + visualizer
             // in order to convert this to a specifier, the manner in which the sprite is specified in yaml needs to be updated.
diff --git a/Content.Client/VendingMachines/VendingMachineComponent.cs b/Content.Client/VendingMachines/VendingMachineComponent.cs
deleted file mode 100644
index b392a49c80..0000000000
--- a/Content.Client/VendingMachines/VendingMachineComponent.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Content.Shared.VendingMachines;
-
-namespace Content.Client.VendingMachines;
-
-[RegisterComponent]
-[ComponentReference(typeof(SharedVendingMachineComponent))]
-[Access(typeof(VendingMachineSystem))]
-public sealed class VendingMachineComponent : SharedVendingMachineComponent
-{
-    /// <summary>
-    /// RSI state for when the vending machine is unpowered.
-    /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.Base"/>
-    /// </summary>
-    [DataField("offState")]
-    public string? OffState;
-
-    /// <summary>
-    /// RSI state for the screen of the vending machine
-    /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.Screen"/>
-    /// </summary>
-    [DataField("screenState")]
-    public string? ScreenState;
-
-    /// <summary>
-    /// RSI state for the vending machine's normal state. Usually a looping animation.
-    /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.BaseUnshaded"/>
-    /// </summary>
-    [DataField("normalState")]
-    public string? NormalState;
-
-    /// <summary>
-    /// RSI state for the vending machine's eject animation.
-    /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.BaseUnshaded"/>
-    /// </summary>
-    [DataField("ejectState")]
-    public string? EjectState;
-
-    /// <summary>
-    /// RSI state for the vending machine's deny animation. Will either be played once as sprite flick
-    /// or looped depending on how <see cref="LoopDenyAnimation"/> is set.
-    /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.BaseUnshaded"/>
-    /// </summary>
-    [DataField("denyState")]
-    public string? DenyState;
-
-    /// <summary>
-    /// RSI state for when the vending machine is unpowered.
-    /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.Base"/>
-    /// </summary>
-    [DataField("brokenState")]
-    public string? BrokenState;
-
-    /// <summary>
-    /// If set to <c>true</c> (default) will loop the animation of the <see cref="DenyState"/> for the duration
-    /// of <see cref="SharedVendingMachineComponent.DenyDelay"/>. If set to <c>false</c> will play a sprite
-    /// flick animation for the state and then linger on the final frame until the end of the delay.
-    /// </summary>
-    [DataField("loopDeny")]
-    public bool LoopDenyAnimation = true;
-}
diff --git a/Content.Client/VendingMachines/VendingMachineSystem.cs b/Content.Client/VendingMachines/VendingMachineSystem.cs
index 1da408254c..922a75d24a 100644
--- a/Content.Client/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Client/VendingMachines/VendingMachineSystem.cs
@@ -137,19 +137,3 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
         sprite.LayerSetVisible(actualLayer, false);
     }
 }
-
-public enum VendingMachineVisualLayers : byte
-{
-    /// <summary>
-    /// Off / Broken. The other layers will overlay this if the machine is on.
-    /// </summary>
-    Base,
-    /// <summary>
-    /// Normal / Deny / Eject
-    /// </summary>
-    BaseUnshaded,
-    /// <summary>
-    /// Screens that are persistent (where the machine is not off or broken)
-    /// </summary>
-    Screen
-}
diff --git a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
index 994998a141..1361880852 100644
--- a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
@@ -1,9 +1,7 @@
-using Content.Client.Projectiles;
+using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Client.Player;
-using Robust.Shared.Audio;
-using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 1a932a4a0e..678f5b99b3 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -25,6 +25,7 @@ using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
+using Content.Shared.Stacks;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Advertise/AdvertiseSystem.cs b/Content.Server/Advertise/AdvertiseSystem.cs
index 5bbf2fc559..60628963f6 100644
--- a/Content.Server/Advertise/AdvertiseSystem.cs
+++ b/Content.Server/Advertise/AdvertiseSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Chat;
 using Content.Server.Chat.Systems;
 using Content.Server.Power.Components;
 using Content.Server.VendingMachines;
+using Content.Shared.VendingMachines;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index ee3c4d2e71..3cbcd025d7 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -10,6 +10,7 @@ using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Materials;
 using Content.Shared.MobState.Components;
+using Content.Shared.Stacks;
 using Robust.Shared.Console;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index ce984b923b..e4852837e2 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -22,6 +22,7 @@ using Content.Server.Construction.Components;
 using Content.Server.Materials;
 using Content.Server.Stack;
 using Content.Server.Jobs;
+using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
 using Robust.Server.GameObjects;
 using Robust.Server.Containers;
diff --git a/Content.Server/Construction/Completions/GivePrototype.cs b/Content.Server/Construction/Completions/GivePrototype.cs
index 086715aac9..9d49c16cd8 100644
--- a/Content.Server/Construction/Completions/GivePrototype.cs
+++ b/Content.Server/Construction/Completions/GivePrototype.cs
@@ -2,6 +2,7 @@ using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Prototypes;
+using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
diff --git a/Content.Server/Construction/Completions/SpawnPrototype.cs b/Content.Server/Construction/Completions/SpawnPrototype.cs
index ad4311f8dc..cb8f124a41 100644
--- a/Content.Server/Construction/Completions/SpawnPrototype.cs
+++ b/Content.Server/Construction/Completions/SpawnPrototype.cs
@@ -1,6 +1,7 @@
 using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.Prototypes;
+using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
diff --git a/Content.Server/Construction/MachineFrameSystem.cs b/Content.Server/Construction/MachineFrameSystem.cs
index 651ecfb311..9d75011e7f 100644
--- a/Content.Server/Construction/MachineFrameSystem.cs
+++ b/Content.Server/Construction/MachineFrameSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
+using Content.Shared.Stacks;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Construction/RefiningSystem.cs b/Content.Server/Construction/RefiningSystem.cs
index c259837255..644b8fec7a 100644
--- a/Content.Server/Construction/RefiningSystem.cs
+++ b/Content.Server/Construction/RefiningSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Construction.Components;
 using Content.Server.Tools;
 using Content.Server.Stack;
 using Content.Shared.Interaction;
+using Content.Shared.Stacks;
 using Content.Shared.Tools.Components;
 
 namespace Content.Server.Construction
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/EjectVendorItems.cs b/Content.Server/Destructible/Thresholds/Behaviors/EjectVendorItems.cs
index f4dcc3ebce..b49c4c519a 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/EjectVendorItems.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/EjectVendorItems.cs
@@ -1,4 +1,5 @@
 using Content.Server.VendingMachines;
+using Content.Shared.VendingMachines;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
 {
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 689bd9b8fa..df8cd88751 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -1,5 +1,6 @@
 using Content.Server.Stack;
 using Content.Shared.Prototypes;
+using Content.Shared.Stacks;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index c5099571a5..035b96615b 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -11,7 +11,6 @@ using System.Threading;
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules;
-using Content.Server.Humanoid;
 using Content.Server.NPC;
 using Content.Shared.Damage;
 using Content.Shared.Dragon;
@@ -22,6 +21,7 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 using Content.Server.NPC.Systems;
+using Content.Shared.Humanoid;
 
 namespace Content.Server.Dragon
 {
diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
index e5dc1c13f4..3fc4a40d0f 100644
--- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
@@ -60,7 +60,7 @@ namespace Content.Server.Engineering.EntitySystems
             if (component.Deleted || Deleted(component.Owner))
                 return;
 
-            if (EntityManager.TryGetComponent<SharedStackComponent?>(component.Owner, out var stackComp)
+            if (EntityManager.TryGetComponent<StackComponent?>(component.Owner, out var stackComp)
                 && component.RemoveOnInteract && !_stackSystem.Use(uid, 1, stackComp))
             {
                 return;
diff --git a/Content.Server/Flash/Components/FlashableComponent.cs b/Content.Server/Flash/Components/FlashableComponent.cs
deleted file mode 100644
index 65f32a10f6..0000000000
--- a/Content.Server/Flash/Components/FlashableComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Flash;
-
-namespace Content.Server.Flash.Components
-{
-    [ComponentReference(typeof(SharedFlashableComponent))]
-    [RegisterComponent, Access(typeof(FlashSystem))]
-    public sealed class FlashableComponent : SharedFlashableComponent
-    {
-    }
-}
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
index 0f48f7658f..dc1821d5d6 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
@@ -3,7 +3,6 @@ using Content.Server.Actions;
 using Content.Server.Chat.Managers;
 using Content.Server.Disease;
 using Content.Server.Disease.Components;
-using Content.Server.Humanoid;
 using Content.Server.Mind.Components;
 using Content.Server.MobState;
 using Content.Server.Players;
@@ -14,6 +13,7 @@ using Content.Server.Traitor;
 using Content.Server.Zombies;
 using Content.Shared.Actions.ActionTypes;
 using Content.Shared.CCVar;
+using Content.Shared.Humanoid;
 using Content.Shared.MobState;
 using Content.Shared.MobState.Components;
 using Content.Shared.Preferences;
@@ -21,7 +21,6 @@ using Content.Shared.Roles;
 using Content.Shared.Zombies;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 25e3fa7c6c..dcc9d47289 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -15,6 +15,7 @@ using Content.Shared.Input;
 using Content.Shared.Inventory;
 using Content.Shared.Physics.Pull;
 using Content.Shared.Pulling.Components;
+using Content.Shared.Stacks;
 using Content.Shared.Throwing;
 using JetBrains.Annotations;
 using Robust.Server.Player;
diff --git a/Content.Server/Humanoid/Components/HumanoidComponent.cs b/Content.Server/Humanoid/Components/HumanoidComponent.cs
deleted file mode 100644
index e3a6b1c90a..0000000000
--- a/Content.Server/Humanoid/Components/HumanoidComponent.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Content.Shared.Preferences;
-using Robust.Shared.Enums;
-
-namespace Content.Server.Humanoid;
-
-[RegisterComponent]
-public sealed class HumanoidComponent : SharedHumanoidComponent
-{
-    public MarkingSet CurrentMarkings = new();
-
-    /// <summary>
-    ///     Any custom base layers this humanoid might have. See:
-    ///     limb transplants (potentially), robotic arms, etc.
-    ///     Stored on the server, this is merged in the client into
-    ///     all layer settings.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers = new();
-
-    public HashSet<HumanoidVisualLayers> PermanentlyHidden = new();
-
-    public HashSet<HumanoidVisualLayers> AllHiddenLayers
-    {
-        get
-        {
-            var result = new HashSet<HumanoidVisualLayers>(HiddenLayers);
-            result.UnionWith(PermanentlyHidden);
-
-            return result;
-        }
-    }
-
-    // Couldn't these be somewhere else?
-    [ViewVariables] public Gender Gender = default!;
-    [ViewVariables] public int Age = 18;
-}
diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
index fe183d6449..b55c025beb 100644
--- a/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.CharacterAppearance.Components;
+using Content.Shared.Humanoid;
 using Content.Shared.Preferences;
 
 namespace Content.Server.Humanoid.Systems;
diff --git a/Content.Server/IdentityManagement/IdentitySystem.cs b/Content.Server/IdentityManagement/IdentitySystem.cs
index 54480db51b..a7dee24b23 100644
--- a/Content.Server/IdentityManagement/IdentitySystem.cs
+++ b/Content.Server/IdentityManagement/IdentitySystem.cs
@@ -1,13 +1,12 @@
 using Content.Server.Access.Systems;
 using Content.Server.Administration.Logs;
-using Content.Server.Humanoid;
 using Content.Shared.Database;
 using Content.Shared.Hands;
+using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
-using Content.Shared.Preferences;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects.Components.Localization;
 
diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index 1d731ef436..7ae53671a2 100644
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -12,6 +12,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Kitchen;
 using Content.Shared.Popups;
 using Content.Shared.Random.Helpers;
+using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs
index 0787efc7d7..49135a3255 100644
--- a/Content.Server/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Humanoid;
 using Content.Server.UserInterface;
+using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.MagicMirror;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index f71246e3bf..988b9391ca 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -17,12 +17,11 @@ using Content.Server.Body.Components;
 using Content.Server.Climbing;
 using Content.Server.Construction;
 using Content.Server.DoAfter;
-using Content.Server.Humanoid;
 using Content.Server.Mind.Components;
 using Content.Server.Stack;
+using Content.Shared.Humanoid;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Configuration;
 using Robust.Server.Player;
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index f996b786fa..d24c0ac082 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -123,7 +123,7 @@ public sealed class HealingSystem : EntitySystem
             return false;
         }
 
-        if (TryComp<SharedStackComponent>(component.Owner, out var stack) && stack.Count < 1)
+        if (TryComp<StackComponent>(component.Owner, out var stack) && stack.Count < 1)
             return false;
 
         component.CancelToken = new CancellationTokenSource();
diff --git a/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
index 7018d10bda..8acb78aed1 100644
--- a/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.Projectiles;
-using Content.Server.Projectiles.Components;
 using Content.Server.Singularity.Components;
+using Content.Shared.Projectiles;
 using Content.Shared.Singularity.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
diff --git a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
index eaa4140cbc..fb8b9559b7 100644
--- a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
+++ b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs
@@ -2,6 +2,7 @@ using Content.Server.Power.Components;
 using Content.Server.Stack;
 using Content.Shared.Interaction;
 using Content.Shared.Maps;
+using Content.Shared.Stacks;
 using Robust.Shared.Map;
 
 namespace Content.Server.Power.EntitySystems;
diff --git a/Content.Server/Projectiles/Components/ProjectileComponent.cs b/Content.Server/Projectiles/Components/ProjectileComponent.cs
deleted file mode 100644
index 816f0dc6ce..0000000000
--- a/Content.Server/Projectiles/Components/ProjectileComponent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Projectiles;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Projectiles.Components
-{
-    [RegisterComponent]
-    [ComponentReference(typeof(SharedProjectileComponent))]
-    public sealed class ProjectileComponent : SharedProjectileComponent
-    {
-        [DataField("damage", required: true)]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier Damage = default!;
-
-        [DataField("deleteOnCollide")]
-        public bool DeleteOnCollide { get; } = true;
-
-        [DataField("ignoreResistances")]
-        public bool IgnoreResistances { get; } = false;
-
-        // Get that juicy FPS hit sound
-        [DataField("soundHit")] public SoundSpecifier? SoundHit;
-
-        [DataField("soundForce")]
-        public bool ForceSound = false;
-
-        public bool DamagedEntity;
-    }
-}
diff --git a/Content.Server/Projectiles/SharedProjectileSystem.cs b/Content.Server/Projectiles/SharedProjectileSystem.cs
index a3c12a46e0..64c1706d88 100644
--- a/Content.Server/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Server/Projectiles/SharedProjectileSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Projectiles.Components;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Camera;
 using Content.Shared.Damage;
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 01009a04f9..a0e7682b66 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -27,6 +27,7 @@ using Content.Server.Humanoid;
 using Content.Server.Revenant.Components;
 using Content.Server.Store.Components;
 using Content.Shared.FixedPoint;
+using Content.Shared.Humanoid;
 using Content.Shared.Revenant.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Utility;
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index b7967898bd..ad0facaf3a 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -4,19 +4,18 @@ using Content.Server.Construction;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Projectiles;
-using Content.Server.Projectiles.Components;
 using Content.Server.Singularity.Components;
 using Content.Server.Storage.Components;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
+using Content.Shared.Projectiles;
 using Content.Shared.Singularity.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using Timer = Robust.Shared.Timing.Timer;
diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
index 878c400e84..221106b161 100644
--- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
@@ -14,9 +14,9 @@ using Content.Server.Singularity.Events;
 namespace Content.Server.Singularity.EntitySystems;
 
 /// <summary>
-/// The server-side version of <seed cref="SharedSingularitySystem">.
+/// The server-side version of <see cref="SharedSingularitySystem"/>.
 /// Primarily responsible for managing <see cref="SingularityComponent"/>s.
-/// Handles their accumulation of energy upon consuming entities (see <see cref="EventHorizonComponent">) and gradual dissipation.
+/// Handles their accumulation of energy upon consuming entities (see <see cref="EventHorizonComponent"/>) and gradual dissipation.
 /// Also handles synchronizing server-side components with the singuarities level.
 /// </summary>
 public sealed class SingularitySystem : SharedSingularitySystem
@@ -41,7 +41,6 @@ public sealed class SingularitySystem : SharedSingularitySystem
     {
         base.Initialize();
         SubscribeLocalEvent<SingularityDistortionComponent, ComponentStartup>(OnDistortionStartup);
-        SubscribeLocalEvent<SingularityComponent, ComponentStartup>(OnSingularityStartup);
         SubscribeLocalEvent<SingularityComponent, ComponentShutdown>(OnSingularityShutdown);
         SubscribeLocalEvent<SingularityComponent, EventHorizonConsumedEntityEvent>(OnConsumed);
         SubscribeLocalEvent<SinguloFoodComponent, EventHorizonConsumedEntityEvent>(OnConsumed);
@@ -198,7 +197,7 @@ public sealed class SingularitySystem : SharedSingularitySystem
     /// <param name="uid">The entity UID of the singularity that is forming.</param>
     /// <param name="comp">The component of the singularity that is forming.</param>
     /// <param name="args">The event arguments.</param>
-    public void OnSingularityStartup(EntityUid uid, SingularityComponent comp, ComponentStartup args)
+    protected override void OnSingularityStartup(EntityUid uid, SingularityComponent comp, ComponentStartup args)
     {
         comp.LastUpdateTime = _timing.CurTime;
         comp.NextUpdateTime = comp.LastUpdateTime + comp.TargetUpdatePeriod;
@@ -309,7 +308,8 @@ public sealed class SingularitySystem : SharedSingularitySystem
     /// <param name="args">The event arguments.</param>
     public void UpdateEnergyDrain(EntityUid uid, SingularityComponent comp, SingularityLevelChangedEvent args)
     {
-        comp.EnergyDrain = args.NewValue switch {
+        comp.EnergyDrain = args.NewValue switch
+        {
             6 => 20,
             5 => 15,
             4 => 10,
diff --git a/Content.Server/Stack/StackComponent.cs b/Content.Server/Stack/StackComponent.cs
deleted file mode 100644
index 049bc388c2..0000000000
--- a/Content.Server/Stack/StackComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Shared.Stacks;
-
-namespace Content.Server.Stack
-{
-    // TODO: Naming and presentation and such could use some improvement.
-    [RegisterComponent, Access(typeof(StackSystem))]
-    [ComponentReference(typeof(SharedStackComponent))]
-    public sealed class StackComponent : SharedStackComponent
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool ThrowIndividually { get; set; } = false;
-    }
-}
diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs
index de1d112cd9..6db0ec1efe 100644
--- a/Content.Server/Stack/StackSystem.cs
+++ b/Content.Server/Stack/StackSystem.cs
@@ -26,7 +26,7 @@ namespace Content.Server.Stack
             SubscribeLocalEvent<StackComponent, GetVerbsEvent<AlternativeVerb>>(OnStackAlternativeInteract);
         }
 
-        public override void SetCount(EntityUid uid, int amount, SharedStackComponent? component = null)
+        public override void SetCount(EntityUid uid, int amount, StackComponent? component = null)
         {
             if (!Resolve(uid, ref component, false))
                 return;
@@ -41,7 +41,7 @@ namespace Content.Server.Stack
         /// <summary>
         ///     Try to split this stack into two. Returns a non-null <see cref="Robust.Shared.GameObjects.EntityUid"/> if successful.
         /// </summary>
-        public EntityUid? Split(EntityUid uid, int amount, EntityCoordinates spawnPosition, SharedStackComponent? stack = null)
+        public EntityUid? Split(EntityUid uid, int amount, EntityCoordinates spawnPosition, StackComponent? stack = null)
         {
             if (!Resolve(uid, ref stack))
                 return null;
@@ -61,7 +61,7 @@ namespace Content.Server.Stack
             // Set the output parameter in the event instance to the newly split stack.
             var entity = Spawn(prototype, spawnPosition);
 
-            if (TryComp(entity, out SharedStackComponent? stackComp))
+            if (TryComp(entity, out StackComponent? stackComp))
             {
                 // Set the split stack's count.
                 SetCount(entity, amount, stackComp);
diff --git a/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs b/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
index df3b89c430..e99e8f52da 100644
--- a/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
+++ b/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
@@ -1,4 +1,5 @@
 using Content.Server.Humanoid;
+using Content.Shared.Humanoid;
 using Content.Shared.Store;
 using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 0aa57a5e09..c5cdbb3f04 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -8,6 +8,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using System.Linq;
 using Content.Server.UserInterface;
+using Content.Shared.Stacks;
 
 namespace Content.Server.Store.Systems;
 
diff --git a/Content.Server/Tiles/FloorTileSystem.cs b/Content.Server/Tiles/FloorTileSystem.cs
index 226197098f..c43832f7ed 100644
--- a/Content.Server/Tiles/FloorTileSystem.cs
+++ b/Content.Server/Tiles/FloorTileSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Audio;
 using Content.Shared.Interaction;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
+using Content.Shared.Stacks;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
diff --git a/Content.Server/Tools/Components/MultipleToolComponent.cs b/Content.Server/Tools/Components/MultipleToolComponent.cs
deleted file mode 100644
index 1bc81039d0..0000000000
--- a/Content.Server/Tools/Components/MultipleToolComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Tools.Components;
-
-namespace Content.Server.Tools.Components;
-
-[RegisterComponent]
-[ComponentReference(typeof(SharedMultipleToolComponent))]
-public sealed class MultipleToolComponent : SharedMultipleToolComponent
-{
-}
diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs
deleted file mode 100644
index a35c72aa47..0000000000
--- a/Content.Server/VendingMachines/VendingMachineComponent.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using Content.Shared.Actions.ActionTypes;
-using Content.Shared.VendingMachines;
-using Robust.Shared.Audio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.VendingMachines
-{
-    [RegisterComponent]
-    [ComponentReference(typeof(SharedVendingMachineComponent))]
-    [Access(typeof(VendingMachineSystem))]
-    public sealed class VendingMachineComponent : SharedVendingMachineComponent
-    {
-        public bool Ejecting;
-        public bool Denying;
-        public bool DispenseOnHitCoolingDown;
-
-        public string? NextItemToEject;
-
-        public bool Broken;
-
-        /// <summary>
-        /// When true, will forcefully throw any object it dispenses
-        /// </summary>
-        [DataField("speedLimiter")]
-        public bool CanShoot = false;
-
-        public bool ThrowNextItem = false;
-
-        /// <summary>
-        ///     The chance that a vending machine will randomly dispense an item on hit.
-        ///     Chance is 0 if null.
-        /// </summary>
-        [DataField("dispenseOnHitChance")]
-        public float? DispenseOnHitChance;
-
-        /// <summary>
-        ///     The minimum amount of damage that must be done per hit to have a chance
-        ///     of dispensing an item.
-        /// </summary>
-        [DataField("dispenseOnHitThreshold")]
-        public float? DispenseOnHitThreshold;
-
-        /// <summary>
-        ///     Amount of time in seconds that need to pass before damage can cause a vending machine to eject again.
-        ///     This value is separate to <see cref="SharedVendingMachineComponent.EjectDelay"/> because that value might be
-        ///     0 for a vending machine for legitimate reasons (no desired delay/no eject animation)
-        ///     and can be circumvented with forced ejections.
-        /// </summary>
-        [DataField("dispenseOnHitCooldown")]
-        public float? DispenseOnHitCooldown = 1.0f;
-
-        /// <summary>
-        ///     Sound that plays when ejecting an item
-        /// </summary>
-        [DataField("soundVend")]
-        // Grabbed from: https://github.com/discordia-space/CEV-Eris/blob/f702afa271136d093ddeb415423240a2ceb212f0/sound/machines/vending_drop.ogg
-        public SoundSpecifier SoundVend = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg");
-
-        /// <summary>
-        ///     Sound that plays when an item can't be ejected
-        /// </summary>
-        [DataField("soundDeny")]
-        // Yoinked from: https://github.com/discordia-space/CEV-Eris/blob/35bbad6764b14e15c03a816e3e89aa1751660ba9/sound/machines/Custom_deny.ogg
-        public SoundSpecifier SoundDeny = new SoundPathSpecifier("/Audio/Machines/custom_deny.ogg");
-
-        /// <summary>
-        ///     The action available to the player controlling the vending machine
-        /// </summary>
-        [DataField("action", customTypeSerializer: typeof(PrototypeIdSerializer<InstantActionPrototype>))]
-        public string? Action = "VendingThrow";
-
-        public float NonLimitedEjectForce = 7.5f;
-
-        public float NonLimitedEjectRange = 5f;
-
-        public float EjectAccumulator = 0f;
-        public float DenyAccumulator = 0f;
-        public float DispenseOnHitAccumulator = 0f;
-    }
-}
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 0ac47c629a..85e416f806 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -14,7 +14,6 @@ using Content.Shared.Throwing;
 using Content.Shared.VendingMachines;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
@@ -72,11 +71,9 @@ namespace Content.Server.VendingMachines
             args.Price += price;
         }
 
-        protected override void OnComponentInit(EntityUid uid, SharedVendingMachineComponent sharedComponent, ComponentInit args)
+        protected override void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args)
         {
-            base.OnComponentInit(uid, sharedComponent, args);
-
-            var component = (VendingMachineComponent) sharedComponent;
+            base.OnComponentInit(uid, component, args);
 
             if (HasComp<ApcPowerReceiverComponent>(component.Owner))
             {
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
index c5383c4f0e..c3abf01d98 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
@@ -1,7 +1,7 @@
 using Content.Server.Power.Components;
-using Content.Server.Projectiles.Components;
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
+using Content.Shared.Projectiles;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
index 15b7347e2a..afee1039c6 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
@@ -1,7 +1,7 @@
-using Content.Server.Projectiles.Components;
 using Content.Shared.Damage;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
+using Content.Shared.Projectiles;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 83afa89897..2c61065ba7 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -1,10 +1,8 @@
 using System.Linq;
 using Content.Server.Cargo.Systems;
-using Content.Server.Damage.Systems;
 using Content.Server.Examine;
 using Content.Server.Interaction;
 using Content.Server.Interaction.Components;
-using Content.Server.Projectiles.Components;
 using Content.Server.Stunnable;
 using Content.Server.Weapons.Melee;
 using Content.Server.Weapons.Ranged.Components;
@@ -12,6 +10,7 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
+using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
diff --git a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
index e1a89c036a..98b00f616f 100644
--- a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
@@ -25,12 +25,12 @@ namespace Content.Shared.Construction.Steps
 
         public override bool EntityValid(EntityUid uid, IEntityManager entityManager)
         {
-            return entityManager.TryGetComponent(uid, out SharedStackComponent? stack) && stack.StackTypeId == MaterialPrototypeId && stack.Count >= Amount;
+            return entityManager.TryGetComponent(uid, out StackComponent? stack) && stack.StackTypeId == MaterialPrototypeId && stack.Count >= Amount;
         }
 
-        public bool EntityValid(EntityUid entity, [NotNullWhen(true)] out SharedStackComponent? stack)
+        public bool EntityValid(EntityUid entity, [NotNullWhen(true)] out StackComponent? stack)
         {
-            if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedStackComponent? otherStack) && otherStack.StackTypeId == MaterialPrototypeId && otherStack.Count >= Amount)
+            if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out StackComponent? otherStack) && otherStack.StackTypeId == MaterialPrototypeId && otherStack.Count >= Amount)
                 stack = otherStack;
             else
                 stack = null;
diff --git a/Content.Shared/Flash/SharedFlashableComponent.cs b/Content.Shared/Flash/FlashableComponent.cs
similarity index 70%
rename from Content.Shared/Flash/SharedFlashableComponent.cs
rename to Content.Shared/Flash/FlashableComponent.cs
index 4f30fb83b5..74dec8bf0b 100644
--- a/Content.Shared/Flash/SharedFlashableComponent.cs
+++ b/Content.Shared/Flash/FlashableComponent.cs
@@ -3,11 +3,11 @@ using Robust.Shared.Serialization;
 
 namespace Content.Shared.Flash
 {
-    [NetworkedComponent, Access(typeof(SharedFlashSystem))]
-    public abstract class SharedFlashableComponent : Component
+    [RegisterComponent, NetworkedComponent]
+    public sealed class FlashableComponent : Component
     {
-        public float Duration { get; set; }
-        public TimeSpan LastFlash { get; set; }
+        public float Duration;
+        public TimeSpan LastFlash;
 
         public override bool SendOnlyToOwner => true;
     }
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index 672ac17b6b..16fdbfc2f3 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -8,10 +8,10 @@ namespace Content.Shared.Flash
         {
             base.Initialize();
 
-            SubscribeLocalEvent<SharedFlashableComponent, ComponentGetState>(OnFlashableGetState);
+            SubscribeLocalEvent<FlashableComponent, ComponentGetState>(OnFlashableGetState);
         }
 
-        private static void OnFlashableGetState(EntityUid uid, SharedFlashableComponent component, ref ComponentGetState args)
+        private static void OnFlashableGetState(EntityUid uid, FlashableComponent component, ref ComponentGetState args)
         {
             args.State = new FlashableComponentState(component.Duration, component.LastFlash);
         }
diff --git a/Content.Shared/Humanoid/SharedHumanoidComponent.cs b/Content.Shared/Humanoid/HumanoidComponent.cs
similarity index 57%
rename from Content.Shared/Humanoid/SharedHumanoidComponent.cs
rename to Content.Shared/Humanoid/HumanoidComponent.cs
index 452f958c7c..e85a5ba2fe 100644
--- a/Content.Shared/Humanoid/SharedHumanoidComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidComponent.cs
@@ -1,10 +1,14 @@
+using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
+using Robust.Shared.Enums;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Humanoid;
 
-public abstract class SharedHumanoidComponent : Component
+[RegisterComponent, NetworkedComponent]
+public sealed class HumanoidComponent : Component
 {
     /// <summary>
     ///     Current species. Dictates things like base body sprites,
@@ -32,6 +36,40 @@ public abstract class SharedHumanoidComponent : Component
     [ViewVariables] public readonly HashSet<HumanoidVisualLayers> HiddenLayers = new();
 
     [DataField("sex")] public Sex Sex = Sex.Male;
+
+    public MarkingSet CurrentMarkings = new();
+
+    /// <summary>
+    ///     Any custom base layers this humanoid might have. See:
+    ///     limb transplants (potentially), robotic arms, etc.
+    ///     Stored on the server, this is merged in the client into
+    ///     all layer settings.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers = new();
+
+    public HashSet<HumanoidVisualLayers> PermanentlyHidden = new();
+
+    public HashSet<HumanoidVisualLayers> AllHiddenLayers
+    {
+        get
+        {
+            var result = new HashSet<HumanoidVisualLayers>(HiddenLayers);
+            result.UnionWith(PermanentlyHidden);
+
+            return result;
+        }
+    }
+
+    // Couldn't these be somewhere else?
+    [ViewVariables] public Gender Gender = default!;
+    [ViewVariables] public int Age = 18;
+
+    [ViewVariables] public List<Marking> CurrentClientMarkings = new();
+
+    public Dictionary<HumanoidVisualLayers, HumanoidSpeciesSpriteLayer> BaseLayers = new();
+
+    public string LastSpecies = default!;
 }
 
 [DataDefinition]
diff --git a/Content.Shared/Materials/SharedMaterialStorageSystem.cs b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
index 166af76275..610ef94843 100644
--- a/Content.Shared/Materials/SharedMaterialStorageSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
@@ -165,7 +165,7 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
                 return false;
         }
 
-        var multiplier = TryComp<SharedStackComponent>(toInsert, out var stackComponent) ? stackComponent.Count : 1;
+        var multiplier = TryComp<StackComponent>(toInsert, out var stackComponent) ? stackComponent.Count : 1;
         var totalVolume = 0;
         foreach (var (mat, vol) in component.Storage)
         {
diff --git a/Content.Shared/Projectiles/SharedProjectileComponent.cs b/Content.Shared/Projectiles/ProjectileComponent.cs
similarity index 50%
rename from Content.Shared/Projectiles/SharedProjectileComponent.cs
rename to Content.Shared/Projectiles/ProjectileComponent.cs
index f0d7b2f926..06935bc5a8 100644
--- a/Content.Shared/Projectiles/SharedProjectileComponent.cs
+++ b/Content.Shared/Projectiles/ProjectileComponent.cs
@@ -1,11 +1,13 @@
+using Content.Shared.Damage;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Projectiles
 {
-    [NetworkedComponent, Access(typeof(SharedProjectileSystem))]
-    public abstract class SharedProjectileComponent : Component
+    [RegisterComponent, NetworkedComponent]
+    public sealed class ProjectileComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite), DataField("impactEffect", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? ImpactEffect;
@@ -24,5 +26,23 @@ namespace Content.Shared.Projectiles
                 Dirty();
             }
         }
+
+        [DataField("damage", required: true)]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public DamageSpecifier Damage = default!;
+
+        [DataField("deleteOnCollide")]
+        public bool DeleteOnCollide { get; } = true;
+
+        [DataField("ignoreResistances")]
+        public bool IgnoreResistances { get; } = false;
+
+        // Get that juicy FPS hit sound
+        [DataField("soundHit")] public SoundSpecifier? SoundHit;
+
+        [DataField("soundForce")]
+        public bool ForceSound = false;
+
+        public bool DamagedEntity;
     }
 }
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 47a66c4853..ae7000b461 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -12,10 +12,10 @@ namespace Content.Shared.Projectiles
         public override void Initialize()
         {
             base.Initialize();
-            SubscribeLocalEvent<SharedProjectileComponent, PreventCollideEvent>(PreventCollision);
+            SubscribeLocalEvent<ProjectileComponent, PreventCollideEvent>(PreventCollision);
         }
 
-        private void PreventCollision(EntityUid uid, SharedProjectileComponent component, ref PreventCollideEvent args)
+        private void PreventCollision(EntityUid uid, ProjectileComponent component, ref PreventCollideEvent args)
         {
             if (component.IgnoreShooter && args.BodyB.Owner == component.Shooter)
             {
@@ -23,7 +23,7 @@ namespace Content.Shared.Projectiles
             }
         }
 
-        public void SetShooter(SharedProjectileComponent component, EntityUid uid)
+        public void SetShooter(ProjectileComponent component, EntityUid uid)
         {
             if (component.Shooter == uid) return;
 
diff --git a/Content.Shared/Singularity/Components/SharedSingularityComponent.cs b/Content.Shared/Singularity/Components/SharedSingularityComponent.cs
deleted file mode 100644
index 84acdd0880..0000000000
--- a/Content.Shared/Singularity/Components/SharedSingularityComponent.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Robust.Shared.GameStates;
-
-using Content.Shared.Singularity.EntitySystems;
-
-namespace Content.Shared.Singularity.Components;
-
-/// <summary>
-/// A component that makes the associated entity accumulate energy when an associated event horizon consumes things.
-/// Energy management is server-side.
-/// </summary>
-[NetworkedComponent]
-public abstract class SharedSingularityComponent : Component
-{
-    /// <summary>
-    /// The current level of the singularity.
-    /// Used as a scaling factor for things like visual size, event horizon radius, gravity well radius, radiation output, etc.
-    /// If you want to set this use <see cref="SharedSingularitySystem.SetLevel"/>().
-    /// </summary>
-    [DataField("level")]
-    [Access(friends:typeof(SharedSingularitySystem), Other=AccessPermissions.Read, Self=AccessPermissions.Read)]
-    public byte Level = 1;
-
-    /// <summary>
-    /// The amount of radiation this singularity emits per its level.
-    /// Has to be on shared in case someone attaches a RadiationPulseComponent to the singularity.
-    /// If you want to set this use <see cref="SharedSingularitySystem.SetRadsPerLevel"/>().
-    /// </summary>
-    [DataField("radsPerLevel")]
-    [Access(friends:typeof(SharedSingularitySystem), Other=AccessPermissions.Read, Self=AccessPermissions.Read)]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float RadsPerLevel = 2f;
-}
diff --git a/Content.Server/Singularity/Components/SingularityComponent.cs b/Content.Shared/Singularity/Components/SingularityComponent.cs
similarity index 55%
rename from Content.Server/Singularity/Components/SingularityComponent.cs
rename to Content.Shared/Singularity/Components/SingularityComponent.cs
index 7a67b9ba49..64ac2d6ef0 100644
--- a/Content.Server/Singularity/Components/SingularityComponent.cs
+++ b/Content.Shared/Singularity/Components/SingularityComponent.cs
@@ -1,23 +1,40 @@
-using Content.Shared.Singularity.Components;
-using Content.Server.Singularity.EntitySystems;
+using Robust.Shared.GameStates;
+
+using Content.Shared.Singularity.EntitySystems;
 using Robust.Shared.Audio;
 
-namespace Content.Server.Singularity.Components;
+namespace Content.Shared.Singularity.Components;
 
 /// <summary>
-/// The server-side version of <see cref="SharedSingularityComponent">.
-/// Primarily managed by <see cref="SingularitySystem">.
+/// A component that makes the associated entity accumulate energy when an associated event horizon consumes things.
+/// Energy management is server-side.
 /// </summary>
-[RegisterComponent]
-[ComponentReference(typeof(SharedSingularityComponent))]
-public sealed class SingularityComponent : SharedSingularityComponent
+[RegisterComponent, NetworkedComponent]
+public sealed class SingularityComponent : Component
 {
+    /// <summary>
+    /// The current level of the singularity.
+    /// Used as a scaling factor for things like visual size, event horizon radius, gravity well radius, radiation output, etc.
+    /// If you want to set this use <see cref="SharedSingularitySystem.SetLevel"/>().
+    /// </summary>
+    [DataField("level")]
+    [Access(friends:typeof(SharedSingularitySystem), Other=AccessPermissions.Read, Self=AccessPermissions.Read)]
+    public byte Level = 1;
+
+    /// <summary>
+    /// The amount of radiation this singularity emits per its level.
+    /// Has to be on shared in case someone attaches a RadiationPulseComponent to the singularity.
+    /// If you want to set this use <see cref="SharedSingularitySystem.SetRadsPerLevel"/>().
+    /// </summary>
+    [DataField("radsPerLevel")]
+    [Access(friends:typeof(SharedSingularitySystem), Other=AccessPermissions.Read, Self=AccessPermissions.Read)]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float RadsPerLevel = 2f;
+
     /// <summary>
     /// The amount of energy this singularity contains.
-    /// If you want to set this go through <see cref="SingularitySystem.SetEnergy"/>
     /// </summary>
     [DataField("energy")]
-    [Access(friends:typeof(SingularitySystem))]
     public float Energy = 180f;
 
     /// <summary>
@@ -40,7 +57,7 @@ public sealed class SingularityComponent : SharedSingularityComponent
     );
 
     /// <summary>
-    /// The audio stream that plays the sound specified by <see cref="AmbientSound"> on loop.
+    /// The audio stream that plays the sound specified by <see cref="AmbientSound"/> on loop.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     public IPlayingAudioStream? AmbientSoundStream = null;
@@ -71,22 +88,18 @@ public sealed class SingularityComponent : SharedSingularityComponent
     /// </summary>
     [DataField("updatePeriod")]
     [ViewVariables(VVAccess.ReadOnly)]
-    [Access(typeof(SingularitySystem))]
-    public TimeSpan TargetUpdatePeriod { get; internal set; } = TimeSpan.FromSeconds(1.0);
+    public TimeSpan TargetUpdatePeriod = TimeSpan.FromSeconds(1.0);
 
     /// <summary>
-    /// The next time this singularity should be updated by <see cref="SingularitySystem"/>
     /// </summary>
     [ViewVariables(VVAccess.ReadOnly)]
-    [Access(typeof(SingularitySystem))]
-    public TimeSpan NextUpdateTime { get; internal set; } = default!;
+    public TimeSpan NextUpdateTime = default!;
 
     /// <summary>
-    /// The last time this singularity was be updated by <see cref="SingularitySystem"/>
+    /// The last time this singularity was updated.
     /// </summary>
     [ViewVariables(VVAccess.ReadOnly)]
-    [Access(typeof(SingularitySystem))]
-    public TimeSpan LastUpdateTime { get; internal set; } = default!;
+    public TimeSpan LastUpdateTime = default!;
 
     #endregion Update Timing
 }
diff --git a/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs b/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs
index 34c0b6ef88..e5890676c4 100644
--- a/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs
+++ b/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs
@@ -10,7 +10,7 @@ using Content.Shared.Singularity.Events;
 namespace Content.Shared.Singularity.EntitySystems;
 
 /// <summary>
-/// The entity system primarily responsible for managing <see cref="SharedSingularityComponent"/>s.
+/// The entity system primarily responsible for managing <see cref="SingularityComponent"/>s.
 /// </summary>
 public abstract class SharedSingularitySystem : EntitySystem
 {
@@ -44,7 +44,7 @@ public abstract class SharedSingularitySystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SharedSingularityComponent, ComponentStartup>(OnSingularityStartup);
+        SubscribeLocalEvent<SingularityComponent, ComponentStartup>(OnSingularityStartup);
         SubscribeLocalEvent<AppearanceComponent, SingularityLevelChangedEvent>(UpdateAppearance);
         SubscribeLocalEvent<RadiationSourceComponent, SingularityLevelChangedEvent>(UpdateRadiation);
         SubscribeLocalEvent<PhysicsComponent, SingularityLevelChangedEvent>(UpdateBody);
@@ -53,16 +53,16 @@ public abstract class SharedSingularitySystem : EntitySystem
         SubscribeLocalEvent<SingularityDistortionComponent, EntGotInsertedIntoContainerMessage>(UpdateDistortion);
         SubscribeLocalEvent<SingularityDistortionComponent, EntGotRemovedFromContainerMessage>(UpdateDistortion);
 
-        var vvHandle = Vvm.GetTypeHandler<SharedSingularityComponent>();
-        vvHandle.AddPath(nameof(SharedSingularityComponent.Level), (_, comp) => comp.Level, SetLevel);
-        vvHandle.AddPath(nameof(SharedSingularityComponent.RadsPerLevel), (_, comp) => comp.RadsPerLevel, SetRadsPerLevel);
+        var vvHandle = Vvm.GetTypeHandler<SingularityComponent>();
+        vvHandle.AddPath(nameof(SingularityComponent.Level), (_, comp) => comp.Level, SetLevel);
+        vvHandle.AddPath(nameof(SingularityComponent.RadsPerLevel), (_, comp) => comp.RadsPerLevel, SetRadsPerLevel);
     }
 
     public override void Shutdown()
     {
-        var vvHandle = Vvm.GetTypeHandler<SharedSingularityComponent>();
-        vvHandle.RemovePath(nameof(SharedSingularityComponent.Level));
-        vvHandle.RemovePath(nameof(SharedSingularityComponent.RadsPerLevel));
+        var vvHandle = Vvm.GetTypeHandler<SingularityComponent>();
+        vvHandle.RemovePath(nameof(SingularityComponent.Level));
+        vvHandle.RemovePath(nameof(SingularityComponent.RadsPerLevel));
 
         base.Shutdown();
     }
@@ -70,13 +70,13 @@ public abstract class SharedSingularitySystem : EntitySystem
 #region Getters/Setters
 
     /// <summary>
-    /// Setter for <see cref="SharedSingularityComponent.Level"/>
+    /// Setter for <see cref="SingularityComponent.Level"/>
     /// Also sends out an event alerting that the singularities level has changed.
     /// </summary>
     /// <param name="uid">The uid of the singularity to change the level of.</param>
     /// <param name="value">The new level the singularity should have.</param>
     /// <param name="singularity">The state of the singularity to change the level of.</param>
-    public void SetLevel(EntityUid uid, byte value, SharedSingularityComponent? singularity = null)
+    public void SetLevel(EntityUid uid, byte value, SingularityComponent? singularity = null)
     {
         if(!Resolve(uid, ref singularity))
             return;
@@ -93,13 +93,13 @@ public abstract class SharedSingularitySystem : EntitySystem
     }
 
     /// <summary>
-    /// Setter for <see cref="SharedSingularityComponent.RadsPerLevel"/>
+    /// Setter for <see cref="SingularityComponent.RadsPerLevel"/>
     /// Also updates the radiation output of the singularity according to the new values.
     /// </summary>
     /// <param name="uid">The uid of the singularity to change the radioactivity of.</param>
     /// <param name="value">The new radioactivity the singularity should have.</param>
     /// <param name="singularity">The state of the singularity to change the radioactivity of.</param>
-    public void SetRadsPerLevel(EntityUid uid, float value, SharedSingularityComponent? singularity = null)
+    public void SetRadsPerLevel(EntityUid uid, float value, SingularityComponent? singularity = null)
     {
         if(!Resolve(uid, ref singularity))
             return;
@@ -117,9 +117,9 @@ public abstract class SharedSingularitySystem : EntitySystem
     /// Usually follows a SharedSingularitySystem.SetLevel call, but is also used on component startup to sync everything.
     /// </summary>
     /// <param name="uid">The uid of the singularity which's level has changed.</param>
-    /// <param name="oldValue">The old level of the singularity. May be equal to <see cref="SharedSingularityComponent.Level"/> if the component is starting.</param>
+    /// <param name="oldValue">The old level of the singularity. May be equal to <see cref="SingularityComponent.Level"/> if the component is starting.</param>
     /// <param name="singularity">The state of the singularity which's level has changed.</param>
-    public void UpdateSingularityLevel(EntityUid uid, byte oldValue, SharedSingularityComponent? singularity = null)
+    public void UpdateSingularityLevel(EntityUid uid, byte oldValue, SingularityComponent? singularity = null)
     {
         if(!Resolve(uid, ref singularity))
             return;
@@ -135,7 +135,7 @@ public abstract class SharedSingularitySystem : EntitySystem
     /// </summary>
     /// <param name="uid">The uid of the singularity.</param>
     /// <param name="singularity">The state of the singularity.</param>
-    public void UpdateSingularityLevel(EntityUid uid, SharedSingularityComponent? singularity = null)
+    public void UpdateSingularityLevel(EntityUid uid, SingularityComponent? singularity = null)
     {
         if (Resolve(uid, ref singularity))
             UpdateSingularityLevel(uid, singularity.Level, singularity);
@@ -147,7 +147,7 @@ public abstract class SharedSingularitySystem : EntitySystem
     /// <param name="uid">The uid of the singularity to update the radiation of.</param>
     /// <param name="singularity">The state of the singularity to update the radiation of.</param>
     /// <param name="rads">The state of the radioactivity of the singularity to update.</param>
-    private void UpdateRadiation(EntityUid uid, SharedSingularityComponent? singularity = null, RadiationSourceComponent? rads = null)
+    private void UpdateRadiation(EntityUid uid, SingularityComponent? singularity = null, RadiationSourceComponent? rads = null)
     {
         if(!Resolve(uid, ref singularity, ref rads, logMissing: false))
             return;
@@ -177,7 +177,7 @@ public abstract class SharedSingularitySystem : EntitySystem
     /// </summary>
     /// <param name="singulo">A singularity.</param>
     /// <returns>The gravity well radius the singularity should have given its state.</returns>
-    public float GravPulseRange(SharedSingularityComponent singulo)
+    public float GravPulseRange(SingularityComponent singulo)
         => BaseGravityWellRadius * (singulo.Level + 1);
 
     /// <summary>
@@ -185,7 +185,7 @@ public abstract class SharedSingularitySystem : EntitySystem
     /// </summary>
     /// <param name="singulo">A singularity.</param>
     /// <returns>The base gravitational acceleration the singularity should have given its state.</returns>
-    public (float, float) GravPulseAcceleration(SharedSingularityComponent singulo)
+    public (float, float) GravPulseAcceleration(SingularityComponent singulo)
         => (BaseGravityWellAcceleration * singulo.Level, 0f);
 
     /// <summary>
@@ -193,7 +193,7 @@ public abstract class SharedSingularitySystem : EntitySystem
     /// </summary>
     /// <param name="singulo">A singularity.</param>
     /// <returns>The event horizon radius the singularity should have given its state.</returns>
-    public float EventHorizonRadius(SharedSingularityComponent singulo)
+    public float EventHorizonRadius(SingularityComponent singulo)
         => (float) singulo.Level - 0.5f;
 
     /// <summary>
@@ -201,7 +201,7 @@ public abstract class SharedSingularitySystem : EntitySystem
     /// </summary>
     /// <param name="singulo">A singularity.</param>
     /// <returns>Whether the singularity should be able to breach containment.</returns>
-    public bool CanBreachContainment(SharedSingularityComponent singulo)
+    public bool CanBreachContainment(SingularityComponent singulo)
         => singulo.Level >= SingularityBreachThreshold;
 
     /// <summary>
@@ -255,7 +255,7 @@ public abstract class SharedSingularitySystem : EntitySystem
         /// </summary>
         public readonly byte Level;
 
-        public SingularityComponentState(SharedSingularityComponent singulo)
+        public SingularityComponentState(SingularityComponent singulo)
         {
             Level = singulo.Level;
         }
@@ -269,7 +269,7 @@ public abstract class SharedSingularitySystem : EntitySystem
     /// <param name="uid">The entity that is becoming a singularity.</param>
     /// <param name="comp">The singularity component that is being added to the entity.</param>
     /// <param name="args">The event arguments.</param>
-    protected virtual void OnSingularityStartup(EntityUid uid, SharedSingularityComponent comp, ComponentStartup args)
+    protected virtual void OnSingularityStartup(EntityUid uid, SingularityComponent comp, ComponentStartup args)
     {
         UpdateSingularityLevel(uid, comp);
     }
diff --git a/Content.Shared/Singularity/Events/SingularityLevelChangedEvent.cs b/Content.Shared/Singularity/Events/SingularityLevelChangedEvent.cs
index ba23523f84..dd2791f045 100644
--- a/Content.Shared/Singularity/Events/SingularityLevelChangedEvent.cs
+++ b/Content.Shared/Singularity/Events/SingularityLevelChangedEvent.cs
@@ -20,9 +20,9 @@ public sealed class SingularityLevelChangedEvent : EntityEventArgs
     /// <summary>
     /// The singularity that just changed level.
     /// </summary>
-    public readonly SharedSingularityComponent Singularity;
+    public readonly SingularityComponent Singularity;
 
-    public SingularityLevelChangedEvent(byte newValue, byte oldValue, SharedSingularityComponent singularity)
+    public SingularityLevelChangedEvent(byte newValue, byte oldValue, SingularityComponent singularity)
     {
         NewValue = newValue;
         OldValue = oldValue;
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index 678ee81fd1..39f9ba4fef 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -26,30 +26,30 @@ namespace Content.Shared.Stacks
         {
             base.Initialize();
 
-            SubscribeLocalEvent<SharedStackComponent, ComponentGetState>(OnStackGetState);
-            SubscribeLocalEvent<SharedStackComponent, ComponentHandleState>(OnStackHandleState);
-            SubscribeLocalEvent<SharedStackComponent, ComponentStartup>(OnStackStarted);
-            SubscribeLocalEvent<SharedStackComponent, ExaminedEvent>(OnStackExamined);
-            SubscribeLocalEvent<SharedStackComponent, InteractUsingEvent>(OnStackInteractUsing);
+            SubscribeLocalEvent<StackComponent, ComponentGetState>(OnStackGetState);
+            SubscribeLocalEvent<StackComponent, ComponentHandleState>(OnStackHandleState);
+            SubscribeLocalEvent<StackComponent, ComponentStartup>(OnStackStarted);
+            SubscribeLocalEvent<StackComponent, ExaminedEvent>(OnStackExamined);
+            SubscribeLocalEvent<StackComponent, InteractUsingEvent>(OnStackInteractUsing);
 
-            _vvm.GetTypeHandler<SharedStackComponent>()
-                .AddPath(nameof(SharedStackComponent.Count), (_, comp) => comp.Count, SetCount);
+            _vvm.GetTypeHandler<StackComponent>()
+                .AddPath(nameof(StackComponent.Count), (_, comp) => comp.Count, SetCount);
         }
 
         public override void Shutdown()
         {
             base.Shutdown();
 
-            _vvm.GetTypeHandler<SharedStackComponent>()
-                .RemovePath(nameof(SharedStackComponent.Count));
+            _vvm.GetTypeHandler<StackComponent>()
+                .RemovePath(nameof(StackComponent.Count));
         }
 
-        private void OnStackInteractUsing(EntityUid uid, SharedStackComponent stack, InteractUsingEvent args)
+        private void OnStackInteractUsing(EntityUid uid, StackComponent stack, InteractUsingEvent args)
         {
             if (args.Handled)
                 return;
 
-            if (!TryComp(args.Used, out SharedStackComponent? recipientStack))
+            if (!TryComp(args.Used, out StackComponent? recipientStack))
                 return;
 
             if (!TryMergeStacks(uid, args.Used, out var transfered, stack, recipientStack))
@@ -92,8 +92,8 @@ namespace Content.Shared.Stacks
             EntityUid donor,
             EntityUid recipient,
             out int transfered,
-            SharedStackComponent? donorStack = null,
-            SharedStackComponent? recipientStack = null)
+            StackComponent? donorStack = null,
+            StackComponent? recipientStack = null)
         {
             transfered = 0;
             if (!Resolve(recipient, ref recipientStack, false) || !Resolve(donor, ref donorStack, false))
@@ -118,7 +118,7 @@ namespace Content.Shared.Stacks
         public void TryMergeToHands(
             EntityUid item,
             EntityUid user,
-            SharedStackComponent? itemStack = null,
+            StackComponent? itemStack = null,
             SharedHandsComponent? hands = null)
         {
             if (!Resolve(user, ref hands, false))
@@ -143,7 +143,7 @@ namespace Content.Shared.Stacks
             HandsSystem.PickupOrDrop(user, item, handsComp: hands);
         }
 
-        public virtual void SetCount(EntityUid uid, int amount, SharedStackComponent? component = null)
+        public virtual void SetCount(EntityUid uid, int amount, StackComponent? component = null)
         {
             if (!Resolve(uid, ref component))
                 return;
@@ -169,7 +169,7 @@ namespace Content.Shared.Stacks
         /// <summary>
         ///     Try to use an amount of items on this stack. Returns whether this succeeded.
         /// </summary>
-        public bool Use(EntityUid uid, int amount, SharedStackComponent? stack = null)
+        public bool Use(EntityUid uid, int amount, StackComponent? stack = null)
         {
             if (!Resolve(uid, ref stack))
                 return false;
@@ -199,7 +199,7 @@ namespace Content.Shared.Stacks
         public int GetMaxCount(string entityId)
         {
             var entProto = _prototype.Index<EntityPrototype>(entityId);
-            entProto.TryGetComponent<SharedStackComponent>(out var stackComp);
+            entProto.TryGetComponent<StackComponent>(out var stackComp);
             return GetMaxCount(stackComp);
         }
 
@@ -211,7 +211,7 @@ namespace Content.Shared.Stacks
         [PublicAPI]
         public int GetMaxCount(EntityUid uid)
         {
-            return GetMaxCount(CompOrNull<SharedStackComponent>(uid));
+            return GetMaxCount(CompOrNull<StackComponent>(uid));
         }
 
         /// <summary>
@@ -227,7 +227,7 @@ namespace Content.Shared.Stacks
         /// </remarks>
         /// <param name="component"></param>
         /// <returns></returns>
-        public int GetMaxCount(SharedStackComponent? component)
+        public int GetMaxCount(StackComponent? component)
         {
             if (component == null)
                 return 1;
@@ -249,12 +249,12 @@ namespace Content.Shared.Stacks
         /// <param name="component"></param>
         /// <returns></returns>
         [PublicAPI]
-        public int GetAvailableSpace(SharedStackComponent component)
+        public int GetAvailableSpace(StackComponent component)
         {
             return GetMaxCount(component) - component.Count;
         }
 
-        private void OnStackStarted(EntityUid uid, SharedStackComponent component, ComponentStartup args)
+        private void OnStackStarted(EntityUid uid, StackComponent component, ComponentStartup args)
         {
             if (!TryComp(uid, out AppearanceComponent? appearance))
                 return;
@@ -264,12 +264,12 @@ namespace Content.Shared.Stacks
             Appearance.SetData(uid, StackVisuals.Hide, false, appearance);
         }
 
-        private void OnStackGetState(EntityUid uid, SharedStackComponent component, ref ComponentGetState args)
+        private void OnStackGetState(EntityUid uid, StackComponent component, ref ComponentGetState args)
         {
             args.State = new StackComponentState(component.Count, GetMaxCount(component));
         }
 
-        private void OnStackHandleState(EntityUid uid, SharedStackComponent component, ref ComponentHandleState args)
+        private void OnStackHandleState(EntityUid uid, StackComponent component, ref ComponentHandleState args)
         {
             if (args.Current is not StackComponentState cast)
                 return;
@@ -279,7 +279,7 @@ namespace Content.Shared.Stacks
             SetCount(uid, cast.Count, component);
         }
 
-        private void OnStackExamined(EntityUid uid, SharedStackComponent component, ExaminedEvent args)
+        private void OnStackExamined(EntityUid uid, StackComponent component, ExaminedEvent args)
         {
             if (!args.IsInDetailsRange)
                 return;
diff --git a/Content.Shared/Stacks/SharedStackComponent.cs b/Content.Shared/Stacks/StackComponent.cs
similarity index 84%
rename from Content.Shared/Stacks/SharedStackComponent.cs
rename to Content.Shared/Stacks/StackComponent.cs
index 0a243027fe..719229c8a5 100644
--- a/Content.Shared/Stacks/SharedStackComponent.cs
+++ b/Content.Shared/Stacks/StackComponent.cs
@@ -4,8 +4,8 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Shared.Stacks
 {
-    [NetworkedComponent, Access(typeof(SharedStackSystem))]
-    public abstract class SharedStackComponent : Component
+    [RegisterComponent, NetworkedComponent]
+    public sealed class StackComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("stackType", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<StackPrototype>))]
@@ -32,6 +32,12 @@ namespace Content.Shared.Stacks
         [DataField("unlimited")]
         [ViewVariables(VVAccess.ReadOnly)]
         public bool Unlimited { get; set; }
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool ThrowIndividually { get; set; } = false;
+
+        [ViewVariables]
+        public bool UiUpdateNeeded { get; set; }
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index 6e7c00ea0e..78dee5ddee 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -32,7 +32,7 @@ namespace Content.Shared.Stacks
 
         /// <summary>
         ///     The maximum amount of things that can be in a stack.
-        ///     Can be overriden on <see cref="SharedStackComponent"/>
+        ///     Can be overriden on <see cref="StackComponent"/>
         ///     if null, simply has unlimited max count.
         /// </summary>
         [DataField("maxCount")]
diff --git a/Content.Shared/Tools/Components/SharedMultipleToolComponent.cs b/Content.Shared/Tools/Components/MultipleToolComponent.cs
similarity index 67%
rename from Content.Shared/Tools/Components/SharedMultipleToolComponent.cs
rename to Content.Shared/Tools/Components/MultipleToolComponent.cs
index fd05aa3ba5..b40afbc134 100644
--- a/Content.Shared/Tools/Components/SharedMultipleToolComponent.cs
+++ b/Content.Shared/Tools/Components/MultipleToolComponent.cs
@@ -5,23 +5,23 @@ using Robust.Shared.Utility;
 
 namespace Content.Shared.Tools.Components
 {
-    [NetworkedComponent]
-    public abstract class SharedMultipleToolComponent : Component
+    [RegisterComponent, NetworkedComponent]
+    public sealed class MultipleToolComponent : Component
     {
         [DataDefinition]
         public sealed class ToolEntry
         {
             [DataField("behavior", required: true)]
-            public PrototypeFlags<ToolQualityPrototype> Behavior { get; } = new();
+            public PrototypeFlags<ToolQualityPrototype> Behavior = new();
 
             [DataField("useSound")]
-            public SoundSpecifier? Sound { get; } = null;
+            public SoundSpecifier? Sound;
 
             [DataField("changeSound")]
-            public SoundSpecifier? ChangeSound { get; } = null;
+            public SoundSpecifier? ChangeSound;
 
             [DataField("sprite")]
-            public SpriteSpecifier? Sprite { get; } = null;
+            public SpriteSpecifier? Sprite;
         }
 
         [DataField("entries", required: true)]
@@ -31,7 +31,13 @@ namespace Content.Shared.Tools.Components
         public uint CurrentEntry = 0;
 
         [ViewVariables]
-        public string CurrentQualityName = String.Empty;
+        public string CurrentQualityName = string.Empty;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool UiUpdateNeeded;
+
+        [DataField("statusShowBehavior")]
+        public bool StatusShowBehavior = true;
     }
 
     [NetSerializable, Serializable]
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
index 4f71de930e..2bfe09ecbd 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
@@ -13,13 +13,13 @@ public abstract class SharedToolSystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<SharedMultipleToolComponent, ComponentStartup>(OnMultipleToolStartup);
-        SubscribeLocalEvent<SharedMultipleToolComponent, ActivateInWorldEvent>(OnMultipleToolActivated);
-        SubscribeLocalEvent<SharedMultipleToolComponent, ComponentGetState>(OnMultipleToolGetState);
-        SubscribeLocalEvent<SharedMultipleToolComponent, ComponentHandleState>(OnMultipleToolHandleState);
+        SubscribeLocalEvent<MultipleToolComponent, ComponentStartup>(OnMultipleToolStartup);
+        SubscribeLocalEvent<MultipleToolComponent, ActivateInWorldEvent>(OnMultipleToolActivated);
+        SubscribeLocalEvent<MultipleToolComponent, ComponentGetState>(OnMultipleToolGetState);
+        SubscribeLocalEvent<MultipleToolComponent, ComponentHandleState>(OnMultipleToolHandleState);
     }
 
-    private void OnMultipleToolHandleState(EntityUid uid, SharedMultipleToolComponent component, ref ComponentHandleState args)
+    private void OnMultipleToolHandleState(EntityUid uid, MultipleToolComponent component, ref ComponentHandleState args)
     {
         if (args.Current is not MultipleToolComponentState state)
             return;
@@ -28,14 +28,14 @@ public abstract class SharedToolSystem : EntitySystem
         SetMultipleTool(uid, component);
     }
 
-    private void OnMultipleToolStartup(EntityUid uid, SharedMultipleToolComponent multiple, ComponentStartup args)
+    private void OnMultipleToolStartup(EntityUid uid, MultipleToolComponent multiple, ComponentStartup args)
     {
         // Only set the multiple tool if we have a tool component.
         if(EntityManager.TryGetComponent(uid, out ToolComponent? tool))
             SetMultipleTool(uid, multiple, tool);
     }
 
-    private void OnMultipleToolActivated(EntityUid uid, SharedMultipleToolComponent multiple, ActivateInWorldEvent args)
+    private void OnMultipleToolActivated(EntityUid uid, MultipleToolComponent multiple, ActivateInWorldEvent args)
     {
         if (args.Handled)
             return;
@@ -43,12 +43,12 @@ public abstract class SharedToolSystem : EntitySystem
         args.Handled = CycleMultipleTool(uid, multiple, args.User);
     }
 
-    private void OnMultipleToolGetState(EntityUid uid, SharedMultipleToolComponent multiple, ref ComponentGetState args)
+    private void OnMultipleToolGetState(EntityUid uid, MultipleToolComponent multiple, ref ComponentGetState args)
     {
         args.State = new MultipleToolComponentState(multiple.CurrentEntry);
     }
 
-    public bool CycleMultipleTool(EntityUid uid, SharedMultipleToolComponent? multiple = null, EntityUid? user = null)
+    public bool CycleMultipleTool(EntityUid uid, MultipleToolComponent? multiple = null, EntityUid? user = null)
     {
         if (!Resolve(uid, ref multiple))
             return false;
@@ -63,7 +63,7 @@ public abstract class SharedToolSystem : EntitySystem
     }
 
     public virtual void SetMultipleTool(EntityUid uid,
-        SharedMultipleToolComponent? multiple = null,
+        MultipleToolComponent? multiple = null,
         ToolComponent? tool = null,
         bool playSound = false,
         EntityUid? user = null)
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs b/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs
deleted file mode 100644
index c658c308f0..0000000000
--- a/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.VendingMachines
-{
-    [NetworkedComponent()]
-    public abstract class SharedVendingMachineComponent : Component
-    {
-        /// <summary>
-        /// PrototypeID for the vending machine's inventory, see <see cref="VendingMachineInventoryPrototype"/>
-        /// </summary>
-        [DataField("pack", customTypeSerializer: typeof(PrototypeIdSerializer<VendingMachineInventoryPrototype>))]
-        public string PackPrototypeId = string.Empty;
-
-        /// <summary>
-        /// Used by the server to determine how long the vending machine stays in the "Deny" state.
-        /// Used by the client to determine how long the deny animation should be played.
-        /// </summary>
-        [DataField("denyDelay")]
-        public float DenyDelay = 2.0f;
-
-        /// <summary>
-        /// Used by the server to determine how long the vending machine stays in the "Eject" state.
-        /// The selected item is dispensed afer this delay.
-        /// Used by the client to determine how long the deny animation should be played.
-        /// </summary>
-        [DataField("ejectDelay")]
-        public float EjectDelay = 1.2f;
-
-        [ViewVariables]
-        public Dictionary<string, VendingMachineInventoryEntry> Inventory = new();
-
-        [ViewVariables]
-        public Dictionary<string, VendingMachineInventoryEntry> EmaggedInventory = new();
-
-        [ViewVariables]
-        public Dictionary<string, VendingMachineInventoryEntry> ContrabandInventory = new();
-
-        public bool Emagged;
-        public bool Contraband;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class VendingMachineInventoryEntry
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        public InventoryType Type;
-        [ViewVariables(VVAccess.ReadWrite)]
-        public string ID;
-        [ViewVariables(VVAccess.ReadWrite)]
-        public uint Amount;
-        public VendingMachineInventoryEntry(InventoryType type, string id, uint amount)
-        {
-            Type = type;
-            ID = id;
-            Amount = amount;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public enum InventoryType : byte
-    {
-        Regular,
-        Emagged,
-        Contraband
-    }
-
-    [Serializable, NetSerializable]
-    public enum VendingMachineVisuals
-    {
-        VisualState
-    }
-
-    [Serializable, NetSerializable]
-    public enum VendingMachineVisualState
-    {
-        Normal,
-        Off,
-        Broken,
-        Eject,
-        Deny,
-    }
-
-    [Serializable, NetSerializable]
-    public enum ContrabandWireKey : byte
-    {
-        StatusKey,
-        TimeoutKey
-    }
-
-    [Serializable, NetSerializable]
-    public enum EjectWireKey : byte
-    {
-        StatusKey,
-    }
-
-    public sealed class VendingMachineSelfDispenseEvent : InstantActionEvent { };
-}
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
index 96ba55c899..11436fa57c 100644
--- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
@@ -1,6 +1,5 @@
 using Robust.Shared.Prototypes;
 using System.Linq;
-using static Content.Shared.VendingMachines.SharedVendingMachineComponent;
 
 namespace Content.Shared.VendingMachines;
 
@@ -11,10 +10,10 @@ public abstract class SharedVendingMachineSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<SharedVendingMachineComponent, ComponentInit>(OnComponentInit);;
+        SubscribeLocalEvent<VendingMachineComponent, ComponentInit>(OnComponentInit);
     }
 
-    protected virtual void OnComponentInit(EntityUid uid, SharedVendingMachineComponent component, ComponentInit args)
+    protected virtual void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args)
     {
         if (!_prototypeManager.TryIndex(component.PackPrototypeId, out VendingMachineInventoryPrototype? packPrototype))
             return;
@@ -26,13 +25,13 @@ public abstract class SharedVendingMachineSystem : EntitySystem
 
     /// <summary>
     /// Returns all of the vending machine's inventory. Only includes emagged and contraband inventories if
-    /// <see cref="SharedVendingMachineComponent.Emagged"/> and <see cref="SharedVendingMachineComponent.Contraband"/>
+    /// <see cref="VendingMachineComponent.Emagged"/> and <see cref="VendingMachineComponent.Contraband"/>
     /// are <c>true</c> respectively.
     /// </summary>
     /// <param name="uid"></param>
     /// <param name="component"></param>
     /// <returns></returns>
-    public List<VendingMachineInventoryEntry> GetAllInventory(EntityUid uid, SharedVendingMachineComponent? component = null)
+    public List<VendingMachineInventoryEntry> GetAllInventory(EntityUid uid, VendingMachineComponent? component = null)
     {
         if (!Resolve(uid, ref component))
             return new();
@@ -48,7 +47,7 @@ public abstract class SharedVendingMachineSystem : EntitySystem
         return inventory;
     }
 
-    public List<VendingMachineInventoryEntry> GetAvailableInventory(EntityUid uid, SharedVendingMachineComponent? component = null)
+    public List<VendingMachineInventoryEntry> GetAvailableInventory(EntityUid uid, VendingMachineComponent? component = null)
     {
         if (!Resolve(uid, ref component))
             return new();
@@ -58,7 +57,7 @@ public abstract class SharedVendingMachineSystem : EntitySystem
 
     private void AddInventoryFromPrototype(EntityUid uid, Dictionary<string, uint>? entries,
         InventoryType type,
-        SharedVendingMachineComponent? component = null)
+        VendingMachineComponent? component = null)
     {
         if (!Resolve(uid, ref component) || entries == null)
         {
diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs
new file mode 100644
index 0000000000..1ae9562f7b
--- /dev/null
+++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs
@@ -0,0 +1,241 @@
+using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.VendingMachines
+{
+    [RegisterComponent, NetworkedComponent]
+    public sealed class VendingMachineComponent : Component
+    {
+        /// <summary>
+        /// PrototypeID for the vending machine's inventory, see <see cref="VendingMachineInventoryPrototype"/>
+        /// </summary>
+        [DataField("pack", customTypeSerializer: typeof(PrototypeIdSerializer<VendingMachineInventoryPrototype>))]
+        public string PackPrototypeId = string.Empty;
+
+        /// <summary>
+        /// Used by the server to determine how long the vending machine stays in the "Deny" state.
+        /// Used by the client to determine how long the deny animation should be played.
+        /// </summary>
+        [DataField("denyDelay")]
+        public float DenyDelay = 2.0f;
+
+        /// <summary>
+        /// Used by the server to determine how long the vending machine stays in the "Eject" state.
+        /// The selected item is dispensed afer this delay.
+        /// Used by the client to determine how long the deny animation should be played.
+        /// </summary>
+        [DataField("ejectDelay")]
+        public float EjectDelay = 1.2f;
+
+        [ViewVariables]
+        public Dictionary<string, VendingMachineInventoryEntry> Inventory = new();
+
+        [ViewVariables]
+        public Dictionary<string, VendingMachineInventoryEntry> EmaggedInventory = new();
+
+        [ViewVariables]
+        public Dictionary<string, VendingMachineInventoryEntry> ContrabandInventory = new();
+
+        public bool Emagged;
+        public bool Contraband;
+
+        public bool Ejecting;
+        public bool Denying;
+        public bool DispenseOnHitCoolingDown;
+
+        public string? NextItemToEject;
+
+        public bool Broken;
+
+        /// <summary>
+        /// When true, will forcefully throw any object it dispenses
+        /// </summary>
+        [DataField("speedLimiter")]
+        public bool CanShoot = false;
+
+        public bool ThrowNextItem = false;
+
+        /// <summary>
+        ///     The chance that a vending machine will randomly dispense an item on hit.
+        ///     Chance is 0 if null.
+        /// </summary>
+        [DataField("dispenseOnHitChance")]
+        public float? DispenseOnHitChance;
+
+        /// <summary>
+        ///     The minimum amount of damage that must be done per hit to have a chance
+        ///     of dispensing an item.
+        /// </summary>
+        [DataField("dispenseOnHitThreshold")]
+        public float? DispenseOnHitThreshold;
+
+        /// <summary>
+        ///     Amount of time in seconds that need to pass before damage can cause a vending machine to eject again.
+        ///     This value is separate to <see cref="VendingMachineComponent.EjectDelay"/> because that value might be
+        ///     0 for a vending machine for legitimate reasons (no desired delay/no eject animation)
+        ///     and can be circumvented with forced ejections.
+        /// </summary>
+        [DataField("dispenseOnHitCooldown")]
+        public float? DispenseOnHitCooldown = 1.0f;
+
+        /// <summary>
+        ///     Sound that plays when ejecting an item
+        /// </summary>
+        [DataField("soundVend")]
+        // Grabbed from: https://github.com/discordia-space/CEV-Eris/blob/f702afa271136d093ddeb415423240a2ceb212f0/sound/machines/vending_drop.ogg
+        public SoundSpecifier SoundVend = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg");
+
+        /// <summary>
+        ///     Sound that plays when an item can't be ejected
+        /// </summary>
+        [DataField("soundDeny")]
+        // Yoinked from: https://github.com/discordia-space/CEV-Eris/blob/35bbad6764b14e15c03a816e3e89aa1751660ba9/sound/machines/Custom_deny.ogg
+        public SoundSpecifier SoundDeny = new SoundPathSpecifier("/Audio/Machines/custom_deny.ogg");
+
+        /// <summary>
+        ///     The action available to the player controlling the vending machine
+        /// </summary>
+        [DataField("action", customTypeSerializer: typeof(PrototypeIdSerializer<InstantActionPrototype>))]
+        public string? Action = "VendingThrow";
+
+        public float NonLimitedEjectForce = 7.5f;
+
+        public float NonLimitedEjectRange = 5f;
+
+        public float EjectAccumulator = 0f;
+        public float DenyAccumulator = 0f;
+        public float DispenseOnHitAccumulator = 0f;
+
+        #region Client Visuals
+        /// <summary>
+        /// RSI state for when the vending machine is unpowered.
+        /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.Base"/>
+        /// </summary>
+        [DataField("offState")]
+        public string? OffState;
+
+        /// <summary>
+        /// RSI state for the screen of the vending machine
+        /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.Screen"/>
+        /// </summary>
+        [DataField("screenState")]
+        public string? ScreenState;
+
+        /// <summary>
+        /// RSI state for the vending machine's normal state. Usually a looping animation.
+        /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.BaseUnshaded"/>
+        /// </summary>
+        [DataField("normalState")]
+        public string? NormalState;
+
+        /// <summary>
+        /// RSI state for the vending machine's eject animation.
+        /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.BaseUnshaded"/>
+        /// </summary>
+        [DataField("ejectState")]
+        public string? EjectState;
+
+        /// <summary>
+        /// RSI state for the vending machine's deny animation. Will either be played once as sprite flick
+        /// or looped depending on how <see cref="LoopDenyAnimation"/> is set.
+        /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.BaseUnshaded"/>
+        /// </summary>
+        [DataField("denyState")]
+        public string? DenyState;
+
+        /// <summary>
+        /// RSI state for when the vending machine is unpowered.
+        /// Will be displayed on the layer <see cref="VendingMachineVisualLayers.Base"/>
+        /// </summary>
+        [DataField("brokenState")]
+        public string? BrokenState;
+
+        /// <summary>
+        /// If set to <c>true</c> (default) will loop the animation of the <see cref="DenyState"/> for the duration
+        /// of <see cref="VendingMachineComponent.DenyDelay"/>. If set to <c>false</c> will play a sprite
+        /// flick animation for the state and then linger on the final frame until the end of the delay.
+        /// </summary>
+        [DataField("loopDeny")]
+        public bool LoopDenyAnimation = true;
+        #endregion
+    }
+
+    [Serializable, NetSerializable]
+    public sealed class VendingMachineInventoryEntry
+    {
+        [ViewVariables(VVAccess.ReadWrite)]
+        public InventoryType Type;
+        [ViewVariables(VVAccess.ReadWrite)]
+        public string ID;
+        [ViewVariables(VVAccess.ReadWrite)]
+        public uint Amount;
+        public VendingMachineInventoryEntry(InventoryType type, string id, uint amount)
+        {
+            Type = type;
+            ID = id;
+            Amount = amount;
+        }
+    }
+
+    [Serializable, NetSerializable]
+    public enum InventoryType : byte
+    {
+        Regular,
+        Emagged,
+        Contraband
+    }
+
+    [Serializable, NetSerializable]
+    public enum VendingMachineVisuals
+    {
+        VisualState
+    }
+
+    [Serializable, NetSerializable]
+    public enum VendingMachineVisualState
+    {
+        Normal,
+        Off,
+        Broken,
+        Eject,
+        Deny,
+    }
+
+    public enum VendingMachineVisualLayers : byte
+    {
+        /// <summary>
+        /// Off / Broken. The other layers will overlay this if the machine is on.
+        /// </summary>
+        Base,
+        /// <summary>
+        /// Normal / Deny / Eject
+        /// </summary>
+        BaseUnshaded,
+        /// <summary>
+        /// Screens that are persistent (where the machine is not off or broken)
+        /// </summary>
+        Screen
+    }
+
+    [Serializable, NetSerializable]
+    public enum ContrabandWireKey : byte
+    {
+        StatusKey,
+        TimeoutKey
+    }
+
+    [Serializable, NetSerializable]
+    public enum EjectWireKey : byte
+    {
+        StatusKey,
+    }
+
+    public sealed class VendingMachineSelfDispenseEvent : InstantActionEvent
+    {
+
+    };
+}
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index 5ff77dcc4b..7b1b0c38ab 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -216,7 +216,6 @@
   #   trash: FoodPlateSmall
   - type: Stack
     stackType: Pancake
-    max: 9
     count: 1
   - type: Sprite
     state: pancakes1
@@ -249,7 +248,6 @@
   #   trash: FoodPlateSmall
   - type: Stack
     stackType: Pancake
-    max: 3
     count: 1
   - type: Sprite
     state: pancakesbb1
@@ -276,7 +274,6 @@
   #   trash: FoodPlateSmall
   - type: Stack
     stackType: Pancake
-    max: 3
     count: 1
   - type: Sprite
     state: pancakescc1
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
index 8c1414892d..e62db9e40f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -48,7 +48,6 @@
   components:
   - type: Stack
     stackType: PaperRolling
-    max: 5
     count: 5
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
@@ -80,7 +79,6 @@
   components:
   - type: Stack
     stackType: CigaretteFilter
-    max: 5
     count: 5
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index c0f13b91e7..1c9047ccb9 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -793,7 +793,7 @@
     brokenState: broken
     normalState: normal-unshaded
     ejectState: eject-unshaded
-    ejectdelay: 1.8
+    ejectDelay: 1.8
   - type: Advertise
     pack: GoodCleanFunAds
   - type: Sprite
diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml
index 0e83e424e0..b0a07b4645 100644
--- a/Resources/Prototypes/Stacks/consumable_stacks.yml
+++ b/Resources/Prototypes/Stacks/consumable_stacks.yml
@@ -4,7 +4,7 @@
   id: Pancake
   name: pancake
   spawn: FoodBakedPancake
-  maxCount: 30
+  maxCount: 3
 
 # Food Containers
 
@@ -22,14 +22,14 @@
   name: rolling paper
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigpaper }
   spawn: PaperRolling
-  maxCount: 30
+  maxCount: 5
 
 - type: stack
   id: CigaretteFilter
   name: cigarette filter
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigfilter }
   spawn: CigaretteFilter
-  maxCount: 30
+  maxCount: 5
 
 - type: stack
   id: GroundTobacco