diff --git a/Content.Client/Backmen/Body/BodySystem.cs b/Content.Client/Backmen/Body/BodySystem.cs
index bee569c1011..10dc057a8fd 100644
--- a/Content.Client/Backmen/Body/BodySystem.cs
+++ b/Content.Client/Backmen/Body/BodySystem.cs
@@ -22,9 +22,7 @@ private void ApplyMarkingToPart(MarkingPrototype markingPrototype,
             var markingSprite = markingPrototype.Sprites[j];
 
             if (markingSprite is not SpriteSpecifier.Rsi rsi)
-            {
                 continue;
-            }
 
             var layerId = $"{markingPrototype.ID}-{rsi.RsiState}";
 
@@ -38,21 +36,14 @@ private void ApplyMarkingToPart(MarkingPrototype markingPrototype,
             sprite.LayerSetVisible(layerId, visible);
 
             if (!visible)
-            {
                 continue;
-            }
 
             // Okay so if the marking prototype is modified but we load old marking data this may no longer be valid
-            // and we need to check the index is correct.
-            // So if that happens just default to white?
+            // and we need to check the index is correct. So if that happens just default to white?
             if (colors != null && j < colors.Count)
-            {
                 sprite.LayerSetColor(layerId, colors[j]);
-            }
             else
-            {
                 sprite.LayerSetColor(layerId, Color.White);
-            }
         }
     }
 
@@ -65,7 +56,6 @@ protected override void ApplyPartMarkings(EntityUid target, BodyPartAppearanceCo
             sprite.Color = component.Color.Value;
 
         foreach (var (visualLayer, markingList) in component.Markings)
-        {
             foreach (var marking in markingList)
             {
                 if (!_markingManager.TryGetMarking(marking, out var markingPrototype))
@@ -73,10 +63,9 @@ protected override void ApplyPartMarkings(EntityUid target, BodyPartAppearanceCo
 
                 ApplyMarkingToPart(markingPrototype, marking.MarkingColors, marking.Visible, sprite);
             }
-        }
     }
 
-    protected override void RemovePartMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance)
+    protected override void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance)
     {
         return;
     }
diff --git a/Content.Client/Backmen/Surgery/SurgeryBui.cs b/Content.Client/Backmen/Surgery/SurgeryBui.cs
index 31389d31f13..6e396d40cc3 100644
--- a/Content.Client/Backmen/Surgery/SurgeryBui.cs
+++ b/Content.Client/Backmen/Surgery/SurgeryBui.cs
@@ -3,16 +3,11 @@
 using Content.Shared.Backmen.Surgery;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
-using Content.Client.Hands.Systems;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using Robust.Shared.Timing;
-using Robust.Client.Timing;
-using static Robust.Client.UserInterface.Control;
-using OpenToolkit.GraphicsLibraryFramework;
 
 namespace Content.Client.Backmen.Surgery;
 
@@ -22,37 +17,30 @@ public sealed class SurgeryBui : BoundUserInterface
     [Dependency] private readonly IEntityManager _entities = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
 
-    [Dependency] private readonly IClientGameTiming _gameTiming = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
     private readonly SurgerySystem _system;
     [ViewVariables]
     private SurgeryWindow? _window;
-
     private EntityUid? _part;
-    private bool _isBody = false;
+    private bool _isBody;
     private (EntityUid Ent, EntProtoId Proto)? _surgery;
     private readonly List<EntProtoId> _previousSurgeries = new();
-    private DateTime _lastRefresh = DateTime.UtcNow;
-    private (string handName, EntityUid item) _throttling = ("", new EntityUid());
-    public SurgeryBui(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-        _system = _entities.System<SurgerySystem>();
-    }
+    public SurgeryBui(EntityUid owner, Enum uiKey) : base(owner, uiKey) => _system = _entities.System<SurgerySystem>();
 
     protected override void ReceiveMessage(BoundUserInterfaceMessage message)
     {
-        if (_window == null)
+        if (_window is null
+            || message is not SurgeryBuiRefreshMessage)
             return;
 
-        if (message is SurgeryBuiRefreshMessage)
-            RefreshUI();
+        RefreshUI();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
     {
-        if (state is SurgeryBuiState s)
-            Update(s);
+        if (state is not SurgeryBuiState s)
+            return;
+
+        Update(s);
     }
 
     protected override void Dispose(bool disposing)
@@ -64,8 +52,7 @@ protected override void Dispose(bool disposing)
 
     private void Update(SurgeryBuiState state)
     {
-        //Logger.Debug($"Attempting to update surgerybuistate with {state}, {_player.LocalEntity}, first predicted? {_timing.IsFirstTimePredicted}, surgeryTargetComp? {_entities.TryGetComponent<SurgeryTargetComponent>(_player.LocalEntity, out var surgeryTargetComp2)} {surgeryTargetComp2?.CanOperate}");
-        if (!_entities.TryGetComponent<SurgeryTargetComponent>(_player.LocalEntity, out var surgeryTargetComp)
+        if (!_entities.TryGetComponent(_player.LocalEntity, out SurgeryTargetComponent? surgeryTargetComp)
             || !surgeryTargetComp.CanOperate)
             return;
         if (_window == null)
@@ -88,32 +75,26 @@ private void Update(SurgeryBuiState state)
                 _surgery = null;
                 _previousSurgeries.Clear();
 
-                if (!_entities.TryGetNetEntity(_part, out var netPart) ||
-                    State is not SurgeryBuiState s ||
-                    !s.Choices.TryGetValue(netPart.Value, out var surgeries))
-                {
+                if (!_entities.TryGetNetEntity(_part, out var netPart)
+                    || State is not SurgeryBuiState s
+                    || !s.Choices.TryGetValue(netPart.Value, out var surgeries))
                     return;
-                }
 
                 OnPartPressed(netPart.Value, surgeries);
             };
 
             _window.StepsButton.OnPressed += _ =>
             {
-                if (!_entities.TryGetNetEntity(_part, out var netPart) ||
-                    _previousSurgeries.Count == 0)
-                {
+                if (!_entities.TryGetNetEntity(_part, out var netPart)
+                    || _previousSurgeries.Count == 0)
                     return;
-                }
 
                 var last = _previousSurgeries[^1];
                 _previousSurgeries.RemoveAt(_previousSurgeries.Count - 1);
 
-                if (_system.GetSingleton(last) is not { } previousId ||
-                    !_entities.TryGetComponent(previousId, out SurgeryComponent? previous))
-                {
+                if (_system.GetSingleton(last) is not { } previousId
+                    || !_entities.TryGetComponent(previousId, out SurgeryComponent? previous))
                     return;
-                }
 
                 OnSurgeryPressed((previousId, previous), netPart.Value, last);
             };
@@ -131,7 +112,6 @@ State is not SurgeryBuiState s ||
 
         var options = new List<(NetEntity netEntity, EntityUid entity, string Name, BodyPartType? PartType)>();
         foreach (var choice in state.Choices.Keys)
-        {
             if (_entities.TryGetEntity(choice, out var ent))
             {
                 if (_entities.TryGetComponent(ent, out BodyPartComponent? part))
@@ -139,7 +119,6 @@ State is not SurgeryBuiState s ||
                 else if (_entities.TryGetComponent(ent, out BodyComponent? body))
                     options.Add((choice, ent.Value, _entities.GetComponent<MetaDataComponent>(ent.Value).EntityName, null));
             }
-        }
 
         options.Sort((a, b) =>
         {
@@ -197,11 +176,10 @@ int GetScore(BodyPartType? partType)
 
     private void AddStep(EntProtoId stepId, NetEntity netPart, EntProtoId surgeryId)
     {
-        if (_window == null ||
-            _system.GetSingleton(stepId) is not { } step)
-        {
+        if (_window == null
+            || _system.GetSingleton(stepId) is not { } step)
             return;
-        }
+
         var stepName = new FormattedMessage();
         stepName.AddText(_entities.GetComponent<MetaDataComponent>(step).EntityName);
         var stepButton = new SurgeryStepButton { Step = step };
@@ -242,9 +220,7 @@ private void OnSurgeryPressed(Entity<SurgeryComponent> surgery, NetEntity netPar
             _window.Steps.AddChild(new HSeparator { Margin = new Thickness(0, 0, 0, 1) });
         }
         foreach (var stepId in surgery.Comp.Steps)
-        {
             AddStep(stepId, netPart, surgeryId);
-        }
 
         View(ViewType.Steps);
         RefreshUI();
@@ -300,11 +276,10 @@ private void RefreshUI()
             || !_window.IsOpen
             || _part == null
             || !_entities.HasComponent<SurgeryComponent>(_surgery?.Ent)
-            || !_entities.TryGetComponent<SurgeryTargetComponent>(_player.LocalEntity ?? EntityUid.Invalid, out var surgeryComp)
+            || !_entities.TryGetComponent(_player.LocalEntity ?? EntityUid.Invalid, out SurgeryTargetComponent? surgeryComp)
             || !surgeryComp.CanOperate)
-        {
             return;
-        }
+
         var next = _system.GetNextStep(Owner, _part.Value, _surgery.Value.Ent);
         var i = 0;
         foreach (var child in _window.Steps.Children)
@@ -314,21 +289,13 @@ private void RefreshUI()
 
             var status = StepStatus.Incomplete;
             if (next == null)
-            {
                 status = StepStatus.Complete;
-            }
             else if (next.Value.Surgery.Owner != _surgery.Value.Ent)
-            {
                 status = StepStatus.Incomplete;
-            }
             else if (next.Value.Step == i)
-            {
                 status = StepStatus.Next;
-            }
             else if (i < next.Value.Step)
-            {
                 status = StepStatus.Complete;
-            }
 
             stepButton.Button.Disabled = status != StepStatus.Next;
 
@@ -336,9 +303,7 @@ private void RefreshUI()
             stepName.AddText(_entities.GetComponent<MetaDataComponent>(stepButton.Step).EntityName);
 
             if (status == StepStatus.Complete)
-            {
                 stepButton.Button.Modulate = Color.Green;
-            }
             else
             {
                 stepButton.Button.Modulate = Color.White;
@@ -372,17 +337,11 @@ private void View(ViewType type)
 
         if (_entities.TryGetComponent(_part, out MetaDataComponent? partMeta) &&
             _entities.TryGetComponent(_surgery?.Ent, out MetaDataComponent? surgeryMeta))
-        {
             _window.Title = $"Surgery - {partMeta.EntityName}, {surgeryMeta.EntityName}";
-        }
         else if (partMeta != null)
-        {
             _window.Title = $"Surgery - {partMeta.EntityName}";
-        }
         else
-        {
             _window.Title = "Surgery";
-        }
     }
 
     private enum ViewType
diff --git a/Content.Client/Backmen/Targeting/TargetingSystem.cs b/Content.Client/Backmen/Targeting/TargetingSystem.cs
index 7be8c61bef8..b2791143e25 100644
--- a/Content.Client/Backmen/Targeting/TargetingSystem.cs
+++ b/Content.Client/Backmen/Targeting/TargetingSystem.cs
@@ -31,12 +31,20 @@ public override void Initialize()
             InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.Torso)))
         .Bind(ContentKeyFunctions.TargetLeftArm,
             InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.LeftArm)))
+/*        .Bind(ContentKeyFunctions.TargetLeftHand,
+            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.LeftHand))) SOON :TM: */
         .Bind(ContentKeyFunctions.TargetRightArm,
             InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.RightArm)))
+/*        .Bind(ContentKeyFunctions.TargetRightHand,
+            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.RightHand)))*/
         .Bind(ContentKeyFunctions.TargetLeftLeg,
             InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.LeftLeg)))
+/*        .Bind(ContentKeyFunctions.TargetLeftFoot,
+            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.LeftFoot)))*/
         .Bind(ContentKeyFunctions.TargetRightLeg,
             InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.RightLeg)))
+/*        .Bind(ContentKeyFunctions.TargetRightFoot,
+            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.RightFoot)))*/
         .Register<SharedTargetingSystem>();
     }
 
@@ -54,28 +62,28 @@ private void HandlePlayerDetached(EntityUid uid, TargetingComponent component, L
 
     private void OnTargetingStartup(EntityUid uid, TargetingComponent component, ComponentStartup args)
     {
-        if (_playerManager.LocalEntity == uid)
-        {
-            TargetingStartup?.Invoke(component);
-            PartStatusStartup?.Invoke(component);
-        }
+        if (_playerManager.LocalEntity != uid)
+            return;
+
+        TargetingStartup?.Invoke(component);
+        PartStatusStartup?.Invoke(component);
     }
 
     private void OnTargetingShutdown(EntityUid uid, TargetingComponent component, ComponentShutdown args)
     {
-        if (_playerManager.LocalEntity == uid)
-        {
-            TargetingShutdown?.Invoke();
-            PartStatusShutdown?.Invoke();
-        }
+        if (_playerManager.LocalEntity != uid)
+            return;
+
+        TargetingShutdown?.Invoke();
+        PartStatusShutdown?.Invoke();
     }
 
     private void OnTargetIntegrityChange(TargetIntegrityChangeEvent args)
     {
         if (!TryGetEntity(args.Uid, out var uid)
-        || !_playerManager.LocalEntity.Equals(uid)
-        || !TryComp(uid, out TargetingComponent? component)
-        || !args.RefreshUi)
+            || !_playerManager.LocalEntity.Equals(uid)
+            || !TryComp(uid, out TargetingComponent? component)
+            || !args.RefreshUi)
             return;
 
         PartStatusUpdate?.Invoke(component);
diff --git a/Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml b/Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml
index 90461b31a93..6cb13deaa66 100644
--- a/Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml
+++ b/Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml
@@ -12,26 +12,46 @@
                 Name="DollHead"
                 Stretch="KeepAspectCentered"
                 SetSize="64 64"/>
+            <TextureRect
+                Name="DollTorso"
+                Stretch="KeepAspectCentered"
+                SetSize="64 64"/>
+            <TextureRect
+                Name="DollGroin"
+                Stretch="KeepAspectCentered"
+                SetSize="64 64"/>
             <TextureRect
                 Name="DollLeftArm"
                 Stretch="KeepAspectCentered"
                 SetSize="64 64"/>
             <TextureRect
-                Name="DollTorso"
+                Name="DollLeftHand"
                 Stretch="KeepAspectCentered"
                 SetSize="64 64"/>
             <TextureRect
                 Name="DollRightArm"
                 Stretch="KeepAspectCentered"
                 SetSize="64 64"/>
+            <TextureRect
+                Name="DollRightHand"
+                Stretch="KeepAspectCentered"
+                SetSize="64 64"/>
             <TextureRect
                 Name="DollLeftLeg"
                 Stretch="KeepAspectCentered"
                 SetSize="64 64"/>
+            <TextureRect
+                Name="DollLeftFoot"
+                Stretch="KeepAspectCentered"
+                SetSize="64 64"/>
             <TextureRect
                 Name="DollRightLeg"
                 Stretch="KeepAspectCentered"
                 SetSize="64 64"/>
+            <TextureRect
+                Name="DollRightFoot"
+                Stretch="KeepAspectCentered"
+                SetSize="64 64"/>
         </PanelContainer>
     </Control>
 </widgets:PartStatusControl>
diff --git a/Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs b/Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs
index 70c67865f74..f405b5ca7bc 100644
--- a/Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs
+++ b/Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs
@@ -20,10 +20,15 @@ public PartStatusControl()
         {
             { TargetBodyPart.Head, DollHead },
             { TargetBodyPart.Torso, DollTorso },
+            { TargetBodyPart.Groin, DollGroin },
             { TargetBodyPart.LeftArm, DollLeftArm },
+            { TargetBodyPart.LeftHand, DollLeftHand },
             { TargetBodyPart.RightArm, DollRightArm },
+            { TargetBodyPart.RightHand, DollRightHand },
             { TargetBodyPart.LeftLeg, DollLeftLeg },
-            { TargetBodyPart.RightLeg, DollRightLeg }
+            { TargetBodyPart.LeftFoot, DollLeftFoot },
+            { TargetBodyPart.RightLeg, DollRightLeg },
+            { TargetBodyPart.RightFoot, DollRightFoot }
         };
     }
 
@@ -38,8 +43,6 @@ public void SetTextures(Dictionary<TargetBodyPart, TargetIntegrity> state)
         }
     }
 
-    public void SetVisible(bool visible)
-    {
-        this.Visible = visible;
-    }
+    public void SetVisible(bool visible) => this.Visible = visible;
+
 }
diff --git a/Content.Client/Backmen/UserInterface/Systems/Targeting/TargetingUIController.cs b/Content.Client/Backmen/UserInterface/Systems/Targeting/TargetingUIController.cs
index 4ccf46fb6da..1e767706a2f 100644
--- a/Content.Client/Backmen/UserInterface/Systems/Targeting/TargetingUIController.cs
+++ b/Content.Client/Backmen/UserInterface/Systems/Targeting/TargetingUIController.cs
@@ -32,13 +32,13 @@ public void OnSystemUnloaded(TargetingSystem system)
 
     public void OnStateEntered(GameplayState state)
     {
-        if (TargetingControl != null)
-        {
-            TargetingControl.SetVisible(_targetingComponent != null);
+        if (TargetingControl == null)
+            return;
 
-            if (_targetingComponent != null)
-                TargetingControl.SetColors(_targetingComponent.Target);
-        }
+        TargetingControl.SetTargetDollVisible(_targetingComponent != null);
+
+        if (_targetingComponent != null)
+            TargetingControl.SetBodyPartsVisible(_targetingComponent.Target);
     }
 
     public void AddTargetingControl(TargetingComponent component)
@@ -47,10 +47,10 @@ public void AddTargetingControl(TargetingComponent component)
 
         if (TargetingControl != null)
         {
-            TargetingControl.SetVisible(_targetingComponent != null);
+            TargetingControl.SetTargetDollVisible(_targetingComponent != null);
 
             if (_targetingComponent != null)
-                TargetingControl.SetColors(_targetingComponent.Target);
+                TargetingControl.SetBodyPartsVisible(_targetingComponent.Target);
         }
 
     }
@@ -58,7 +58,7 @@ public void AddTargetingControl(TargetingComponent component)
     public void RemoveTargetingControl()
     {
         if (TargetingControl != null)
-            TargetingControl.SetVisible(false);
+            TargetingControl.SetTargetDollVisible(false);
 
         _targetingComponent = null;
     }
@@ -66,8 +66,8 @@ public void RemoveTargetingControl()
     public void CycleTarget(TargetBodyPart bodyPart)
     {
         if (_playerManager.LocalEntity is not { } user
-        || _entManager.GetComponent<TargetingComponent>(user) is not { } targetingComponent
-        || TargetingControl == null)
+            || _entManager.GetComponent<TargetingComponent>(user) is not { } targetingComponent
+            || TargetingControl == null)
             return;
 
         var player = _entManager.GetNetEntity(user);
@@ -75,9 +75,7 @@ public void CycleTarget(TargetBodyPart bodyPart)
         {
             var msg = new TargetChangeEvent(player, bodyPart);
             _net.SendSystemNetworkMessage(msg);
-            TargetingControl?.SetColors(bodyPart);
+            TargetingControl?.SetBodyPartsVisible(bodyPart);
         }
     }
-
-
 }
diff --git a/Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml b/Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml
index 8be5992e5db..afd36901354 100644
--- a/Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml
+++ b/Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml
@@ -4,63 +4,215 @@
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:widgets="clr-namespace:Content.Client.Backmen.UserInterface.Systems.Targeting.Widgets"
     Name="TargetingButton"
+    VerticalExpand="True"
     VerticalAlignment="Bottom"
     HorizontalAlignment="Right">
-    <Control>
-        <PanelContainer>
-            <TextureRect
-                Name="BackgroundDoll"
-                TexturePath="/Textures/Interface/Targeting/doll.png"
-                Stretch="KeepAspectCentered"
-                SetSize="80 80"/>
-             <GridContainer Rows="3" Columns="1" SetSize="80 80" Margin="0 10 1 0" HSeparationOverride="0" VSeparationOverride="0">
-                <TextureButton Name="HeadButton" MinSize="22 22" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <PanelContainer Name="HeadPanel">
-                        <PanelContainer.PanelOverride>
-                            <gfx:StyleBoxFlat BorderColor="#FFFFFF00" BorderThickness="1"/>
-                        </PanelContainer.PanelOverride>
-                    </PanelContainer>
-                </TextureButton>
-                <GridContainer Rows="1" Columns="3" HorizontalAlignment="Center" HorizontalExpand="True" HSeparationOverride="0" VSeparationOverride="0">
-                    <TextureButton Name="RightArmButton" MinSize="12 28" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <PanelContainer Name="RightArmPanel">
-                            <PanelContainer.PanelOverride>
-                                <gfx:StyleBoxFlat BorderColor="#FFFFFF00" BorderThickness="1"/>
-                            </PanelContainer.PanelOverride>
-                        </PanelContainer>
+    <Control HorizontalAlignment="Right">
+        <TextureRect
+            Name="TargetDoll"
+            Stretch="KeepAspectCentered"
+            SetSize="96 96">
+            <PanelContainer
+                SetSize="57 96"
+                Margin="18 0 0 0"
+                VerticalAlignment="Bottom"
+                HorizontalAlignment="Left">
+                <PanelContainer
+                    SetSize="18 39"
+                    Margin="0 7 0 0"
+                    HorizontalAlignment="Left">
+                    <TextureButton
+                        Name="RightArmButton"
+                        MinSize="18 30"
+                        StyleClasses="TargetDollButtonRightArm"
+                        VerticalAlignment="Top">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/rightarm.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="12 24"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"/>
                     </TextureButton>
-                    <TextureButton Name="TorsoButton" MinSize="22 28" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <PanelContainer Name="TorsoPanel">
-                            <PanelContainer.PanelOverride>
-                                <gfx:StyleBoxFlat BorderColor="#FFFFFF00" BorderThickness="1"/>
-                            </PanelContainer.PanelOverride>
-                        </PanelContainer>
+                    <TextureButton
+                        Name="RightHandButton"
+                        MinSize="18 18"
+                        VerticalAlignment="Bottom"
+                        StyleClasses="TargetDollButtonRightHand">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/righthand.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="12 12"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"/>
                     </TextureButton>
-                    <TextureButton Name="LeftArmButton" MinSize="12 28" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <PanelContainer Name="LeftArmPanel">
-                            <PanelContainer.PanelOverride>
-                                <gfx:StyleBoxFlat BorderColor="#FFFFFF00" BorderThickness="1"/>
-                            </PanelContainer.PanelOverride>
-                        </PanelContainer>
+                </PanelContainer>
+                <PanelContainer
+                    SetSize="51 90"
+                    Margin="0 64 0 0"
+                    VerticalAlignment="Bottom"
+                    HorizontalAlignment="Center">
+                    <TextureButton
+                        Name="HeadButton"
+                        MinSize="33 27"
+                        VerticalAlignment="Top"
+                        HorizontalAlignment="Center"
+                        StyleClasses="TargetDollButtonHead">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/head.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="27 21"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"/>
+                        <!--<PanelContainer
+                            SetSize="15 15"
+                            Margin="0 9 0 0"
+                            HorizontalAlignment="Center">
+                            <TextureButton
+                                Name="EyesButton"
+                                MinSize="15 9"
+                                VerticalAlignment="Top"
+                                StyleClasses="TargetDollButtonEyes">
+                                <TextureRect
+                                    TexturePath="/Textures/Interface/Targeting/Doll/eyes.png"
+                                    Stretch="KeepAspectCentered"
+                                    SetSize="15 9"/>
+                            </TextureButton>
+                            <TextureButton
+                                Name="MouthButton"
+                                SetSize="9 6"
+                                VerticalAlignment="Bottom"
+                                StyleClasses="TargetDollButtonMouth">
+                                <TextureRect
+                                    TexturePath="/Textures/Interface/Targeting/Doll/mouth.png"
+                                    Stretch="KeepAspectCentered"
+                                    SetSize="9 6"/>
+                            </TextureButton>
+                        </PanelContainer>-->
                     </TextureButton>
-                </GridContainer>
-                <GridContainer Rows="1" Columns="2" HorizontalAlignment="Center" HorizontalExpand="True" HSeparationOverride="0" VSeparationOverride="0">
-                    <TextureButton Name="RightLegButton" MinSize="17 25" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <PanelContainer Name="RightLegPanel">
-                            <PanelContainer.PanelOverride>
-                                <gfx:StyleBoxFlat BorderColor="#FFFFFF00" BorderThickness="1"/>
-                            </PanelContainer.PanelOverride>
-                        </PanelContainer>
+                    <TextureButton
+                        Name="ChestButton"
+                        SetSize="33 36"
+                        Margin="0 21 0 0"
+                        VerticalAlignment="Top"
+                        HorizontalAlignment="Center"
+                        StyleClasses="TargetDollButtonChest">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/torso.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="27 30"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"/>
                     </TextureButton>
-                    <TextureButton Name="LeftLegButton" MinSize="17 25" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <PanelContainer Name="LeftLegPanel">
-                            <PanelContainer.PanelOverride>
-                                <gfx:StyleBoxFlat BorderColor="#FFFFFF00" BorderThickness="1"/>
-                            </PanelContainer.PanelOverride>
+                    <PanelContainer
+                        MinSize="45 42"
+                        VerticalAlignment="Bottom"
+                        HorizontalAlignment="Center">
+                        <TextureButton
+                            Name="GroinButton"
+                            MinSize="33 18"
+                            VerticalAlignment="Top"
+                            HorizontalAlignment="Center"
+                            StyleClasses="TargetDollButtonGroin">
+                            <TextureRect
+                                TexturePath="/Textures/Interface/Targeting/Doll/groin.png"
+                                Stretch="KeepAspectCentered"
+                                SetSize="27 12"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"/>
+                        </TextureButton>
+                        <PanelContainer
+                            MinSize="24 36"
+                            VerticalAlignment="Bottom"
+                            HorizontalAlignment="Right">
+                            <TextureButton
+                                Name="LeftLegButton"
+                                MinSize="18 33"
+                                VerticalAlignment="Top"
+                                HorizontalAlignment="Left"
+                                StyleClasses="TargetDollButtonLeftLeg">
+                                <TextureRect
+                                    TexturePath="/Textures/Interface/Targeting/Doll/leftleg.png"
+                                    Stretch="KeepAspectCentered"
+                                    SetSize="12 27"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"/>
+                            </TextureButton>
+                            <TextureButton
+                                Name="LeftFootButton"
+                                MinSize="24 12"
+                                VerticalAlignment="Bottom"
+                                StyleClasses="TargetDollButtonLeftFoot">
+                                    <TextureRect
+                                        TexturePath="/Textures/Interface/Targeting/Doll/leftfoot.png"
+                                        Stretch="KeepAspectCentered"
+                                        SetSize="18 9"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Center"/>
+                            </TextureButton>
+                        </PanelContainer>
+                        <PanelContainer
+                            MinSize="24 36"
+                            VerticalAlignment="Bottom"
+                            HorizontalAlignment="Left">
+                            <TextureButton
+                                Name="RightLegButton"
+                                MinSize="18 33"
+                                VerticalAlignment="Top"
+                                HorizontalAlignment="Right"
+                                StyleClasses="TargetDollButtonRightLeg">
+                                <TextureRect
+                                    TexturePath="/Textures/Interface/Targeting/Doll/rightleg.png"
+                                    Stretch="KeepAspectCentered"
+                                    SetSize="12 27"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"/>
+                            </TextureButton>
+                            <TextureButton
+                                Name="RightFootButton"
+                                MinSize="24 12"
+                                VerticalAlignment="Bottom"
+                                HorizontalAlignment="Center"
+                                StyleClasses="TargetDollButtonRightFoot">
+                                <TextureRect
+                                    TexturePath="/Textures/Interface/Targeting/Doll/rightfoot.png"
+                                    Stretch="KeepAspectCentered"
+                                    SetSize="18 9"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"/>
+                            </TextureButton>
                         </PanelContainer>
+                    </PanelContainer>
+                </PanelContainer>
+                <PanelContainer
+                    SetSize="18 39"
+                    Margin="0 7 0 0"
+                    HorizontalAlignment="Right">
+                    <TextureButton
+                        Name="LeftArmButton"
+                        MinSize="18 30"
+                        StyleClasses="TargetDollButtonLeftArm"
+                        VerticalAlignment="Top">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/leftarm.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="12 24"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"/>
+                    </TextureButton>
+                    <TextureButton
+                        Name="LeftHandButton"
+                        MinSize="18 18"
+                        VerticalAlignment="Bottom"
+                        StyleClasses="TargetDollButtonLeftHand">
+                        <TextureRect
+                            TexturePath="/Textures/Interface/Targeting/Doll/lefthand.png"
+                            Stretch="KeepAspectCentered"
+                            SetSize="12 12"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"/>
                     </TextureButton>
-                </GridContainer>
-            </GridContainer>
-        </PanelContainer>
+                </PanelContainer>
+            </PanelContainer>
+        </TextureRect>
     </Control>
 </widgets:TargetingControl>
diff --git a/Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs b/Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs
index 19df6fc1b06..ad92cd9616d 100644
--- a/Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs
+++ b/Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs
@@ -11,46 +11,48 @@ namespace Content.Client.Backmen.UserInterface.Systems.Targeting.Widgets;
 public sealed partial class TargetingControl : UIWidget
 {
     private readonly TargetingUIController _controller;
-    private readonly Dictionary<TargetBodyPart, (TextureButton Button, PanelContainer Panel)> _bodyPartControls;
+    private readonly Dictionary<TargetBodyPart, TextureButton> _bodyPartControls;
 
     public TargetingControl()
     {
         RobustXamlLoader.Load(this);
         _controller = UserInterfaceManager.GetUIController<TargetingUIController>();
 
-        _bodyPartControls = new Dictionary<TargetBodyPart, (TextureButton, PanelContainer)>
+        _bodyPartControls = new Dictionary<TargetBodyPart, TextureButton>
         {
-            { TargetBodyPart.Head, (HeadButton, (PanelContainer)HeadButton.Children.First()) },
-            { TargetBodyPart.Torso, (TorsoButton, (PanelContainer)TorsoButton.Children.First()) },
-            { TargetBodyPart.LeftArm, (LeftArmButton, (PanelContainer)LeftArmButton.Children.First()) },
-            { TargetBodyPart.RightArm, (RightArmButton, (PanelContainer)RightArmButton.Children.First()) },
-            { TargetBodyPart.LeftLeg, (LeftLegButton, (PanelContainer)LeftLegButton.Children.First()) },
-            { TargetBodyPart.RightLeg, (RightLegButton, (PanelContainer)RightLegButton.Children.First()) }
+            // TODO: ADD EYE AND MOUTH TARGETING
+            { TargetBodyPart.Head, HeadButton },
+            { TargetBodyPart.Torso, ChestButton },
+            { TargetBodyPart.Groin, GroinButton },
+            { TargetBodyPart.LeftArm, LeftArmButton },
+            { TargetBodyPart.LeftHand, LeftHandButton },
+            { TargetBodyPart.RightArm, RightArmButton },
+            { TargetBodyPart.RightHand, RightHandButton },
+            { TargetBodyPart.LeftLeg, LeftLegButton },
+            { TargetBodyPart.LeftFoot, LeftFootButton },
+            { TargetBodyPart.RightLeg, RightLegButton },
+            { TargetBodyPart.RightFoot, RightFootButton },
         };
 
-        foreach (var buttonPair in _bodyPartControls)
+        foreach (var bodyPartButton in _bodyPartControls)
         {
-            buttonPair.Value.Button.MouseFilter = MouseFilterMode.Stop;
-            buttonPair.Value.Button.OnPressed += args => SetActiveBodyPart(buttonPair.Key);
-        }
-    }
-    private void SetActiveBodyPart(TargetBodyPart bodyPart)
-    {
-        _controller.CycleTarget(bodyPart);
-    }
+            bodyPartButton.Value.MouseFilter = MouseFilterMode.Stop;
+            bodyPartButton.Value.OnPressed += _ => SetActiveBodyPart(bodyPartButton.Key);
 
-    public void SetColors(TargetBodyPart bodyPart)
-    {
-        foreach (var buttonPair in _bodyPartControls)
-        {
-            var styleBox = (StyleBoxFlat) buttonPair.Value.Panel.PanelOverride!;
-            styleBox.BackgroundColor = buttonPair.Key == bodyPart ? new Color(243, 10, 12, 51) : new Color(0, 0, 0, 0);
-            styleBox.BorderColor = buttonPair.Key == bodyPart ? new Color(243, 10, 12, 255) : new Color(0, 0, 0, 0);
+            TargetDoll.Texture = Theme.ResolveTexture("target_doll");
         }
     }
 
-    public void SetVisible(bool visible)
+    private void SetActiveBodyPart(TargetBodyPart bodyPart) => _controller.CycleTarget(bodyPart);
+
+    public void SetBodyPartsVisible(TargetBodyPart bodyPart)
     {
-        this.Visible = visible;
+        foreach (var bodyPartButton in _bodyPartControls)
+            bodyPartButton.Value.Children.First().Visible = bodyPartButton.Key == bodyPart;
     }
+
+    protected override void OnThemeUpdated() => TargetDoll.Texture = Theme.ResolveTexture("target_doll");
+
+    public void SetTargetDollVisible(bool visible) => Visible = visible;
+
 }
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index 07803690c21..4534baf73d2 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -52,6 +52,7 @@ public override void Initialize()
             SubscribeLocalEvent<HandsComponent, ComponentHandleState>(HandleComponentState);
             SubscribeLocalEvent<HandsComponent, VisualsChangedEvent>(OnVisualsChanged);
             SubscribeLocalEvent<HandsComponent, BodyPartRemovedEvent>(HandleBodyPartRemoved);
+            SubscribeLocalEvent<HandsComponent, BodyPartDisabledEvent>(HandleBodyPartDisabled);
 
             OnHandSetActive += OnHandActivated;
         }
@@ -244,30 +245,33 @@ public void UIHandAltActivateItem(string handName)
         #endregion
 
         #region visuals
-        private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref BodyPartRemovedEvent args)
+
+        private void HideLayers(EntityUid uid, HandsComponent component, Entity<BodyPartComponent> part, SpriteComponent? sprite = null)
         {
-            if (args.Part.Comp.PartType != BodyPartType.Hand || !TryComp(uid, out SpriteComponent? sprite))
+            if (part.Comp.PartType != BodyPartType.Hand || !Resolve(uid, ref sprite, logMissing: false))
                 return;
 
-            var location = args.Part.Comp.Symmetry switch
+            var location = part.Comp.Symmetry switch
             {
                 BodyPartSymmetry.None => HandLocation.Middle,
                 BodyPartSymmetry.Left => HandLocation.Left,
                 BodyPartSymmetry.Right => HandLocation.Right,
-                _ => throw new ArgumentOutOfRangeException(nameof(args.Part.Comp.Symmetry))
+                _ => throw new ArgumentOutOfRangeException(nameof(part.Comp.Symmetry))
             };
 
             if (component.RevealedLayers.TryGetValue(location, out var revealedLayers))
             {
                 foreach (var key in revealedLayers)
-                {
                     sprite.RemoveLayer(key);
-                }
 
                 revealedLayers.Clear();
             }
         }
 
+        private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref BodyPartRemovedEvent args) => HideLayers(uid, component, args.Part);
+
+        private void HandleBodyPartDisabled(EntityUid uid, HandsComponent component, ref BodyPartDisabledEvent args) => HideLayers(uid, component, args.Part);
+
         protected override void HandleEntityInserted(EntityUid uid, HandsComponent hands, EntInsertedIntoContainerMessage args)
         {
             base.HandleEntityInserted(uid, hands, args);
@@ -467,4 +471,4 @@ private void OnHandActivated(Entity<HandsComponent>? ent)
             OnPlayerSetActiveHand?.Invoke(hand.Comp.ActiveHand.Name);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index b4d7db8eed2..5b76d5581ad 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -184,9 +184,11 @@ public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, strin
 
         public void OnRefreshInventorySlots(EntityUid owner, InventorySlotsComponent component, RefreshInventorySlotsEvent args)
         {
-            if (component.SlotData.TryGetValue(args.SlotName, out var slotData)
-                && _playerManager.LocalEntity == owner)
-                OnSlotRemoved?.Invoke(slotData);
+            if (!component.SlotData.TryGetValue(args.SlotName, out var slotData)
+                || _playerManager.LocalEntity != owner)
+                return;
+
+            OnSlotRemoved?.Invoke(slotData);
         }
 
         public bool TryAddSlotDef(EntityUid owner, InventorySlotsComponent component, SlotDefinition newSlotDef)
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index ccd36c35e82..11ed7d9db96 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -1627,6 +1627,60 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                         BackgroundColor = FancyTreeSelectedRowColor,
                     }),
 
+                // Shitmed Edit Start
+                Element<TextureButton>().Class("TargetDollButtonHead")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/head_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonChest")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/torso_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonGroin")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/groin_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonLeftArm")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/leftarm_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonLeftHand")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/lefthand_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonRightArm")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/rightarm_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonRightHand")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/righthand_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonLeftLeg")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/leftleg_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonLeftFoot")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/leftfoot_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonRightLeg")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/rightleg_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonRightFoot")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/rightfoot_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonEyes")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/eyes_hover.png")),
+
+                Element<TextureButton>().Class("TargetDollButtonMouth")
+                    .Pseudo(TextureButton.StylePseudoClassHover)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Targeting/Doll/mouth_hover.png")),
+                // Shitmed Edit End
+
                 // Silicon law edit ui
                 Element<Label>().Class(SiliconLawContainer.StyleClassSiliconLawPositionLabel)
                     .Prop(Label.StylePropertyFontColor, NanoGold),
@@ -1645,6 +1699,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     {
                         new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/un_pinned.png"))
                     })
+                    
             }).ToList());
         }
     }
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
index 3ae20bc1672..f960c897294 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
@@ -22,7 +22,7 @@ public DefaultGameScreen()
         SetAnchorAndMarginPreset(Hotbar, LayoutPreset.BottomWide, margin: 5);
         SetAnchorAndMarginPreset(Chat, LayoutPreset.TopRight, margin: 10);
         SetAnchorAndMarginPreset(Alerts, LayoutPreset.TopRight, margin: 10);
-        SetAnchorAndMarginPreset(Targeting, LayoutPreset.BottomRight, margin: 10);
+        SetAnchorAndMarginPreset(Targeting, LayoutPreset.BottomRight, margin: 5);
 
         Chat.OnResized += ChatOnResized;
         Chat.OnChatResizeFinish += ChatOnResizeFinish;
diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
index e5e82a3b36c..bd737b80beb 100644
--- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
@@ -23,7 +23,7 @@ public SeparatedChatGameScreen()
         SetAnchorAndMarginPreset(Ghost, LayoutPreset.BottomWide, margin: 80);
         SetAnchorAndMarginPreset(Hotbar, LayoutPreset.BottomWide, margin: 5);
         SetAnchorAndMarginPreset(Alerts, LayoutPreset.CenterRight, margin: 10);
-        SetAnchorAndMarginPreset(Targeting, LayoutPreset.BottomRight, margin: 10);
+        SetAnchorAndMarginPreset(Targeting, LayoutPreset.BottomRight, margin: 5);
 
         ScreenContainer.OnSplitResizeFinished += () =>
             OnChatResized?.Invoke(new Vector2(ScreenContainer.SplitFraction, 0));
diff --git a/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs b/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs
index 7a463ca0f20..ae451fffe01 100644
--- a/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs
+++ b/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs
@@ -10,10 +10,7 @@ namespace Content.Client.Xenonids.UI;
 [Virtual]
 public partial class XenoChoiceControl : Control
 {
-    public XenoChoiceControl()
-    {
-        RobustXamlLoader.Load(this);
-    }
+    public XenoChoiceControl() => RobustXamlLoader.Load(this);
 
     public void Set(string name, Texture? texture)
     {
@@ -26,4 +23,4 @@ public void Set(FormattedMessage msg, Texture? texture)
         NameLabel.SetMessage(msg);
         Texture.Texture = texture;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Backmen/Surgery/SurgerySystem.cs b/Content.Server/Backmen/Surgery/SurgerySystem.cs
index 279d7fafd38..feb6c68c9d4 100644
--- a/Content.Server/Backmen/Surgery/SurgerySystem.cs
+++ b/Content.Server/Backmen/Surgery/SurgerySystem.cs
@@ -1,14 +1,13 @@
-using Content.Shared.Bed.Sleep;
+using Content.Server.Atmos.Rotting;
 using Content.Server.Body.Systems;
+using Content.Server.Chat.Systems;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
-using Content.Server.Chat.Systems;
 using Content.Server.Popups;
 using Content.Shared.Damage;
 using Content.Shared.Interaction;
 using Content.Shared.Medical.Surgery.Conditions;
 using Content.Shared.Medical.Surgery.Effects.Step;
-using Content.Server.Atmos.Rotting;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.Prototypes;
@@ -18,9 +17,9 @@
 using Robust.Shared.Utility;
 using System.Linq;
 using Content.Shared.Backmen.Surgery;
+using Content.Shared.Backmen.Surgery.Effects.Step;
 using Content.Shared.Backmen.Surgery.Tools;
-using Content.Shared.Medical.Surgery;
-using Robust.Shared.Player;
+using Content.Shared.Bed.Sleep;
 
 namespace Content.Server.Backmen.Surgery;
 
@@ -29,7 +28,7 @@ public sealed class SurgerySystem : SharedSurgerySystem
     [Dependency] private readonly BodySystem _body = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
@@ -46,7 +45,6 @@ public override void Initialize()
         SubscribeLocalEvent<SurgeryTargetComponent, SurgeryStepDamageEvent>(OnSurgeryStepDamage);
         SubscribeLocalEvent<SurgeryDamageChangeEffectComponent, SurgeryStepEvent>(OnSurgeryDamageChange);
         SubscribeLocalEvent<SurgerySpecialDamageChangeEffectComponent, SurgeryStepEvent>(OnSurgerySpecialDamageChange);
-        SubscribeLocalEvent<SurgeryStepAffixPartEffectComponent, SurgeryStepEvent>(OnStepAffixPartComplete);
         SubscribeLocalEvent<SurgeryStepEmoteEffectComponent, SurgeryStepEvent>(OnStepScreamComplete);
         SubscribeLocalEvent<SurgeryStepSpawnEffectComponent, SurgeryStepEvent>(OnStepSpawnComplete);
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
@@ -82,22 +80,22 @@ not updating at all until you change tools or reopen the window. I love shitcode
         */
         _ui.ServerSendUiMessage(body, SurgeryUIKey.Key, new SurgeryBuiRefreshMessage());
     }
-
     private void SetDamage(EntityUid body,
         DamageSpecifier damage,
         float partMultiplier,
         EntityUid user,
         EntityUid part)
     {
-        var changed = _damageableSystem.TryChangeDamage(body, damage, true, origin: user, canSever: false, partMultiplier: partMultiplier);
-        if (changed != null
-            && changed.GetTotal() == 0
-            && damage.GetTotal() < 0
-            && TryComp<BodyPartComponent>(part, out var partComp))
-        {
-            var targetPart = _body.GetTargetBodyPart(partComp.PartType, partComp.Symmetry);
-            _body.TryChangeIntegrity((part, partComp), damage, false, targetPart, out var _);
-        }
+        if (!TryComp<BodyPartComponent>(part, out var partComp))
+            return;
+
+        _damageable.TryChangeDamage(body,
+            damage,
+            true,
+            origin: user,
+            canSever: false,
+            partMultiplier: partMultiplier,
+            targetPart: _body.GetTargetBodyPart(partComp));
     }
 
     private void OnToolAfterInteract(Entity<SurgeryToolComponent> ent, ref AfterInteractEvent args)
@@ -126,21 +124,17 @@ private void OnToolAfterInteract(Entity<SurgeryToolComponent> ent, ref AfterInte
         RefreshUI(args.Target.Value);
     }
 
-    private void OnSurgeryStepDamage(Entity<SurgeryTargetComponent> ent, ref SurgeryStepDamageEvent args)
-    {
+    private void OnSurgeryStepDamage(Entity<SurgeryTargetComponent> ent, ref SurgeryStepDamageEvent args) =>
         SetDamage(args.Body, args.Damage, args.PartMultiplier, args.User, args.Part);
-    }
 
     private void OnSurgeryDamageChange(Entity<SurgeryDamageChangeEffectComponent> ent, ref SurgeryStepEvent args)
     {
         // This unintentionally punishes the user if they have an organ in another hand that is already used.
-        // Imo surgery shouldnt let you automatically pick tools on both hands anyway, it should only use the one you've got in your selected hand.
-        if (ent.Comp.IsConsumable)
-        {
-            if (args.Tools.Where(tool => TryComp<OrganComponent>(tool, out var organComp)
-                && !_body.TrySetOrganUsed(tool, true, organComp)).Any())
-                return;
-        }
+        // Imo surgery shouldn't let you automatically pick tools on both hands anyway, it should only use the one you've got in your selected hand.
+        if (ent.Comp.IsConsumable
+            && args.Tools.Where(tool => TryComp<OrganComponent>(tool, out var organComp)
+            && !_body.TrySetOrganUsed(tool, true, organComp)).Any())
+            return;
 
         var damageChange = ent.Comp.Damage;
         if (HasComp<ForcedSleepingComponent>(args.Body))
@@ -151,69 +145,42 @@ private void OnSurgeryDamageChange(Entity<SurgeryDamageChangeEffectComponent> en
 
     private void OnSurgerySpecialDamageChange(Entity<SurgerySpecialDamageChangeEffectComponent> ent, ref SurgeryStepEvent args)
     {
-        if (ent.Comp.IsConsumable)
-        {
-            if (args.Tools.Where(tool => TryComp<OrganComponent>(tool, out var organComp)
-                && !_body.TrySetOrganUsed(tool, true, organComp)).Any())
-                return;
-        }
+        if (ent.Comp.IsConsumable
+            && args.Tools.Where(tool => TryComp<OrganComponent>(tool, out var organComp)
+            && !_body.TrySetOrganUsed(tool, true, organComp)).Any())
+            return;
 
         if (ent.Comp.DamageType == "Rot")
-        {
-            _rot.ReduceAccumulator(args.Body, TimeSpan.FromSeconds(2147483648));
-        }
-        else if (ent.Comp.DamageType == "Eye")
-        {
-            if (TryComp(args.Body, out BlindableComponent? blindComp)
-                && blindComp.EyeDamage > 0)
-                _blindableSystem.AdjustEyeDamage((args.Body, blindComp), -blindComp!.EyeDamage);
-        }
+            _rot.ReduceAccumulator(args.Body, TimeSpan.FromSeconds(2147483648)); // BEHOLD, SHITCODE THAT I JUST COPY PASTED. I'll redo it at some point, pinky swear :)
+        else if (ent.Comp.DamageType == "Eye"
+            && TryComp(args.Body, out BlindableComponent? blindComp)
+            && blindComp.EyeDamage > 0)
+            _blindableSystem.AdjustEyeDamage((args.Body, blindComp), -blindComp!.EyeDamage);
     }
 
-    private void OnStepAffixPartComplete(Entity<SurgeryStepAffixPartEffectComponent> ent, ref SurgeryStepEvent args)
+    private void OnStepScreamComplete(Entity<SurgeryStepEmoteEffectComponent> ent, ref SurgeryStepEvent args)
     {
-        if (!TryComp(args.Surgery, out SurgeryPartRemovedConditionComponent? removedComp))
+        if (HasComp<ForcedSleepingComponent>(args.Body))
             return;
 
-        var targetPart = _body.GetBodyChildrenOfType(args.Body, removedComp.Part, symmetry: removedComp.Symmetry).FirstOrDefault();
-
-        if (targetPart != default)
-        {
-            var ev = new BodyPartEnableChangedEvent(true);
-            RaiseLocalEvent(targetPart.Id, ref ev);
-            // This is basically an equalizer, severing a part will badly damage it.
-            // and affixing it will heal it a bit if its not too badly damaged.
-            var healing = _body.GetHealingSpecifier(targetPart.Component) * 2;
-            _body.TryChangeIntegrity(targetPart, healing, false,
-                _body.GetTargetBodyPart(targetPart.Component.PartType, targetPart.Component.Symmetry), out _);
-        }
-
-    }
-
-    private void OnStepScreamComplete(Entity<SurgeryStepEmoteEffectComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!HasComp<ForcedSleepingComponent>(args.Body))
-            _chat.TryEmoteWithChat(args.Body, ent.Comp.Emote);
-    }
-    private void OnStepSpawnComplete(Entity<SurgeryStepSpawnEffectComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (TryComp(args.Body, out TransformComponent? xform))
-            SpawnAtPosition(ent.Comp.Entity, xform.Coordinates);
+        _chat.TryEmoteWithChat(args.Body, ent.Comp.Emote);
     }
+    private void OnStepSpawnComplete(Entity<SurgeryStepSpawnEffectComponent> ent, ref SurgeryStepEvent args) =>
+        SpawnAtPosition(ent.Comp.Entity, Transform(args.Body).Coordinates);
 
     private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
     {
-        if (args.WasModified<EntityPrototype>())
-            LoadPrototypes();
+        if (!args.WasModified<EntityPrototype>())
+            return;
+
+        LoadPrototypes();
     }
 
     private void LoadPrototypes()
     {
         _surgeries.Clear();
         foreach (var entity in _prototypes.EnumeratePrototypes<EntityPrototype>())
-        {
             if (entity.HasComponent<SurgeryComponent>())
                 _surgeries.Add(new EntProtoId(entity.ID));
-        }
     }
 }
diff --git a/Content.Server/Backmen/Targeting/TargetingSystem.cs b/Content.Server/Backmen/Targeting/TargetingSystem.cs
index 12bd9e815b5..3202de8f008 100644
--- a/Content.Server/Backmen/Targeting/TargetingSystem.cs
+++ b/Content.Server/Backmen/Targeting/TargetingSystem.cs
@@ -35,6 +35,8 @@ private void OnMobStateChange(EntityUid uid, TargetingComponent component, MobSt
                 component.BodyStatus[part] = TargetIntegrity.Dead;
                 changed = true;
             }
+            // I love groin shitcode.
+            component.BodyStatus[TargetBodyPart.Groin] = TargetIntegrity.Dead;
         }
         else if (args.OldMobState == MobState.Dead && (args.NewMobState == MobState.Alive || args.NewMobState == MobState.Critical))
         {
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index de7d3e86712..0c7a021e7ee 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Body.Components;
 using Content.Server.Ghost;
 using Content.Server.Humanoid;
@@ -32,8 +33,19 @@ public override void Initialize()
 
         SubscribeLocalEvent<BodyComponent, MoveInputEvent>(OnRelayMoveInput);
         SubscribeLocalEvent<BodyComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
+        SubscribeLocalEvent<BodyPartComponent, AttemptEntityGibEvent>(OnGibTorsoAttempt); // backmen: surgery
     }
 
+    // start-backmen: surgery
+    private void OnGibTorsoAttempt(Entity<BodyPartComponent> ent, ref AttemptEntityGibEvent args)
+    {
+        if (ent.Comp.PartType == BodyPartType.Torso)
+        {
+            args.GibType = GibType.Skip;
+        }
+    }
+    // end-backmen: surgery
+
     private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
     {
         // If they haven't actually moved then ignore it.
@@ -96,6 +108,7 @@ protected override void RemovePart(
             return;
 
         var layers = HumanoidVisualLayersExtension.Sublayers(layer.Value);
+
         _humanoidSystem.SetLayersVisibility(
             bodyEnt, layers, visible: false, permanent: true, humanoid);
         _appearance.SetData(bodyEnt, layer, true);
@@ -148,12 +161,9 @@ public override HashSet<EntityUid> GibPart(
         if (!Resolve(partId, ref part, logMissing: false)
             || TerminatingOrDeleted(partId)
             || EntityManager.IsQueuedForDeletion(partId))
-        {
             return new HashSet<EntityUid>();
-        }
 
-        var xform = Transform(partId);
-        if (xform.MapUid is null)
+        if (Transform(partId).MapUid is null)
             return new HashSet<EntityUid>();
 
         var gibs = base.GibPart(partId, part, launchGibs: launchGibs,
@@ -167,26 +177,16 @@ public override HashSet<EntityUid> GibPart(
         return gibs;
     }
 
-    // start-backmen: surgery
-    /*protected override void UpdateAppearance(EntityUid uid, BodyPartAppearanceComponent component)
-    {
-        return;
-    }*/
-
     protected override void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component)
     {
         return;
     }
 
-    protected override void RemovePartMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance)
+    protected override void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance)
     {
         foreach (var (visualLayer, markingList) in partAppearance.Markings)
-        {
             foreach (var marking in markingList)
-            {
                 _humanoidSystem.RemoveMarking(target, marking.MarkingId, sync: false, humanoid: bodyAppearance);
-            }
-        }
 
         Dirty(target, bodyAppearance);
     }
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs
index 86d2cb61ffe..73be972b8f0 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Server/Body/Systems/BrainSystem.cs
@@ -1,7 +1,9 @@
 using Content.Server.Body.Components;
 using Content.Server.Ghost.Components;
+using Content.Shared.Backmen.Surgery.Body;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
+using Content.Shared.Body.Organ;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Pointing;
@@ -12,15 +14,34 @@ public sealed class BrainSystem : EntitySystem
     {
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
 
+        // Shitmed-Start
         public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
-            SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
+            SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>(HandleAddition);
+            SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>(HandleRemoval);
             SubscribeLocalEvent<BrainComponent, PointAttemptEvent>(OnPointAttempt);
         }
 
+        private void HandleRemoval(EntityUid uid, BrainComponent _, ref OrganRemovedFromBodyEvent args)
+        {
+            if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.OldBody))
+                return;
+
+            // Prevents revival, should kill the user within a given timespan too.
+            EnsureComp<DebrainedComponent>(args.OldBody);
+            HandleMind(uid, args.OldBody);
+        }
+        private void HandleAddition(EntityUid uid, BrainComponent _, ref OrganAddedToBodyEvent args)
+        {
+            if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.Body))
+                return;
+
+            RemComp<DebrainedComponent>(args.Body);
+            HandleMind(args.Body, uid);
+        }
+        // Shitmed-End
         private void HandleMind(EntityUid newEntity, EntityUid oldEntity)
         {
             if (TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity))
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 6209f00419d..447afb334de 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -11,10 +11,12 @@
 using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Body.Organ;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.EntityEffects;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Backmen.Surgery.Body;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -74,9 +76,9 @@ public override void Update(float frameTime)
             if (_mobState.IsDead(uid))
                 continue;
 
-            UpdateSaturation(uid, -(float) respirator.UpdateInterval.TotalSeconds, respirator);
+            UpdateSaturation(uid, -(float)respirator.UpdateInterval.TotalSeconds, respirator);
 
-            if (!_mobState.IsIncapacitated(uid)) // cannot breathe in crit.
+            if (!_mobState.IsIncapacitated(uid) || HasComp<DebrainedComponent>(uid)) // Shitmed: cannot breathe in crit or when no brain.
             {
                 switch (respirator.Status)
                 {
@@ -207,7 +209,7 @@ public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
 
         gas = new GasMixture(gas);
         var lungRatio = 1.0f / organs.Count;
-        gas.Multiply(MathF.Min(lungRatio * gas.Volume/Atmospherics.BreathVolume, lungRatio));
+        gas.Multiply(MathF.Min(lungRatio * gas.Volume / Atmospherics.BreathVolume, lungRatio));
         var solution = _lungSystem.GasToReagent(gas);
 
         float saturation = 0;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
index 95f3a319bfe..f9e39ba8847 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
@@ -2,18 +2,18 @@
 using Content.Shared.Body.Part;
 using JetBrains.Annotations;
 
-namespace Content.Server.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class GibPartBehavior : IThresholdBehavior
 {
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class GibPartBehavior : IThresholdBehavior
+    public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
     {
-        public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
-        {
-            if (system.EntityManager.TryGetComponent(owner, out BodyPartComponent? part))
-            {
-                system.BodySystem.GibPart(owner, part);
-            }
-        }
+        if (!system.EntityManager.TryGetComponent(owner, out BodyPartComponent? part))
+            return;
+
+        system.BodySystem.GibPart(owner, part);
     }
 }
+
diff --git a/Content.Server/EntityEffects/Effects/HealthChange.cs b/Content.Server/EntityEffects/Effects/HealthChange.cs
index d09d7ccf2a7..6efcbd68940 100644
--- a/Content.Server/EntityEffects/Effects/HealthChange.cs
+++ b/Content.Server/EntityEffects/Effects/HealthChange.cs
@@ -129,8 +129,7 @@ public override void Effect(EntityEffectBaseArgs args)
                 // start-backmen: surgery
                 targetPart: TargetBodyPart.All,
                 partMultiplier: 0.5f,
-                canSever: false,
-                evade: true);
+                canSever: false);
                 // end-backmen: surgery
         }
     }
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 8102ca66b04..ee8bd479299 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -140,10 +140,8 @@ private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref
             RemoveHand(uid, args.Slot);
         }
 
-        private void HandleBodyPartEnabled(EntityUid uid, HandsComponent component, ref BodyPartEnabledEvent args)
-        {
+        private void HandleBodyPartEnabled(EntityUid uid, HandsComponent component, ref BodyPartEnabledEvent args) =>
             TryAddHand(uid, component, args.Part, SharedBodySystem.GetPartSlotContainerId(args.Part.Comp.ParentSlot?.Id ?? string.Empty));
-        }
 
         private void HandleBodyPartDisabled(EntityUid uid, HandsComponent component, ref BodyPartDisabledEvent args)
         {
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index 34b7af0212d..ff8e9e45baa 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -38,6 +38,12 @@ public sealed partial class HealthAnalyzerComponent : Component
     [DataField]
     public EntityUid? ScannedEntity;
 
+    /// <summary>
+    /// The body part that is currently being scanned.
+    /// </summary>
+    [DataField]
+    public EntityUid? CurrentBodyPart;
+
     /// <summary>
     /// The maximum range in tiles at which the analyzer can receive continuous updates
     /// </summary>
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index a2c31b37f22..4ee0daf9bd3 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -87,49 +87,13 @@ entity.Comp.DamageContainerID is not null &&
         if (healing.ModifyBloodLevel != 0)
             _bloodstreamSystem.TryModifyBloodLevel(entity.Owner, healing.ModifyBloodLevel);
 
-        var healed = _damageable.TryChangeDamage(entity.Owner, healing.Damage, true, origin: args.Args.User, partMultiplier: 0f); // No parts healing now!
+        var healed = _damageable.TryChangeDamage(entity.Owner, healing.Damage, true, origin: args.User, canSever: false);
 
         if (healed == null && healing.BloodlossModifier != 0)
             return;
 
         var total = healed?.GetTotal() ?? FixedPoint2.Zero;
 
-        // start-backmen: surgery
-        // Try to heal some body part.
-        if (total == 0 && ArePartsDamaged(entity))
-        {
-            var partHealing = healing.Damage;
-
-            var parts = _bodySystem.GetBodyChildren(args.Target).ToList();
-            var damagedParts = new List<(Entity<BodyPartComponent>, FixedPoint2)>();
-            foreach (var part in parts)
-            {
-                // Get all body parts that are damaged with *partHealing* types of damage.
-                var possibleHealing = part.Component.Damage;
-                possibleHealing.ExclusiveAdd(partHealing);
-                possibleHealing.ClampMin(part.Component.MinIntegrity);
-
-                // Remove all other types of damage that can't be healed right now,
-                // so we can prioritize the target part correctly.
-                foreach (var (damage, value) in possibleHealing.DamageDict)
-                {
-                    if (!partHealing.DamageDict.ContainsKey(damage))
-                        possibleHealing.DamageDict.Remove(damage);
-                }
-
-                if (possibleHealing.GetTotal() == FixedPoint2.Zero)
-                    continue;
-
-                damagedParts.Add((part, possibleHealing.GetTotal()));
-            }
-
-            // Fetch the most damaged body part
-            var mostDamaged = damagedParts.MaxBy(x => x.Item2).Item1;
-            var targetPart = _bodySystem.GetTargetBodyPart(mostDamaged);
-            _bodySystem.TryChangeIntegrity(mostDamaged, healing.Damage, false, targetPart, out _);
-        }
-        // end-backmen: surgery
-
         // Re-verify that we can heal the damage.
 
         if (TryComp<StackComponent>(args.Used.Value, out var stackComp))
@@ -157,8 +121,8 @@ entity.Comp.DamageContainerID is not null &&
 
         _audio.PlayPvs(healing.HealingEndSound, entity.Owner, AudioHelpers.WithVariation(0.125f, _random).WithVolume(1f));
 
-        // Logic to determine the whether or not to repeat the healing action
-        args.Repeat = HasDamage(entity.Comp, healing) && !dontRepeat || ArePartsDamaged(entity);
+        // Logic to determine whether or not to repeat the healing action
+        args.Repeat = HasDamage(entity.Comp, healing) && !dontRepeat || IsPartDamaged(args.User, entity);
         if (!args.Repeat && !dontRepeat)
             _popupSystem.PopupEntity(Loc.GetString("medical-item-finished-using", ("item", args.Used)), entity.Owner, args.User);
         args.Handled = true;
@@ -179,16 +143,17 @@ private bool HasDamage(DamageableComponent component, HealingComponent healing)
         return false;
     }
 
-    private bool ArePartsDamaged(EntityUid target)
+    private bool IsPartDamaged(EntityUid user, EntityUid target)
     {
-        if (!TryComp<BodyComponent>(target, out var body))
+        if (!TryComp(user, out TargetingComponent? targeting))
             return false;
 
-        foreach (var part in _bodySystem.GetBodyChildren(target, body))
-        {
-            if (part.Component.TotalDamage > part.Component.MinIntegrity)
+        var (targetType, targetSymmetry) = _bodySystem.ConvertTargetBodyPart(targeting.Target);
+        foreach (var part in _bodySystem.GetBodyChildrenOfType(target, targetType, symmetry: targetSymmetry))
+            if (TryComp<DamageableComponent>(part.Id, out var damageable)
+                && damageable.TotalDamage > part.Component.MinIntegrity)
                 return true;
-        }
+
         return false;
     }
 
@@ -230,7 +195,7 @@ targetDamage.DamageContainerID is not null &&
 
         var anythingToDo =
             HasDamage(targetDamage, component) ||
-            ArePartsDamaged(target) ||
+            IsPartDamaged(user, target) ||
             component.ModifyBloodLevel > 0 // Special case if healing item can restore lost blood...
                 && TryComp<BloodstreamComponent>(target, out var bloodstream)
                 && _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution)
diff --git a/Content.Shared/Backmen/Surgery/Body/BodyPartAppearanceComponent.cs b/Content.Shared/Backmen/Surgery/Body/BodyPartAppearanceComponent.cs
index 53cf40b9b5f..31165801f38 100644
--- a/Content.Shared/Backmen/Surgery/Body/BodyPartAppearanceComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Body/BodyPartAppearanceComponent.cs
@@ -41,6 +41,4 @@ public sealed partial class BodyPartAppearanceComponent : Component
 
     [DataField, AutoNetworkedField]
     public EntityUid? OriginalBody { get; set; }
-
-    //TODO add other custom variables such as species and markings - in case someone decides to attach a lizard arm to a human for example
 }
diff --git a/Content.Shared/Backmen/Surgery/Body/DebrainedComponent.cs b/Content.Shared/Backmen/Surgery/Body/DebrainedComponent.cs
new file mode 100644
index 00000000000..cc2e15b567f
--- /dev/null
+++ b/Content.Shared/Backmen/Surgery/Body/DebrainedComponent.cs
@@ -0,0 +1,7 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Backmen.Surgery.Body;
+
+[RegisterComponent]
+public sealed partial class DebrainedComponent : Component;
+// TODO: Add a timer to kill the entity if they don't get a new brain in time.
diff --git a/Content.Shared/Backmen/Surgery/Body/Organs/EarsComponent.cs b/Content.Shared/Backmen/Surgery/Body/Organs/EarsComponent.cs
new file mode 100644
index 00000000000..4bf3dbb74c9
--- /dev/null
+++ b/Content.Shared/Backmen/Surgery/Body/Organs/EarsComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Backmen.Surgery.Body.Organs;
+
+[RegisterComponent]
+public sealed partial class EarsComponent : Component;
diff --git a/Content.Shared/Backmen/Surgery/Body/EyesComponent.cs b/Content.Shared/Backmen/Surgery/Body/Organs/EyesComponent.cs
similarity index 66%
rename from Content.Shared/Backmen/Surgery/Body/EyesComponent.cs
rename to Content.Shared/Backmen/Surgery/Body/Organs/EyesComponent.cs
index 55be5f1a9c4..adeb289e9cf 100644
--- a/Content.Shared/Backmen/Surgery/Body/EyesComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Body/Organs/EyesComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Body.Organ;
+namespace Content.Shared.Backmen.Surgery.Body.Organs;
 
 [RegisterComponent]
 public sealed partial class EyesComponent : Component;
diff --git a/Content.Shared/Backmen/Surgery/Body/HeartComponent.cs b/Content.Shared/Backmen/Surgery/Body/Organs/HeartComponent.cs
similarity index 67%
rename from Content.Shared/Backmen/Surgery/Body/HeartComponent.cs
rename to Content.Shared/Backmen/Surgery/Body/Organs/HeartComponent.cs
index fc4def945eb..389bfa5a49c 100644
--- a/Content.Shared/Backmen/Surgery/Body/HeartComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Body/Organs/HeartComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Body.Organ;
+namespace Content.Shared.Backmen.Surgery.Body.Organs;
 
 [RegisterComponent]
 public sealed partial class HeartComponent : Component;
diff --git a/Content.Shared/Backmen/Surgery/Body/LiverComponent.cs b/Content.Shared/Backmen/Surgery/Body/Organs/LiverComponent.cs
similarity index 67%
rename from Content.Shared/Backmen/Surgery/Body/LiverComponent.cs
rename to Content.Shared/Backmen/Surgery/Body/Organs/LiverComponent.cs
index 23021bea319..f0013af74a6 100644
--- a/Content.Shared/Backmen/Surgery/Body/LiverComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Body/Organs/LiverComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Body.Organ;
+namespace Content.Shared.Backmen.Surgery.Body.Organs;
 
 [RegisterComponent]
 public sealed partial class LiverComponent : Component;
diff --git a/Content.Shared/Backmen/Surgery/Body/Organs/MarkingContainerComponent.cs b/Content.Shared/Backmen/Surgery/Body/Organs/MarkingContainerComponent.cs
new file mode 100644
index 00000000000..c45b77ed232
--- /dev/null
+++ b/Content.Shared/Backmen/Surgery/Body/Organs/MarkingContainerComponent.cs
@@ -0,0 +1,15 @@
+// This is a uh, very shitty copout to not wanting to modify the prototypes for felinids, and entities at large so they have ears.
+// I will do that at some point, for now I just want the funny surgery to work lol.
+using Robust.Shared.GameStates;
+using Content.Shared.Humanoid.Markings;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Backmen.Surgery.Body.Organs;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class MarkingContainerComponent : Component
+{
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MarkingPrototype>))]
+    public string Marking = default!;
+
+}
diff --git a/Content.Shared/Backmen/Surgery/Body/SharedBodySystem.PartAppearance.cs b/Content.Shared/Backmen/Surgery/Body/SharedBodySystem.PartAppearance.cs
index 8998a687c42..d668fcb7266 100644
--- a/Content.Shared/Backmen/Surgery/Body/SharedBodySystem.PartAppearance.cs
+++ b/Content.Shared/Backmen/Surgery/Body/SharedBodySystem.PartAppearance.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Linq;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
@@ -12,7 +13,8 @@ namespace Content.Shared.Body.Systems;
 public partial class SharedBodySystem
 {
     [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoid = default!;
-
+    [Dependency] private readonly MarkingManager _markingManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     private void InitializePartAppearances()
     {
         base.Initialize();
@@ -25,26 +27,19 @@ private void InitializePartAppearances()
 
     private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent component, ComponentStartup args)
     {
-        // God this function reeks, it needs some cleanup BADLY. Help is appreciated as always.
-
         if (!TryComp(uid, out BodyPartComponent? part)
             || part.OriginalBody == null
             || TerminatingOrDeleted(part.OriginalBody.Value)
             || !TryComp(part.OriginalBody.Value, out HumanoidAppearanceComponent? bodyAppearance)
-            || HumanoidVisualLayersExtension.ToHumanoidLayers(part) is not { } relevantLayer)
+            || part.ToHumanoidLayers() is not { } relevantLayer)
             return;
 
         var customLayers = bodyAppearance.CustomBaseLayers;
         var spriteLayers = bodyAppearance.BaseLayers;
         component.Type = relevantLayer;
         component.OriginalBody = part.OriginalBody.Value;
-        part.Sex = bodyAppearance.Sex;
 
-        // Thanks Rane for the human reskin :)
-        if (bodyAppearance.Species.ToString() == "Felinid")
-            part.Species = "Human";
-        else
-            part.Species = bodyAppearance.Species;
+        part.Species = bodyAppearance.Species;
 
         if (customLayers.ContainsKey(component.Type))
         {
@@ -58,9 +53,8 @@ private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent
         }
         else
         {
+            component.ID = CreateIdFromPart(bodyAppearance, relevantLayer);
             component.Color = bodyAppearance.SkinColor;
-
-            component.ID = GetBodyPartPrototype(part);
         }
 
         // I HATE HARDCODED CHECKS I HATE HARDCODED CHECKS I HATE HARDCODED CHECKS
@@ -80,24 +74,56 @@ private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent
         component.Markings = markingsByLayer;
     }
 
-    public string GetBodyPartPrototype(BodyPartComponent part)
+    private string? CreateIdFromPart(HumanoidAppearanceComponent bodyAppearance, HumanoidVisualLayers part)
     {
-        var speciesPrototype = _proto.Index<SpeciesPrototype>(part.Species);
-        var spriteSet = _proto.Index<HumanoidSpeciesBaseSpritesPrototype>(speciesPrototype.SpriteSet);
+        var speciesProto = _prototypeManager.Index(bodyAppearance.Species);
+        var baseSprites = _prototypeManager.Index<HumanoidSpeciesBaseSpritesPrototype>(speciesProto.SpriteSet);
+
+        if (!baseSprites.Sprites.ContainsKey(part))
+            return null;
 
-        var layers = part.ToHumanoidLayers();
+        return HumanoidVisualLayersExtension.GetSexMorph(part, bodyAppearance.Sex, baseSprites.Sprites[part]);
+    }
 
-        DebugTools.AssertNotNull(layers);
+    public void ModifyMarkings(EntityUid uid,
+        Entity<BodyPartAppearanceComponent?> partAppearance,
+        HumanoidAppearanceComponent bodyAppearance,
+        HumanoidVisualLayers targetLayer,
+        string markingId,
+        bool remove = false)
+    {
 
-        DebugTools.Assert(spriteSet.Sprites.ContainsKey(layers!.Value));
+        if (!Resolve(partAppearance, ref partAppearance.Comp))
+            return;
+
+        if (!remove)
+        {
 
-        return HumanoidVisualLayersExtension.GetSexMorph(layers.Value, part.Sex, spriteSet.Sprites[layers.Value]);
+            if (!_markingManager.Markings.TryGetValue(markingId, out var prototype))
+                return;
+
+            var markingColors = MarkingColoring.GetMarkingLayerColors(
+                    prototype,
+                    bodyAppearance.SkinColor,
+                    bodyAppearance.EyeColor,
+                    bodyAppearance.MarkingSet
+                );
+
+            var marking = new Marking(markingId, markingColors);
+
+            _humanoid.SetLayerVisibility(uid, targetLayer, true, true, bodyAppearance);
+            _humanoid.AddMarking(uid, markingId, markingColors, true, true, bodyAppearance);
+            if (!partAppearance.Comp.Markings.ContainsKey(targetLayer))
+                partAppearance.Comp.Markings[targetLayer] = new List<Marking>();
+
+            partAppearance.Comp.Markings[targetLayer].Add(marking);
+        }
+        //else
+            //RemovePartMarkings(uid, component, bodyAppearance);
     }
 
-    private void HandleState(EntityUid uid, BodyPartAppearanceComponent component, ref AfterAutoHandleStateEvent args)
-    {
+    private void HandleState(EntityUid uid, BodyPartAppearanceComponent component, ref AfterAutoHandleStateEvent args) =>
         ApplyPartMarkings(uid, component);
-    }
 
     private void OnPartAttachedToBody(EntityUid uid, BodyComponent component, ref BodyPartAttachedEvent args)
     {
@@ -105,7 +131,9 @@ private void OnPartAttachedToBody(EntityUid uid, BodyComponent component, ref Bo
             || !TryComp(uid, out HumanoidAppearanceComponent? bodyAppearance))
             return;
 
-        _humanoid.SetBaseLayerId(uid, partAppearance.Type, partAppearance.ID, sync: true, bodyAppearance);
+        if (partAppearance.ID != null)
+            _humanoid.SetBaseLayerId(uid, partAppearance.Type, partAppearance.ID, sync: true, bodyAppearance);
+
         UpdateAppearance(uid, partAppearance);
     }
 
@@ -131,13 +159,12 @@ protected void UpdateAppearance(EntityUid target,
             _humanoid.SetBaseLayerColor(target, component.Type, component.Color, true, bodyAppearance);
 
         _humanoid.SetLayerVisibility(target, component.Type, true, true, bodyAppearance);
+        
         foreach (var (visualLayer, markingList) in component.Markings)
         {
             _humanoid.SetLayerVisibility(target, visualLayer, true, true, bodyAppearance);
             foreach (var marking in markingList)
-            {
                 _humanoid.AddMarking(target, marking.MarkingId, marking.MarkingColors, false, true, bodyAppearance);
-            }
         }
 
         Dirty(target, bodyAppearance);
@@ -152,13 +179,10 @@ protected void RemoveAppearance(EntityUid entity, BodyPartAppearanceComponent co
         {
             _humanoid.SetLayerVisibility(entity, visualLayer, false, true, bodyAppearance);
         }
-
-        RemovePartMarkings(entity, component, bodyAppearance);
+        RemoveBodyMarkings(entity, component, bodyAppearance);
     }
 
     protected abstract void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component);
 
-    protected abstract void RemovePartMarkings(EntityUid target,
-        BodyPartAppearanceComponent partAppearance,
-        HumanoidAppearanceComponent bodyAppearance);
+    protected abstract void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance);
 }
diff --git a/Content.Shared/Backmen/Surgery/Body/SharedBodySystem.Integrity.cs b/Content.Shared/Backmen/Surgery/Body/SharedBodySystem.Targeting.cs
similarity index 53%
rename from Content.Shared/Backmen/Surgery/Body/SharedBodySystem.Integrity.cs
rename to Content.Shared/Backmen/Surgery/Body/SharedBodySystem.Targeting.cs
index 0819deb02e8..79aa23c0aa3 100644
--- a/Content.Shared/Backmen/Surgery/Body/SharedBodySystem.Integrity.cs
+++ b/Content.Shared/Backmen/Surgery/Body/SharedBodySystem.Targeting.cs
@@ -1,8 +1,11 @@
+using System.Linq;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Damage;
 using Content.Shared.Mobs.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
 using Content.Shared.Standing;
 using Content.Shared.Backmen.Targeting;
 using Robust.Shared.CPUJob.JobQueues;
@@ -15,7 +18,6 @@
 using Content.Shared.Backmen.Surgery.Steps.Parts;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
 
 // ReSharper disable once CheckNamespace
 namespace Content.Shared.Body.Systems;
@@ -25,11 +27,13 @@ public partial class SharedBodySystem
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    private readonly string[] _severingDamageTypes = { "Slash", "Pierce", "Blunt" };
 
     private const double IntegrityJobTime = 0.005;
     private readonly JobQueue _integrityJobQueue = new(IntegrityJobTime);
-
     public sealed class IntegrityJob : Job<object>
     {
         private readonly SharedBodySystem _self;
@@ -58,6 +62,10 @@ public IntegrityJob(SharedBodySystem self, Entity<BodyPartComponent> ent, double
     private void InitializeBkm()
     {
         _queryTargeting = GetEntityQuery<TargetingComponent>();
+        SubscribeLocalEvent<BodyComponent, BeforeDamageChangedEvent>(OnBeforeDamageChanged);
+        SubscribeLocalEvent<BodyComponent, DamageModifyEvent>(OnBodyDamageModify);
+        SubscribeLocalEvent<BodyPartComponent, DamageModifyEvent>(OnPartDamageModify);
+        SubscribeLocalEvent<BodyPartComponent, DamageChangedEvent>(OnDamageChanged);
     }
 
     public DamageSpecifier GetHealingSpecifier(BodyPartComponent part)
@@ -81,16 +89,17 @@ public DamageSpecifier GetHealingSpecifier(BodyPartComponent part)
 
     private void ProcessIntegrityTick(Entity<BodyPartComponent> entity)
     {
-        var damage = entity.Comp.TotalDamage;
+        if (!TryComp<DamageableComponent>(entity, out var damageable))
+            return;
+
+        var damage = damageable.TotalDamage;
 
         if (entity.Comp is { Body: { } body }
             && damage > entity.Comp.MinIntegrity
             && damage <= entity.Comp.IntegrityThresholds[TargetIntegrity.HeavilyWounded]
             && _queryTargeting.HasComp(body)
             && !_mobState.IsDead(body))
-        {
-            TryChangeIntegrity(entity, GetHealingSpecifier(entity), false, GetTargetBodyPart(entity), out _);
-        }
+            _damageable.TryChangeDamage(entity, GetHealingSpecifier(entity), canSever: false, targetPart: GetTargetBodyPart(entity));
     }
 
     public override void Update(float frameTime)
@@ -114,115 +123,191 @@ public override void Update(float frameTime)
         }
     }
 
-    /// <summary>
-    /// Propagates damage to the specified part of the entity.
-    /// </summary>
-    public void ApplyPartDamage(
-        Entity<BodyPartComponent> partEnt,
-        DamageSpecifier damage,
-        BodyPartType targetType,
-        TargetBodyPart targetPart,
-        bool canSever,
-        bool evade,
-        float partMultiplier)
+    private void OnBeforeDamageChanged(Entity<BodyComponent> ent, ref BeforeDamageChangedEvent args)
     {
-        if (partEnt.Comp.Body == null)
-            return;
+        // If our target has a TargetingComponent, that means they will take limb damage
+        // And if their attacker also has one, then we use that part.
+        if (_queryTargeting.TryComp(ent, out var targetEnt))
+        {
+            var damage = args.Damage;
+            TargetBodyPart? targetPart = null;
+
+            if (args.TargetPart != null)
+            {
+                targetPart = args.TargetPart;
+            }
+            else if (args.Origin.HasValue && _queryTargeting.TryComp(args.Origin.Value, out var targeter))
+            {
+                targetPart = targeter.Target;
+                // If the target is Torso then have a 33% chance to hit another part
+                if (targetPart.Value == TargetBodyPart.Torso)
+                {
+                    var additionalPart = GetRandomPartSpread(_random, 10);
+                    targetPart = targetPart.Value | additionalPart;
+                }
+            }
+            else
+            {
+                // If there's an origin in this case, that means it comes from an entity without TargetingComponent,
+                // such as an animal, so we attack a random part.
+                if (args.Origin.HasValue)
+                {
+                    targetPart = GetRandomBodyPart(ent, targetEnt);
+                }
+                // Otherwise we damage all parts equally (barotrauma, explosions, etc).
+                else if (damage != null)
+                {
+                    // Division by 2 cuz damaging all parts by the same damage by default is too much.
+                    damage /= 2;
+                    targetPart = TargetBodyPart.All;
+                }
+            }
 
-        if (!TryEvadeDamage(partEnt.Comp.Body.Value, GetEvadeChance(targetType)) || evade)
+            if (targetPart == null)
+                return;
+
+            if (!TryChangePartDamage(ent, args.Damage, args.CanSever, args.CanEvade, args.PartMultiplier, targetPart.Value)
+                && args.CanEvade)
+            {
+                _popup.PopupEntity(Loc.GetString("surgery-part-damage-evaded", ("user", Identity.Entity(ent, EntityManager))), ent);
+                args.Evaded = true;
+            }
+        }
+    }
+
+    private void OnBodyDamageModify(Entity<BodyComponent> bodyEnt, ref DamageModifyEvent args)
+    {
+        if (args.TargetPart != null)
         {
-            TryChangeIntegrity(partEnt,
-                damage * partMultiplier * GetPartDamageModifier(targetType),
-                // This is true when damage contains at least one of the brute damage types
-                canSever,
-                targetPart,
-                out _);
+            var (targetType, _) = ConvertTargetBodyPart(args.TargetPart.Value);
+            args.Damage = args.Damage * GetPartDamageModifier(targetType);
         }
     }
 
-    /// <summary>
-    /// Adds damage to the body part and updates things about Integrity levels.
-    /// </summary>
-    public void TryChangeIntegrity(
-        Entity<BodyPartComponent> partEnt,
+    private void OnPartDamageModify(Entity<BodyPartComponent> partEnt, ref DamageModifyEvent args)
+    {
+        if (partEnt.Comp.Body != null
+            && TryComp(partEnt.Comp.Body.Value, out DamageableComponent? damageable)
+            && damageable.DamageModifierSetId != null
+            && _prototypeManager.TryIndex<DamageModifierSetPrototype>(damageable.DamageModifierSetId, out var modifierSet))
+            // TODO: We need to add a check to see if the given armor covers this part to cancel or not.
+            args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modifierSet);
+
+        if (_prototypeManager.TryIndex<DamageModifierSetPrototype>("PartDamage", out var partModifierSet))
+            args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, partModifierSet);
+
+        args.Damage = args.Damage * GetPartDamageModifier(partEnt.Comp.PartType);
+    }
+
+    private bool TryChangePartDamage(EntityUid entity,
         DamageSpecifier damage,
         bool canSever,
-        TargetBodyPart? targetPart,
-        out bool severed)
+        bool canEvade,
+        float partMultiplier,
+        TargetBodyPart targetParts)
     {
-        severed = false;
-        if (!_timing.IsFirstTimePredicted || !_queryTargeting.HasComp(partEnt.Comp.Body))
-            return;
+        var landed = false;
+        var targets = SharedTargetingSystem.GetValidParts();
+        foreach (var target in targets)
+        {
+            if (!targetParts.HasFlag(target))
+                continue;
 
-        var partIdSlot = GetParentPartAndSlotOrNull(partEnt)?.Slot;
-        var integrity = partEnt.Comp.TotalDamage;
+            var (targetType, targetSymmetry) = ConvertTargetBodyPart(target);
+            if (GetBodyChildrenOfType(entity, targetType, symmetry: targetSymmetry) is { } part)
+            {
+                if (canEvade && TryEvadeDamage(part.FirstOrDefault().Id, GetEvadeChance(targetType)))
+                    continue;
+
+                var damageResult = _damageable.TryChangeDamage(part.FirstOrDefault().Id, damage * partMultiplier, canSever: canSever);
+                if (damageResult != null && damageResult.GetTotal() != 0)
+                    landed = true;
+            }
+        }
+
+        return landed;
+    }
 
-        partEnt.Comp.Damage.ExclusiveAdd(damage);
-        partEnt.Comp.Damage.ClampMin(partEnt.Comp.MinIntegrity); // No over-healing!
+    private void OnDamageChanged(Entity<BodyPartComponent> partEnt, ref DamageChangedEvent args)
+    {
+        if (!TryComp<DamageableComponent>(partEnt, out var damageable))
+            return;
 
-        _proto.TryIndex<DamageGroupPrototype>("Brute", out var proto);
+        var severed = false;
+        var partIdSlot = GetParentPartAndSlotOrNull(partEnt)?.Slot;
+        var delta = args.DamageDelta;
 
-        if (canSever
+        if (args.CanSever
+            && partIdSlot is not null
+            && delta != null
             && !HasComp<BodyPartReattachedComponent>(partEnt)
             && !partEnt.Comp.Enabled
-            && partEnt.Comp.Damage.TryGetDamageInGroup(proto!, out var dmg)
-            && dmg > partEnt.Comp.SeverIntegrity
-            && partIdSlot is not null)
+            && damageable.TotalDamage >= partEnt.Comp.SeverIntegrity
+            && _severingDamageTypes.Any(damageType => delta.DamageDict.TryGetValue(damageType, out var value) && value > 0))
             severed = true;
 
-        CheckBodyPart(partEnt, targetPart, severed);
+        CheckBodyPart(partEnt, GetTargetBodyPart(partEnt), severed, damageable);
 
-        if (severed && partIdSlot is not null)
+        if (severed)
             DropPart(partEnt);
 
         Dirty(partEnt, partEnt.Comp);
     }
 
     /// <summary>
-    /// Same as TryChangeIntegrity, except this one
-    /// sets a given value rather than adding or subtracting.
+    /// Gets the random body part rolling a number between 1 and 9, and returns
+    /// Torso if the result is 9 or more. The higher torsoWeight is, the higher chance to return it.
+    /// By default, the chance to return Torso is 50%.
     /// </summary>
-    public void TrySetIntegrity(
-        Entity<BodyPartComponent> partEnt,
-        DamageSpecifier damage,
-        bool canSever,
-        TargetBodyPart? targetPart,
-        out bool severed)
+    private static TargetBodyPart GetRandomPartSpread(IRobustRandom random, ushort torsoWeight = 9)
     {
-        severed = false;
-        if (!_timing.IsFirstTimePredicted || !_queryTargeting.HasComp(partEnt.Comp.Body))
-            return;
-
-        var partIdSlot = GetParentPartAndSlotOrNull(partEnt)?.Slot;
-        var integrity = partEnt.Comp.TotalDamage;
-
-        partEnt.Comp.Damage = damage;
-        partEnt.Comp.Damage.ClampMin(partEnt.Comp.MinIntegrity); // No over-healing!
+        const int targetPartsAmount = 9;
+        // 5 = amount of target parts except Torso
+        return random.Next(1, targetPartsAmount + torsoWeight) switch
+        {
+            1 => TargetBodyPart.Head,
+            2 => TargetBodyPart.RightArm,
+            3 => TargetBodyPart.RightHand,
+            4 => TargetBodyPart.LeftArm,
+            5 => TargetBodyPart.LeftHand,
+            6 => TargetBodyPart.RightLeg,
+            7 => TargetBodyPart.RightFoot,
+            8 => TargetBodyPart.LeftLeg,
+            9 => TargetBodyPart.LeftFoot,
+            _ => TargetBodyPart.Torso,
+        };
+    }
 
-        if (canSever
-            && !HasComp<BodyPartReattachedComponent>(partEnt)
-            && !partEnt.Comp.Enabled
-            && integrity >= partEnt.Comp.SeverIntegrity
-            && partIdSlot is not null)
-            severed = true;
+    public TargetBodyPart? GetRandomBodyPart(EntityUid uid, TargetingComponent? target = null)
+    {
+        if (!Resolve(uid, ref target))
+            return null;
 
-        CheckBodyPart(partEnt, targetPart, severed);
+        var totalWeight = target.TargetOdds.Values.Sum();
+        var randomValue = _random.NextFloat() * totalWeight;
 
-        if (severed && partIdSlot is not null)
-            DropPart(partEnt);
+        foreach (var (part, weight) in target.TargetOdds)
+        {
+            if (randomValue <= weight)
+                return part;
+            randomValue -= weight;
+        }
 
-        Dirty(partEnt, partEnt.Comp);
+        return TargetBodyPart.Torso; // Default to torso if something goes wrong
     }
 
-    /// <summary>
     /// This should be called after body part damage was changed.
     /// </summary>
-    private void CheckBodyPart(
+    protected void CheckBodyPart(
         Entity<BodyPartComponent> partEnt,
         TargetBodyPart? targetPart,
-        bool severed)
+        bool severed,
+        DamageableComponent? damageable = null)
     {
-        var integrity = partEnt.Comp.TotalDamage;
+        if (!Resolve(partEnt, ref damageable))
+            return;
+
+        var integrity = damageable.TotalDamage;
 
         // KILL the body part
         if (partEnt.Comp.Enabled && integrity >= partEnt.Comp.IntegrityThresholds[TargetIntegrity.CriticallyWounded])
@@ -232,7 +317,7 @@ private void CheckBodyPart(
         }
 
         // LIVE the body part
-        if (!partEnt.Comp.Enabled && integrity <= partEnt.Comp.IntegrityThresholds[partEnt.Comp.EnableIntegrity])
+        if (!partEnt.Comp.Enabled && integrity <= partEnt.Comp.IntegrityThresholds[partEnt.Comp.EnableIntegrity] && !severed)
         {
             var ev = new BodyPartEnableChangedEvent(true);
             RaiseLocalEvent(partEnt, ref ev);
@@ -241,17 +326,20 @@ private void CheckBodyPart(
         if (_queryTargeting.TryComp(partEnt.Comp.Body, out var targeting)
             && HasComp<MobStateComponent>(partEnt.Comp.Body))
         {
-            var newIntegrity = GetIntegrityThreshold(partEnt.Comp, integrity, severed);
+            var newIntegrity = GetIntegrityThreshold(partEnt.Comp, integrity.Float(), severed);
             // We need to check if the part is dead to prevent the UI from showing dead parts as alive.
             if (targetPart is not null &&
                 targeting.BodyStatus.ContainsKey(targetPart.Value) &&
                 targeting.BodyStatus[targetPart.Value] != TargetIntegrity.Dead)
             {
                 targeting.BodyStatus[targetPart.Value] = newIntegrity;
+                if (targetPart.Value == TargetBodyPart.Torso)
+                    targeting.BodyStatus[TargetBodyPart.Groin] = newIntegrity;
+
                 Dirty(partEnt.Comp.Body.Value, targeting);
             }
-
-            // Revival events are handled by the server, so ends up being locked to a network event.
+            // Revival events are handled by the server, so we end up being locked to a network event.
+            // I hope you like the _net.IsServer, Remuchi :)
             if (_net.IsServer)
                 RaiseNetworkEvent(new TargetIntegrityChangeEvent(GetNetEntity(partEnt.Comp.Body.Value)), partEnt.Comp.Body.Value);
         }
@@ -276,12 +364,13 @@ public Dictionary<TargetBodyPart, TargetIntegrity> GetBodyPartStatus(EntityUid e
         {
             var targetBodyPart = GetTargetBodyPart(partComponent.Component.PartType, partComponent.Component.Symmetry);
 
-            if (targetBodyPart != null)
-            {
-                result[targetBodyPart.Value] = GetIntegrityThreshold(partComponent.Component, partComponent.Component.TotalDamage, false);
-            }
+            if (targetBodyPart != null && TryComp<DamageableComponent>(partComponent.Id, out var damageable))
+                result[targetBodyPart.Value] = GetIntegrityThreshold(partComponent.Component, damageable.TotalDamage.Float(), false);
         }
 
+        // Hardcoded shitcode for Groin :)
+        result[TargetBodyPart.Groin] = result[TargetBodyPart.Torso];
+
         return result;
     }
 
@@ -298,8 +387,12 @@ public Dictionary<TargetBodyPart, TargetIntegrity> GetBodyPartStatus(EntityUid e
             (BodyPartType.Torso, _) => TargetBodyPart.Torso,
             (BodyPartType.Arm, BodyPartSymmetry.Left) => TargetBodyPart.LeftArm,
             (BodyPartType.Arm, BodyPartSymmetry.Right) => TargetBodyPart.RightArm,
+            (BodyPartType.Hand, BodyPartSymmetry.Left) => TargetBodyPart.LeftHand,
+            (BodyPartType.Hand, BodyPartSymmetry.Right) => TargetBodyPart.RightHand,
             (BodyPartType.Leg, BodyPartSymmetry.Left) => TargetBodyPart.LeftLeg,
             (BodyPartType.Leg, BodyPartSymmetry.Right) => TargetBodyPart.RightLeg,
+            (BodyPartType.Foot, BodyPartSymmetry.Left) => TargetBodyPart.LeftFoot,
+            (BodyPartType.Foot, BodyPartSymmetry.Right) => TargetBodyPart.RightFoot,
             _ => null
         };
     }
@@ -313,10 +406,15 @@ public Dictionary<TargetBodyPart, TargetIntegrity> GetBodyPartStatus(EntityUid e
         {
             TargetBodyPart.Head => (BodyPartType.Head, BodyPartSymmetry.None),
             TargetBodyPart.Torso => (BodyPartType.Torso, BodyPartSymmetry.None),
+            TargetBodyPart.Groin => (BodyPartType.Torso, BodyPartSymmetry.None), // TODO: Groin is not a part type yet
             TargetBodyPart.LeftArm => (BodyPartType.Arm, BodyPartSymmetry.Left),
+            TargetBodyPart.LeftHand => (BodyPartType.Hand, BodyPartSymmetry.Left),
             TargetBodyPart.RightArm => (BodyPartType.Arm, BodyPartSymmetry.Right),
+            TargetBodyPart.RightHand => (BodyPartType.Hand, BodyPartSymmetry.Right),
             TargetBodyPart.LeftLeg => (BodyPartType.Leg, BodyPartSymmetry.Left),
+            TargetBodyPart.LeftFoot => (BodyPartType.Foot, BodyPartSymmetry.Left),
             TargetBodyPart.RightLeg => (BodyPartType.Leg, BodyPartSymmetry.Right),
+            TargetBodyPart.RightFoot => (BodyPartType.Foot, BodyPartSymmetry.Right),
             _ => (BodyPartType.Torso, BodyPartSymmetry.None)
         };
 
@@ -325,15 +423,17 @@ public Dictionary<TargetBodyPart, TargetIntegrity> GetBodyPartStatus(EntityUid e
     /// <summary>
     /// Fetches the damage multiplier for part integrity based on part types.
     /// </summary>
+    /// TODO: Serialize this per body part.
     public static float GetPartDamageModifier(BodyPartType partType)
     {
         return partType switch
         {
             BodyPartType.Head => 0.5f, // 50% damage, necks are hard to cut
             BodyPartType.Torso => 1.0f, // 100% damage
-            BodyPartType.Arm => 0.8f, // 80% damage
-            BodyPartType.Leg => 0.8f, // 80% damage
-            _ => 0.5f
+            BodyPartType.Arm => 0.7f, // 70% damage
+            BodyPartType.Hand => 0.7f, // 70% damage
+            BodyPartType.Leg => 0.7f, // 70% damage
+            BodyPartType.Foot => 0.7f, // 70% damage
         };
     }
 
@@ -346,11 +446,9 @@ public static TargetIntegrity GetIntegrityThreshold(BodyPartComponent component,
 
         if (severed)
             return TargetIntegrity.Severed;
-
-        if (!enabled)
+        else if (!component.Enabled)
             return TargetIntegrity.Disabled;
 
-        // Go through every Integrity threshold and pick
         var targetIntegrity = TargetIntegrity.Healthy;
         foreach (var threshold in component.IntegrityThresholds)
         {
@@ -371,7 +469,9 @@ public static float GetEvadeChance(BodyPartType partType)
         {
             BodyPartType.Head => 0.70f,  // 70% chance to evade
             BodyPartType.Arm => 0.20f,   // 20% chance to evade
+            BodyPartType.Hand => 0.20f, // 20% chance to evade
             BodyPartType.Leg => 0.20f,   // 20% chance to evade
+            BodyPartType.Foot => 0.20f, // 20% chance to evade
             BodyPartType.Torso => 0f, // 0% chance to evade
             _ => 0f
         };
diff --git a/Content.Shared/Backmen/Surgery/Conditions/SurgeryMarkingConditionComponent.cs b/Content.Shared/Backmen/Surgery/Conditions/SurgeryMarkingConditionComponent.cs
new file mode 100644
index 00000000000..f22b1f682e2
--- /dev/null
+++ b/Content.Shared/Backmen/Surgery/Conditions/SurgeryMarkingConditionComponent.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Body.Organ;
+using Content.Shared.Humanoid;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryMarkingConditionComponent : Component
+{
+
+    [DataField]
+    public bool Inverse;
+
+    /// <summary>
+    ///     The marking category to check for.
+    /// </summary>
+    [DataField]
+    public HumanoidVisualLayers MarkingCategory = default!;
+
+    /// <summary>
+    ///     Can be either a segment of a marking ID, or an entire ID that will be checked
+    ///     against the entity to validate that the marking is not already present.
+    /// </summary>
+    [DataField]
+    public String MatchString = "";
+}
diff --git a/Content.Shared/Backmen/Surgery/Conditions/SurgeryOrganConditionComponent.cs b/Content.Shared/Backmen/Surgery/Conditions/SurgeryOrganConditionComponent.cs
index 19c8df14910..c8c475f115a 100644
--- a/Content.Shared/Backmen/Surgery/Conditions/SurgeryOrganConditionComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Conditions/SurgeryOrganConditionComponent.cs
@@ -11,8 +11,8 @@ public sealed partial class SurgeryOrganConditionComponent : Component
     public ComponentRegistry? Organ;
 
     [DataField]
-    public bool Inverse = false;
+    public bool Inverse;
 
     [DataField]
-    public bool Reattaching = false;
+    public bool Reattaching;
 }
\ No newline at end of file
diff --git a/Content.Shared/Backmen/Surgery/Conditions/SurgeryPartConditionComponent.cs b/Content.Shared/Backmen/Surgery/Conditions/SurgeryPartConditionComponent.cs
index 5941e2fba3a..08a89eb9e1b 100644
--- a/Content.Shared/Backmen/Surgery/Conditions/SurgeryPartConditionComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Conditions/SurgeryPartConditionComponent.cs
@@ -13,5 +13,5 @@ public sealed partial class SurgeryPartConditionComponent : Component
     public BodyPartSymmetry? Symmetry;
 
     [DataField]
-    public bool Inverse = false;
+    public bool Inverse;
 }
\ No newline at end of file
diff --git a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs
index 646276bbeb4..602433f3653 100644
--- a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Damage;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-namespace Content.Shared.Medical.Surgery.Effects.Step;
+namespace Content.Shared.Backmen.Surgery.Effects.Step;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryDamageChangeEffectComponent : Component
@@ -13,5 +13,5 @@ public sealed partial class SurgeryDamageChangeEffectComponent : Component
     public float SleepModifier = 0.5f;
 
     [DataField]
-    public bool IsConsumable = false;
-}
\ No newline at end of file
+    public bool IsConsumable;
+}
diff --git a/Content.Shared/Backmen/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs b/Content.Shared/Backmen/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs
index 823db704472..e375865277f 100644
--- a/Content.Shared/Backmen/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs
@@ -10,5 +10,5 @@ public sealed partial class SurgerySpecialDamageChangeEffectComponent : Componen
     public string DamageType = "";
 
     [DataField]
-    public bool IsConsumable = false;
+    public bool IsConsumable;
 }
\ No newline at end of file
diff --git a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepAffixPartEffectComponent.cs b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepAffixPartEffectComponent.cs
deleted file mode 100644
index c41534ca833..00000000000
--- a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepAffixPartEffectComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Medical.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryStepAffixPartEffectComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs
index 61300425a7d..3121a02e8a5 100644
--- a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs
@@ -1,10 +1,10 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Medical.Surgery.Effects.Step;
+namespace Content.Shared.Backmen.Surgery.Effects.Step;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryStepCavityEffectComponent : Component
 {
     [DataField]
     public string Action = "Insert";
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs
index 02e8b749eed..bee9406ed55 100644
--- a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs
@@ -2,11 +2,11 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Medical.Surgery.Effects.Step;
+namespace Content.Shared.Backmen.Surgery.Effects.Step;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class SurgeryStepEmoteEffectComponent : Component
 {
     [DataField, AutoNetworkedField]
     public ProtoId<EmotePrototype> Emote = "Scream";
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs
index 766713c6f68..ca93c2dc1d0 100644
--- a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs
+++ b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs
@@ -3,11 +3,11 @@
 using Robust.Shared.Prototypes;
 using System.ComponentModel.DataAnnotations;
 
-namespace Content.Shared.Medical.Surgery.Effects.Step;
+namespace Content.Shared.Backmen.Surgery.Effects.Step;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class SurgeryStepSpawnEffectComponent : Component
 {
     [DataField(required: true), AutoNetworkedField]
     public EntProtoId Entity;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs
index 58db1422d8f..96d64449928 100644
--- a/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs
+++ b/Content.Shared/Backmen/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Damage;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-namespace Content.Shared.Medical.Surgery.Effects.Step;
+namespace Content.Shared.Backmen.Surgery.Effects.Step;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class SurgeryTendWoundsEffectComponent : Component
@@ -17,4 +17,4 @@ public sealed partial class SurgeryTendWoundsEffectComponent : Component
 
     [DataField, AutoNetworkedField]
     public float HealMultiplier = 0.07f;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Backmen/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/Backmen/Surgery/SharedSurgerySystem.Steps.cs
index 3342af17ebf..8307d0a34a6 100644
--- a/Content.Shared/Backmen/Surgery/SharedSurgerySystem.Steps.cs
+++ b/Content.Shared/Backmen/Surgery/SharedSurgerySystem.Steps.cs
@@ -1,19 +1,24 @@
 using Content.Shared.Medical.Surgery.Conditions;
-using Content.Shared.Medical.Surgery.Effects.Step;
 using Content.Shared.Medical.Surgery.Steps;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Events;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.DoAfter;
 using Content.Shared.Inventory;
 using Content.Shared.Item;
-using Content.Shared.DoAfter;
 using Content.Shared.Popups;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Content.Shared.Backmen.Surgery.Body.Organs;
+using Content.Shared.Backmen.Surgery.Effects.Step;
 using Content.Shared.Backmen.Surgery.Steps;
+using Content.Shared.Backmen.Surgery.Steps.Parts;
 using Content.Shared.Backmen.Surgery.Tools;
 using Content.Shared.Containers.ItemSlots;
 
@@ -30,14 +35,22 @@ private void InitializeSteps()
         SubscribeLocalEvent<SurgeryStepComponent, SurgeryCanPerformStepEvent>(OnToolCanPerform);
 
         //SubSurgery<SurgeryCutLarvaRootsStepComponent>(OnCutLarvaRootsStep, OnCutLarvaRootsCheck);
+
+        /*  Abandon all hope ye who enter here. Now I am become shitcoder, the bloater of files.
+            On a serious note, I really hate how much bloat this pattern of subscribing to a StepEvent and a CheckEvent
+            creates in terms of readability. And while Check DOES only run on the server side, it's still annoying to parse through.*/
+
         SubSurgery<SurgeryTendWoundsEffectComponent>(OnTendWoundsStep, OnTendWoundsCheck);
         SubSurgery<SurgeryStepCavityEffectComponent>(OnCavityStep, OnCavityCheck);
         SubSurgery<SurgeryAddPartStepComponent>(OnAddPartStep, OnAddPartCheck);
+        SubSurgery<SurgeryAffixPartStepComponent>(OnAffixPartStep, OnAffixPartCheck);
         SubSurgery<SurgeryRemovePartStepComponent>(OnRemovePartStep, OnRemovePartCheck);
         SubSurgery<SurgeryAddOrganStepComponent>(OnAddOrganStep, OnAddOrganCheck);
         SubSurgery<SurgeryRemoveOrganStepComponent>(OnRemoveOrganStep, OnRemoveOrganCheck);
-        Subs.BuiEvents<SurgeryTargetComponent>(SurgeryUIKey.Key,
-            subs =>
+        SubSurgery<SurgeryAffixOrganStepComponent>(OnAffixOrganStep, OnAffixOrganCheck);
+        SubSurgery<SurgeryAddMarkingStepComponent>(OnAddMarkingStep, OnAddMarkingCheck);
+        SubSurgery<SurgeryRemoveMarkingStepComponent>(OnRemoveMarkingStep, OnRemoveMarkingCheck);
+        Subs.BuiEvents<SurgeryTargetComponent>(SurgeryUIKey.Key, subs =>
         {
             subs.Event<SurgeryStepChosenBuiMsg>(OnSurgeryTargetStepChosen);
         });
@@ -106,6 +119,7 @@ private void OnToolStep(Entity<SurgeryStepComponent> ent, ref SurgeryStepEvent a
 
     private void OnToolCheck(Entity<SurgeryStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
     {
+        // Lord this function is fucking bloated now. Need to clean it up so its less spammy.
         if (ent.Comp.Add != null)
         {
             foreach (var reg in ent.Comp.Add.Values)
@@ -194,17 +208,39 @@ private void OnToolCanPerform(Entity<SurgeryStepComponent> ent, ref SurgeryCanPe
         }
     }
 
+    private EntProtoId? GetProtoId(EntityUid entityUid)
+    {
+        if (!TryComp<MetaDataComponent>(entityUid, out var metaData))
+            return null;
+
+        return metaData.EntityPrototype?.ID;
+    }
+
+    // I wonder if theres not a function that can do this already.
+    private bool HasDamageGroup(EntityUid entity, string[] group, out DamageableComponent? damageable)
+    {
+        if (!TryComp<DamageableComponent>(entity, out var damageableComp))
+        {
+            damageable = null;
+            return false;
+        }
+
+        damageable = damageableComp;
+        return group.Any(damageType => damageableComp.Damage.DamageDict.TryGetValue(damageType, out var value) && value > 0);
+
+    }
+
     private void OnTendWoundsStep(Entity<SurgeryTendWoundsEffectComponent> ent, ref SurgeryStepEvent args)
     {
         var group = ent.Comp.MainGroup == "Brute" ? BruteDamageTypes : BurnDamageTypes;
 
-        if (!TryComp(args.Body, out DamageableComponent? damageable)
-            || !group.Any(damageType => damageable.Damage.DamageDict.TryGetValue(damageType, out var value)
-                && value > 0)
-            && (!TryComp(args.Part, out BodyPartComponent? bodyPart)
-            || bodyPart.TotalDamage <= bodyPart.MinIntegrity))
+        if (!HasDamageGroup(args.Body, group, out var damageable)
+            && !HasDamageGroup(args.Part, group, out var _)
+            || damageable == null) // This shouldnt be possible but the compiler doesn't shut up.
             return;
 
+
+        // Right now the bonus is based off the body's total damage, maybe we could make it based off each part in the future.
         var bonus = ent.Comp.HealMultiplier * damageable.DamagePerGroup[ent.Comp.MainGroup];
         if (_mobState.IsDead(args.Body))
             bonus *= 0.2;
@@ -225,11 +261,8 @@ private void OnTendWoundsCheck(Entity<SurgeryTendWoundsEffectComponent> ent, ref
     {
         var group = ent.Comp.MainGroup == "Brute" ? BruteDamageTypes : BurnDamageTypes;
 
-        if (!TryComp(args.Body, out DamageableComponent? damageable)
-            || group.Any(damageType => damageable.Damage.DamageDict.TryGetValue(damageType, out var value)
-                && value > 0)
-            || !TryComp(args.Part, out BodyPartComponent? bodyPart)
-            || bodyPart.TotalDamage > bodyPart.MinIntegrity)
+        if (HasDamageGroup(args.Body, group, out var _)
+            || HasDamageGroup(args.Part, group, out var _))
             args.Cancelled = true;
     }
 
@@ -262,7 +295,7 @@ private void OnCavityStep(Entity<SurgeryStepCavityEffectComponent> ent, ref Surg
         var activeHandEntity = _hands.EnumerateHeld(args.User).FirstOrDefault();
         if (activeHandEntity != default
             && ent.Comp.Action == "Insert"
-            && TryComp<ItemComponent>(activeHandEntity, out ItemComponent? itemComp)
+            && TryComp(activeHandEntity, out ItemComponent? itemComp)
             && (itemComp.Size.Id == "Tiny"
             || itemComp.Size.Id == "Small"))
             _itemSlotsSystem.TryInsert(ent, partComp.ItemInsertionSlot, activeHandEntity, args.User);
@@ -297,15 +330,47 @@ private void OnAddPartStep(Entity<SurgeryAddPartStepComponent> ent, ref SurgeryS
                 var slotName = removedComp.Symmetry != null
                     ? $"{removedComp.Symmetry?.ToString().ToLower()} {removedComp.Part.ToString().ToLower()}"
                     : removedComp.Part.ToString().ToLower();
-                _body.TryCreatePartSlot(args.Part, slotName, partComp.PartType, out var _);
+                _body.TryCreatePartSlot(args.Part, slotName, partComp.PartType, out _);
                 _body.AttachPart(args.Part, slotName, tool);
-                _body.ChangeSlotState((tool, partComp), false);
+                EnsureComp<BodyPartReattachedComponent>(tool);
                 var ev = new BodyPartAttachedEvent((tool, partComp));
                 RaiseLocalEvent(args.Body, ref ev);
             }
         }
     }
 
+    private void OnAffixPartStep(Entity<SurgeryAffixPartStepComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (!TryComp(args.Surgery, out SurgeryPartRemovedConditionComponent? removedComp))
+            return;
+
+        var targetPart = _body.GetBodyChildrenOfType(args.Body, removedComp.Part, symmetry: removedComp.Symmetry).FirstOrDefault();
+
+        if (targetPart != default)
+        {
+            // We reward players for properly affixing the parts by healing a little bit of damage, and enabling the part temporarily.
+            var ev = new BodyPartEnableChangedEvent(true);
+            RaiseLocalEvent(targetPart.Id, ref ev);
+            _damageable.TryChangeDamage(args.Body,
+                _body.GetHealingSpecifier(targetPart.Component) * 2,
+                canSever: false, // Just in case we heal a brute damage specifier and the logic gets fucky lol
+                targetPart: _body.GetTargetBodyPart(targetPart.Component.PartType, targetPart.Component.Symmetry));
+            RemComp<BodyPartReattachedComponent>(targetPart.Id);
+        }
+    }
+
+    private void OnAffixPartCheck(Entity<SurgeryAffixPartStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+        if (!TryComp(args.Surgery, out SurgeryPartRemovedConditionComponent? removedComp))
+            return;
+
+        var targetPart = _body.GetBodyChildrenOfType(args.Body, removedComp.Part, symmetry: removedComp.Symmetry).FirstOrDefault();
+
+        if (targetPart != default
+            && HasComp<BodyPartReattachedComponent>(targetPart.Id))
+            args.Cancelled = true;
+    }
+
     private void OnAddPartCheck(Entity<SurgeryAddPartStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
     {
         if (!TryComp(args.Surgery, out SurgeryPartRemovedConditionComponent? removedComp)
@@ -349,7 +414,10 @@ private void OnAddOrganStep(Entity<SurgeryAddOrganStepComponent> ent, ref Surger
             if (HasComp(tool, firstOrgan.Component.GetType())
                 && TryComp<OrganComponent>(tool, out var insertedOrgan)
                 && _body.InsertOrgan(args.Part, tool, insertedOrgan.SlotId, partComp, insertedOrgan))
+            {
+                EnsureComp<OrganReattachedComponent>(tool);
                 break;
+            }
         }
     }
 
@@ -373,6 +441,39 @@ private void OnAddOrganCheck(Entity<SurgeryAddOrganStepComponent> ent, ref Surge
         }
     }
 
+    private void OnAffixOrganStep(Entity<SurgeryAffixOrganStepComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (!TryComp(args.Surgery, out SurgeryOrganConditionComponent? removedOrganComp)
+            || removedOrganComp.Organ == null
+            || !removedOrganComp.Reattaching)
+            return;
+
+        foreach (var reg in removedOrganComp.Organ.Values)
+        {
+            _body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs);
+            if (organs != null && organs.Count > 0)
+                RemComp<OrganReattachedComponent>(organs[0].Id);
+        }
+
+    }
+
+    private void OnAffixOrganCheck(Entity<SurgeryAffixOrganStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+        if (!TryComp(args.Surgery, out SurgeryOrganConditionComponent? removedOrganComp)
+            || removedOrganComp.Organ == null
+            || !removedOrganComp.Reattaching)
+            return;
+
+        foreach (var reg in removedOrganComp.Organ.Values)
+        {
+            _body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs);
+            if (organs != null
+                && organs.Count > 0
+                && organs.Any(organ => HasComp<OrganReattachedComponent>(organ.Id)))
+                args.Cancelled = true;
+        }
+    }
+
     private void OnRemoveOrganStep(Entity<SurgeryRemoveOrganStepComponent> ent, ref SurgeryStepEvent args)
     {
         if (!TryComp<SurgeryOrganConditionComponent>(args.Surgery, out var organComp)
@@ -410,6 +511,64 @@ private void OnRemoveOrganCheck(Entity<SurgeryRemoveOrganStepComponent> ent, ref
         }
     }
 
+    // TODO: Refactor bodies to include ears as a prototype instead of doing whatever the hell this is.
+    private void OnAddMarkingStep(Entity<SurgeryAddMarkingStepComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (!TryComp(args.Body, out HumanoidAppearanceComponent? bodyAppearance)
+            || ent.Comp.Organ == null)
+            return;
+
+        var organType = ent.Comp.Organ.Values.FirstOrDefault();
+        if (organType == default)
+            return;
+
+        var markingCategory = MarkingCategoriesConversion.FromHumanoidVisualLayers(ent.Comp.MarkingCategory);
+        foreach (var tool in args.Tools)
+        {
+            if (TryComp(tool, out MarkingContainerComponent? markingComp)
+                && HasComp(tool, organType.Component.GetType()))
+            {
+                if (!bodyAppearance.MarkingSet.Markings.TryGetValue(markingCategory, out var markingList)
+                    || !markingList.Any(marking => marking.MarkingId.Contains(ent.Comp.MatchString)))
+                {
+                    EnsureComp<BodyPartAppearanceComponent>(args.Part);
+                    _body.ModifyMarkings(args.Body, args.Part, bodyAppearance, ent.Comp.MarkingCategory, markingComp.Marking);
+
+                    if (ent.Comp.Accent != null
+                        && ent.Comp.Accent.Values.FirstOrDefault() is { } accent)
+                    {
+                        var compType = accent.Component.GetType();
+                        if (!HasComp(args.Body, compType))
+                            AddComp(args.Body, _compFactory.GetComponent(compType));
+                    }
+
+                    QueueDel(tool); // Again since this isnt actually being inserted we just delete it lol.
+                }
+            }
+        }
+
+    }
+
+    private void OnAddMarkingCheck(Entity<SurgeryAddMarkingStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+        var markingCategory = MarkingCategoriesConversion.FromHumanoidVisualLayers(ent.Comp.MarkingCategory);
+
+        if (!TryComp(args.Body, out HumanoidAppearanceComponent? bodyAppearance)
+            || !bodyAppearance.MarkingSet.Markings.TryGetValue(markingCategory, out var markingList)
+            || !markingList.Any(marking => marking.MarkingId.Contains(ent.Comp.MatchString)))
+            args.Cancelled = true;
+    }
+
+    private void OnRemoveMarkingStep(Entity<SurgeryRemoveMarkingStepComponent> ent, ref SurgeryStepEvent args)
+    {
+
+    }
+
+    private void OnRemoveMarkingCheck(Entity<SurgeryRemoveMarkingStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+
+    }
+
     private void OnSurgeryTargetStepChosen(Entity<SurgeryTargetComponent> ent, ref SurgeryStepChosenBuiMsg args)
     {
         var user = args.Actor;
@@ -549,7 +708,7 @@ public bool CanPerformStep(EntityUid user, EntityUid body, EntityUid part,
         if (check.Invalid != StepInvalidReason.None)
         {
             if (doPopup && check.Popup != null)
-                _popup.PopupEntity(check.Popup, user, PopupType.SmallCaution);
+                _popup.PopupEntity(check.Popup, user, user, PopupType.SmallCaution);
 
             reason = check.Invalid;
             return false;
diff --git a/Content.Shared/Backmen/Surgery/SharedSurgerySystem.cs b/Content.Shared/Backmen/Surgery/SharedSurgerySystem.cs
index 1d30988004b..e599641898f 100644
--- a/Content.Shared/Backmen/Surgery/SharedSurgerySystem.cs
+++ b/Content.Shared/Backmen/Surgery/SharedSurgerySystem.cs
@@ -12,6 +12,8 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.GameTicking;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
@@ -32,6 +34,7 @@ public abstract partial class SharedSurgerySystem : EntitySystem
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
@@ -58,7 +61,7 @@ public override void Initialize()
         SubscribeLocalEvent<SurgeryWoundedConditionComponent, SurgeryValidEvent>(OnWoundedValid);
         SubscribeLocalEvent<SurgeryPartRemovedConditionComponent, SurgeryValidEvent>(OnPartRemovedConditionValid);
         SubscribeLocalEvent<SurgeryPartPresentConditionComponent, SurgeryValidEvent>(OnPartPresentConditionValid);
-
+        SubscribeLocalEvent<SurgeryMarkingConditionComponent, SurgeryValidEvent>(OnMarkingPresentValid);
         //SubscribeLocalEvent<SurgeryRemoveLarvaComponent, SurgeryCompletedEvent>(OnRemoveLarva);
 
         InitializeSteps();
@@ -74,18 +77,18 @@ private void OnTargetDoAfter(Entity<SurgeryTargetComponent> ent, ref SurgeryDoAf
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        if (args.Cancelled ||
-            args.Handled ||
-            args.Target is not { } target ||
-            !IsSurgeryValid(ent, target, args.Surgery, args.Step, args.User, out var surgery, out var part, out var step) ||
-            !PreviousStepsComplete(ent, part, surgery, args.Step) ||
-            !CanPerformStep(args.User, ent, part, step, false))
+        if (args.Cancelled
+            || args.Handled
+            || args.Target is not { } target
+            || !IsSurgeryValid(ent, target, args.Surgery, args.Step, args.User, out var surgery, out var part, out var step)
+            || !PreviousStepsComplete(ent, part, surgery, args.Step)
+            || !CanPerformStep(args.User, ent, part, step, false))
         {
             Log.Warning($"{ToPrettyString(args.User)} tried to start invalid surgery.");
             return;
         }
 
-        args.Repeat = HasComp<SurgeryRepeatableStepComponent>(step);
+        args.Repeat = (HasComp<SurgeryRepeatableStepComponent>(step) && !IsStepComplete(ent, part, args.Step, surgery));
         var ev = new SurgeryStepEvent(args.User, ent, part, GetTools(args.User), surgery);
         RaiseLocalEvent(step, ref ev);
         RefreshUI(ent);
@@ -106,9 +109,9 @@ private void OnCloseIncisionValid(Entity<SurgeryCloseIncisionConditionComponent>
     private void OnWoundedValid(Entity<SurgeryWoundedConditionComponent> ent, ref SurgeryValidEvent args)
     {
         if (!TryComp(args.Body, out DamageableComponent? damageable)
-            || !TryComp(args.Part, out BodyPartComponent? bodyPart)
+            || !TryComp(args.Part, out DamageableComponent? partDamageable)
             || damageable.TotalDamage <= 0
-            && bodyPart.TotalDamage <= bodyPart.MinIntegrity
+            && partDamageable.TotalDamage <= 0
             && !HasComp<IncisionOpenComponent>(args.Part))
             args.Cancelled = true;
     }
@@ -151,13 +154,12 @@ private void OnOrganConditionValid(Entity<SurgeryOrganConditionComponent> ent, r
         foreach (var reg in ent.Comp.Organ.Values)
         {
             if (_body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs)
-                && organs != null
                 && organs.Count > 0)
             {
                 if (ent.Comp.Inverse
                     && (!ent.Comp.Reattaching
                     || ent.Comp.Reattaching
-                    && !HasComp<OrganReattachedComponent>(args.Part)))
+                    && !organs.Any(organ => HasComp<OrganReattachedComponent>(organ.Id))))
                     args.Cancelled = true;
             }
             else if (!ent.Comp.Inverse)
@@ -167,9 +169,11 @@ private void OnOrganConditionValid(Entity<SurgeryOrganConditionComponent> ent, r
 
     private void OnPartRemovedConditionValid(Entity<SurgeryPartRemovedConditionComponent> ent, ref SurgeryValidEvent args)
     {
-        if (!TryComp<BodyPartComponent>(args.Part, out _)
-            || _body.GetBodyChildrenOfType(args.Body, ent.Comp.Part, symmetry: ent.Comp.Symmetry).Any()
-            && !HasComp<BodyPartReattachedComponent>(args.Part))
+        var results = _body.GetBodyChildrenOfType(args.Body, ent.Comp.Part, symmetry: ent.Comp.Symmetry);
+        if (results is not { } || !results.Any())
+            return;
+
+        if (!results.Any(part => HasComp<BodyPartReattachedComponent>(part.Id)))
             args.Cancelled = true;
     }
 
@@ -180,6 +184,18 @@ private void OnPartPresentConditionValid(Entity<SurgeryPartPresentConditionCompo
             args.Cancelled = true;
     }
 
+    private void OnMarkingPresentValid(Entity<SurgeryMarkingConditionComponent> ent, ref SurgeryValidEvent args)
+    {
+        var markingCategory = MarkingCategoriesConversion.FromHumanoidVisualLayers(ent.Comp.MarkingCategory);
+
+        var hasMarking = TryComp(args.Body, out HumanoidAppearanceComponent? bodyAppearance)
+            && bodyAppearance.MarkingSet.Markings.TryGetValue(markingCategory, out var markingList)
+            && markingList.Any(marking => marking.MarkingId.Contains(ent.Comp.MatchString));
+
+        if ((!ent.Comp.Inverse && hasMarking) || (ent.Comp.Inverse && !hasMarking))
+            args.Cancelled = true;
+    }
+
     /*private void OnRemoveLarva(Entity<SurgeryRemoveLarvaComponent> ent, ref SurgeryCompletedEvent args)
     {
         RemCompDeferred<VictimInfectedComponent>(ent);
diff --git a/Content.Shared/Backmen/Surgery/Steps/SurgeryAddMarkingStepComponent.cs b/Content.Shared/Backmen/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
new file mode 100644
index 00000000000..e9d5efeadc8
--- /dev/null
+++ b/Content.Shared/Backmen/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Humanoid;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Backmen.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryAddMarkingStepComponent : Component
+{
+    /// <summary>
+    ///     The marking category to add the marking to.
+    /// </summary>
+    [DataField]
+    public HumanoidVisualLayers MarkingCategory = default!;
+
+    /// <summary>
+    ///     Can be either a segment of a marking ID, or an entire ID that will be checked
+    ///     against the entity to validate that the marking is not already present.
+    /// </summary>
+    [DataField]
+    public String MatchString = "";
+
+    /// <summary>
+    ///     What type of organ is required for this surgery?
+    /// </summary>
+    [DataField]
+    public ComponentRegistry? Organ;
+
+    /// <summary>
+    ///     Component name for accent that will be applied.
+    /// </summary>
+    [DataField]
+    public ComponentRegistry? Accent;
+}
diff --git a/Content.Shared/Backmen/Surgery/Steps/SurgeryAffixOrganStepComponent.cs b/Content.Shared/Backmen/Surgery/Steps/SurgeryAffixOrganStepComponent.cs
new file mode 100644
index 00000000000..5f82cbe4251
--- /dev/null
+++ b/Content.Shared/Backmen/Surgery/Steps/SurgeryAffixOrganStepComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryAffixOrganStepComponent : Component;
diff --git a/Content.Shared/Backmen/Surgery/Steps/SurgeryAffixPartStepComponent.cs b/Content.Shared/Backmen/Surgery/Steps/SurgeryAffixPartStepComponent.cs
new file mode 100644
index 00000000000..cc080e8be0b
--- /dev/null
+++ b/Content.Shared/Backmen/Surgery/Steps/SurgeryAffixPartStepComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryAffixPartStepComponent : Component;
diff --git a/Content.Shared/Backmen/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs b/Content.Shared/Backmen/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
new file mode 100644
index 00000000000..47368a154c0
--- /dev/null
+++ b/Content.Shared/Backmen/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.Prototypes;
+using Content.Shared.Humanoid;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryRemoveMarkingStepComponent : Component
+{
+    /// <summary>
+    ///     The category the marking belongs to.
+    /// </summary>
+    [DataField]
+    public HumanoidVisualLayers MarkingCategory = default!;
+
+    /// <summary>
+    ///     Can be either a segment of a marking ID, or an entire ID that will be checked
+    ///     against the entity to validate that the marking is present.
+    /// </summary>
+    [DataField]
+    public String MatchString = "";
+
+    /// <summary>
+    ///     Will this step spawn an item as a result of removing the markings? If so, which?
+    /// </summary>
+    [DataField]
+    public EntProtoId? ItemSpawn = default!;
+
+}
diff --git a/Content.Shared/Backmen/Targeting/SharedTargetingSystem.cs b/Content.Shared/Backmen/Targeting/SharedTargetingSystem.cs
index 6ff2cea6c8a..2cdd3018520 100644
--- a/Content.Shared/Backmen/Targeting/SharedTargetingSystem.cs
+++ b/Content.Shared/Backmen/Targeting/SharedTargetingSystem.cs
@@ -11,10 +11,15 @@ public static TargetBodyPart[] GetValidParts()
         {
             TargetBodyPart.Head,
             TargetBodyPart.Torso,
+            //TargetBodyPart.Groin,
             TargetBodyPart.LeftArm,
+            TargetBodyPart.LeftHand,
             TargetBodyPart.LeftLeg,
+            TargetBodyPart.LeftFoot,
             TargetBodyPart.RightArm,
+            TargetBodyPart.RightHand,
             TargetBodyPart.RightLeg,
+            TargetBodyPart.RightFoot,
         };
 
         return parts;
diff --git a/Content.Shared/Backmen/Targeting/TargetBodyPart.cs b/Content.Shared/Backmen/Targeting/TargetBodyPart.cs
index b182fd7b0fa..68162d892c0 100644
--- a/Content.Shared/Backmen/Targeting/TargetBodyPart.cs
+++ b/Content.Shared/Backmen/Targeting/TargetBodyPart.cs
@@ -1,6 +1,5 @@
 namespace Content.Shared.Backmen.Targeting;
 
-
 /// <summary>
 /// Represents and enum of possible target parts.
 /// </summary>
@@ -9,16 +8,23 @@ namespace Content.Shared.Backmen.Targeting;
 /// method in SharedTargetingSystem GetValidParts.
 /// </remarks>
 [Flags]
-public enum TargetBodyPart : byte
+public enum TargetBodyPart : ushort
 {
     Head = 1,
     Torso = 1 << 1,
-    LeftArm = 1 << 2,
-    RightArm = 1 << 3,
-    LeftLeg = 1 << 4,
-    RightLeg = 1 << 5,
+    Groin = 1 << 2,
+    LeftArm = 1 << 3,
+    LeftHand = 1 << 4,
+    RightArm = 1 << 5,
+    RightHand = 1 << 6,
+    LeftLeg = 1 << 7,
+    LeftFoot = 1 << 8,
+    RightLeg = 1 << 9,
+    RightFoot = 1 << 10,
 
+    Hands = LeftHand | RightHand,
     Arms = LeftArm | RightArm,
     Legs = LeftLeg | RightLeg,
-    All = Head | Torso | LeftArm | RightArm | LeftLeg | RightLeg,
+    Feet = LeftFoot | RightFoot,
+    All = Head | Torso | Groin | LeftArm | LeftHand | RightArm | RightHand | LeftLeg | LeftFoot | RightLeg | RightFoot,
 }
diff --git a/Content.Shared/Backmen/Targeting/TargetingComponent.cs b/Content.Shared/Backmen/Targeting/TargetingComponent.cs
index 66dadf1a9af..6a2b5b61de4 100644
--- a/Content.Shared/Backmen/Targeting/TargetingComponent.cs
+++ b/Content.Shared/Backmen/Targeting/TargetingComponent.cs
@@ -18,11 +18,16 @@ public sealed partial class TargetingComponent : Component
     public Dictionary<TargetBodyPart, float> TargetOdds = new()
     {
         { TargetBodyPart.Head, 0.1f },
-        { TargetBodyPart.Torso, 0.4f },
-        { TargetBodyPart.LeftArm, 0.125f },
-        { TargetBodyPart.RightArm, 0.125f },
-        { TargetBodyPart.LeftLeg, 0.125f },
-        { TargetBodyPart.RightLeg, 0.125f }
+        { TargetBodyPart.Torso, 0.3f },
+        { TargetBodyPart.Groin, 0.1f },
+        { TargetBodyPart.LeftArm, 0.1f },
+        { TargetBodyPart.LeftHand, 0.05f },
+        { TargetBodyPart.RightArm, 0.1f },
+        { TargetBodyPart.RightHand, 0.05f },
+        { TargetBodyPart.LeftLeg, 0.1f },
+        { TargetBodyPart.LeftFoot, 0.05f },
+        { TargetBodyPart.RightLeg, 0.1f },
+        { TargetBodyPart.RightFoot, 0.05f }
     };
 
     /// <summary>
@@ -33,10 +38,15 @@ public sealed partial class TargetingComponent : Component
     {
         { TargetBodyPart.Head, TargetIntegrity.Healthy },
         { TargetBodyPart.Torso, TargetIntegrity.Healthy },
+        { TargetBodyPart.Groin, TargetIntegrity.Healthy },
         { TargetBodyPart.LeftArm, TargetIntegrity.Healthy },
+        { TargetBodyPart.LeftHand, TargetIntegrity.Healthy },
         { TargetBodyPart.RightArm, TargetIntegrity.Healthy },
+        { TargetBodyPart.RightHand, TargetIntegrity.Healthy },
         { TargetBodyPart.LeftLeg, TargetIntegrity.Healthy },
-        { TargetBodyPart.RightLeg, TargetIntegrity.Healthy }
+        { TargetBodyPart.LeftFoot, TargetIntegrity.Healthy },
+        { TargetBodyPart.RightLeg, TargetIntegrity.Healthy },
+        { TargetBodyPart.RightFoot, TargetIntegrity.Healthy }
     };
 
     /// <summary>
diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs
index 67442312cd3..47c496a7081 100644
--- a/Content.Shared/Body/Organ/OrganComponent.cs
+++ b/Content.Shared/Body/Organ/OrganComponent.cs
@@ -29,5 +29,5 @@ public sealed partial class OrganComponent : Component, ISurgeryToolComponent
     ///  If true, the organ will not heal an entity when transplanted into them.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public bool? Used { get; set; } = false;
+    public bool? Used { get; set; }
 }
diff --git a/Content.Shared/Body/Organ/TailComponent.cs b/Content.Shared/Body/Organ/TailComponent.cs
new file mode 100644
index 00000000000..3cd8da87b5a
--- /dev/null
+++ b/Content.Shared/Body/Organ/TailComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Body.Organ;
+
+[RegisterComponent]
+public sealed partial class TailComponent : Component;
diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs
index 94da53cbf69..60f7ab1e562 100644
--- a/Content.Shared/Body/Part/BodyPartComponent.cs
+++ b/Content.Shared/Body/Part/BodyPartComponent.cs
@@ -1,14 +1,12 @@
 using Content.Shared.Backmen.Surgery.Tools;
 using Content.Shared.Backmen.Targeting;
-using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
-using Content.Shared.Damage;
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
-using Content.Shared.Humanoid;
 
 namespace Content.Shared.Body.Part;
 
@@ -69,56 +67,10 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     public Dictionary<string, OrganSlot> Organs = new();
 
     /// <summary>
-    /// How much health the body part has until it pops out.
-    /// </summary>
-    [ViewVariables]
-    public float TotalDamage => Damage.GetTotal().Float();
-
-    /// <summary>
-    /// The DamageSpecifier that contains all types of damage that the BodyPart can take.
-    /// TODO: Rework this with DamageableComponent
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public DamageSpecifier Damage = new()
-    {
-        DamageDict = new Dictionary<string, FixedPoint2>
-        {
-            { "Blunt", 0 },
-            { "Slash", 0 },
-            { "Piercing", 0 },
-            { "Heat", 0 },
-            { "Cold", 0 },
-            { "Shock", 0 },
-            { "Caustic", 0 },
-        }
-    };
-
-    [DataField, AutoNetworkedField]
-    public float MinIntegrity = 0;
-
-    /// <summary>
-    /// The total damage that has to be dealt to a body part
-    /// to make possible severing it.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float SeverIntegrity = 100;
-
-    /// <summary>
-    /// On what TargetIntegrity we should re-enable the part.
+    /// What's the max health this body part can have?
     /// </summary>
-    [DataField, AutoNetworkedField]
-    public TargetIntegrity EnableIntegrity = TargetIntegrity.ModeratelyWounded;
-
-    [DataField, AutoNetworkedField]
-    public Dictionary<TargetIntegrity, float> IntegrityThresholds = new()
-    {
-        { TargetIntegrity.CriticallyWounded, 80 },
-        { TargetIntegrity.HeavilyWounded, 65 },
-        { TargetIntegrity.ModeratelyWounded, 48 },
-        { TargetIntegrity.SomewhatWounded, 32 },
-        { TargetIntegrity.LightlyWounded, 17 },
-        { TargetIntegrity.Healthy, 6 },
-    };
+    [DataField]
+    public float MinIntegrity;
 
     /// <summary>
     /// Whether this body part is enabled or not.
@@ -129,18 +81,18 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     /// <summary>
     /// How long it takes to run another self heal tick on the body part.
     /// </summary>
-    [DataField("healingTime")]
+    [DataField]
     public float HealingTime = 30;
 
     /// <summary>
     /// How long it has been since the last self heal tick on the body part.
     /// </summary>
-    public float HealingTimer = 0;
+    public float HealingTimer;
 
     /// <summary>
     /// How much health to heal on the body part per tick.
     /// </summary>
-    [DataField("selfHealingAmount")]
+    [DataField]
     public float SelfHealingAmount = 5;
 
     [DataField]
@@ -157,10 +109,28 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     public string Species { get; set; } = "";
 
     /// <summary>
-    ///     Do not make a stupid joke do not make a stupid joke do not make a stupid joke.
+    /// The total damage that has to be dealt to a body part
+    /// to make possible severing it.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public Sex Sex { get; set; } = Sex.Male;
+    public float SeverIntegrity = 90;
+
+    /// <summary>
+    /// On what TargetIntegrity we should re-enable the part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TargetIntegrity EnableIntegrity = TargetIntegrity.ModeratelyWounded;
+
+    [DataField, AutoNetworkedField]
+    public Dictionary<TargetIntegrity, float> IntegrityThresholds = new()
+    {
+        { TargetIntegrity.CriticallyWounded, 90 },
+        { TargetIntegrity.HeavilyWounded, 75 },
+        { TargetIntegrity.ModeratelyWounded, 60 },
+        { TargetIntegrity.SomewhatWounded, 40},
+        { TargetIntegrity.LightlyWounded, 20 },
+        { TargetIntegrity.Healthy, 10 },
+    };
 
     /// <summary>
     /// These are only for VV/Debug do not use these for gameplay/systems
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index ceddd728301..ec4df450985 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -14,9 +14,7 @@
 using Content.Shared.Gibbing.Systems;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Events;
-using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Inventory;
-using Content.Shared.Rejuvenate;
 using Content.Shared.Standing;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -52,9 +50,7 @@ private void InitializeBody()
         SubscribeLocalEvent<BodyComponent, ComponentInit>(OnBodyInit);
         SubscribeLocalEvent<BodyComponent, MapInitEvent>(OnBodyMapInit);
         SubscribeLocalEvent<BodyComponent, CanDragEvent>(OnBodyCanDrag);
-        SubscribeLocalEvent<BodyComponent, DamageChangedEvent>(OnDamageChanged);
         SubscribeLocalEvent<BodyComponent, StandAttemptEvent>(OnStandAttempt);
-        SubscribeLocalEvent<BodyComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<BodyComponent, ProfileLoadFinishedEvent>(OnProfileLoadFinished);
     }
 
@@ -147,43 +143,6 @@ private void OnStandAttempt(Entity<BodyComponent> ent, ref StandAttemptEvent arg
             args.Cancel();
     }
 
-    private void OnDamageChanged(Entity<BodyComponent> ent, ref DamageChangedEvent args)
-    {
-        if (!_gameTiming.IsFirstTimePredicted)
-            return;
-
-        DebugTools.Assert(ent.Comp is not null);
-        if (args.PartMultiplier == 0
-            || args.TargetPart is null
-            || args.DamageDelta is null
-            || args is { DamageIncreased: false, DamageDecreased: false })
-            return;
-
-        // Go through every flag and apply damage to them.
-        var targets = SharedTargetingSystem.GetValidParts();
-        foreach (var target in targets)
-        {
-            if (!args.TargetPart.Value.HasFlag(target))
-                continue;
-
-            var (targetType, targetSymmetry) = ConvertTargetBodyPart(target);
-            foreach (var part in GetBodyChildrenOfType(ent, targetType, ent.Comp)
-                         .Where(part => part.Component.Symmetry == targetSymmetry))
-            {
-                ApplyPartDamage(part, args.DamageDelta, targetType, target, args.CanSever, args.Evade, args.PartMultiplier);
-            }
-        }
-    }
-
-    private void OnRejuvenate(Entity<BodyComponent> ent, ref RejuvenateEvent args)
-    {
-        foreach (var part in GetBodyChildren(ent, ent.Comp))
-        {
-            var healing = GetHealingSpecifier(part.Component);
-            TrySetIntegrity(part, healing, false, GetTargetBodyPart(part), out _);
-        }
-    }
-
     /// <summary>
     /// Sets up all of the relevant body parts for a particular body entity and root part.
     /// </summary>
@@ -425,22 +384,20 @@ public virtual HashSet<EntityUid> GibPart(
     {
         var gibs = new HashSet<EntityUid>();
 
-        _gibbingSystem.TryGibEntityWithRef(
-            partId,
-            partId,
-            GibType.Gib,
-            GibContentsOption.Drop,
-            ref gibs,
-            playAudio: true,
-            launchGibs: true,
-            launchDirection: splatDirection,
-            launchImpulse: GibletLaunchImpulse * splatModifier,
-            launchImpulseVariance: GibletLaunchImpulseVariance,
-            launchCone: splatCone);
-
-        if (TryComp<InventoryComponent>(partId, out var inventory))
+        if (!Resolve(partId, ref part, logMissing: false))
+            return gibs;
+
+        if (part.Body is { } bodyEnt)
+            RemovePartChildren((partId, part), bodyEnt);
+
+        _gibbingSystem.TryGibEntityWithRef(partId, partId, GibType.Gib, GibContentsOption.Drop, ref gibs,
+                playAudio: true, launchGibs: true, launchDirection: splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
+                launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
+
+
+        if (HasComp<InventoryComponent>(partId))
         {
-            foreach (var item in _inventory.GetHandOrInventoryEntities((partId, null, inventory)))
+            foreach (var item in _inventory.GetHandOrInventoryEntities((partId)))
             {
                 SharedTransform.AttachToGridOrMap(item);
                 gibs.Add(item);
@@ -453,13 +410,10 @@ public virtual HashSet<EntityUid> GibPart(
 
     private void OnProfileLoadFinished(EntityUid uid, BodyComponent component, ProfileLoadFinishedEvent args)
     {
-        if (!TryComp<HumanoidAppearanceComponent>(uid, out var appearance)
+        if (!HasComp<HumanoidAppearanceComponent>(uid)
             || TerminatingOrDeleted(uid))
-            return;
 
         foreach (var part in GetBodyChildren(uid, component))
-        {
             EnsureComp<BodyPartAppearanceComponent>(part.Id);
-        }
     }
 }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index c7282af6355..da7ecf4cbaf 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -49,9 +49,7 @@ private void OnMapInit(Entity<BodyPartComponent> ent, ref MapInitEvent args)
     private void OnBodyPartRemove(Entity<BodyPartComponent> ent, ref ComponentRemove args)
     {
         if (ent.Comp.PartType == BodyPartType.Torso)
-        {
             _slots.RemoveItemSlot(ent, ent.Comp.ItemInsertionSlot);
-        }
     }
     private void OnBodyPartInserted(Entity<BodyPartComponent> ent, ref EntInsertedIntoContainerMessage args)
     {
@@ -82,6 +80,7 @@ private void OnBodyPartRemoved(Entity<BodyPartComponent> ent, ref EntRemovedFrom
 
         if (TryComp(removedUid, out BodyPartComponent? part) && part.Body is not null)
         {
+            CheckBodyPart((removedUid, part), GetTargetBodyPart(part), true);
             RemovePart(part.Body.Value, (removedUid, part), slotId);
             RecursiveBodyUpdate((removedUid, part), null);
         }
@@ -170,11 +169,9 @@ protected virtual void RemovePart(
 
     protected virtual void DropPart(Entity<BodyPartComponent> partEnt)
     {
-        ChangeSlotState(partEnt, true);
         // I don't know if this can cause issues, since any part that's being detached HAS to have a Body.
         // though I really just want the compiler to shut the fuck up.
         var body = partEnt.Comp.Body.GetValueOrDefault();
-        // We then detach the part, which will kickstart EntRemovedFromContainer events.
         if (TryComp(partEnt, out TransformComponent? transform) && _gameTiming.IsFirstTimePredicted)
         {
             var enableEvent = new BodyPartEnableChangedEvent(false);
@@ -194,35 +191,9 @@ protected virtual void DropPart(Entity<BodyPartComponent> partEnt)
 
     }
 
-
-    /// <summary>
-    /// This function handles disabling or enabling equipment slots when an entity is
-    /// missing all of a given part type, or they get one added to them.
-    /// It is called right before dropping a part, or right after adding one.
-    /// </summary>
-    public void ChangeSlotState(Entity<BodyPartComponent> partEnt, bool disable)
-    {
-        if (partEnt.Comp.Body is not null)
-            Log.Debug($"Attempting to change slot state to {disable} for {partEnt.Comp.PartType}. Number of parts: {GetBodyPartCount(partEnt.Comp.Body.Value, partEnt.Comp.PartType)}");
-        if (partEnt.Comp.Body is not null
-            && GetBodyPartCount(partEnt.Comp.Body.Value, partEnt.Comp.PartType) == 1
-            && TryGetPartSlotContainerName(partEnt.Comp.PartType, out var containerNames))
-        {
-            Log.Debug($"Found container names {containerNames}, with a number of {containerNames.Count}");
-            foreach (var containerName in containerNames)
-            {
-                Log.Debug($"Setting slot state to {disable} for {containerName}");
-                _inventorySystem.SetSlotStatus(partEnt.Comp.Body.Value, containerName, disable);
-                var ev = new RefreshInventorySlotsEvent(containerName);
-                RaiseLocalEvent(partEnt.Comp.Body.Value, ev);
-            }
-        }
-    }
-
-    private void OnAmputateAttempt(Entity<BodyPartComponent> partEnt, ref AmputateAttemptEvent args)
-    {
+    private void OnAmputateAttempt(Entity<BodyPartComponent> partEnt, ref AmputateAttemptEvent args) =>
         DropPart(partEnt);
-    }
+
     private void AddLeg(Entity<BodyPartComponent> legEnt, Entity<BodyComponent?> bodyEnt)
     {
         if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
@@ -256,6 +227,14 @@ private void RemovePartEffect(Entity<BodyPartComponent> partEnt, Entity<BodyComp
         if (TerminatingOrDeleted(bodyEnt) || !Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
             return;
 
+        RemovePartChildren(partEnt, bodyEnt, bodyEnt.Comp);
+    }
+
+    protected void RemovePartChildren(Entity<BodyPartComponent> partEnt, EntityUid bodyEnt, BodyComponent? body = null)
+    {
+        if (!Resolve(bodyEnt, ref body, logMissing: false))
+            return;
+
         if (partEnt.Comp.Children.Any())
         {
             foreach (var slotId in partEnt.Comp.Children.Keys)
@@ -270,9 +249,9 @@ slot.ContainedEntity is { } childEntity &&
                     DropPart((childEntity, childPart));
                 }
             }
-            Dirty(bodyEnt, bodyEnt.Comp);
-        }
 
+            Dirty(bodyEnt, body);
+        }
     }
 
     private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartComponent> partEnt)
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index ba08a6233dd..76453a9002c 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Body.Systems;
 using Content.Shared.Radiation.Events;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Backmen.Targeting;
@@ -22,12 +23,13 @@ public sealed class DamageableSystem : EntitySystem
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly INetManager _netMan = default!;
         [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
+
+        [Dependency] private readonly SharedBodySystem _body = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         private EntityQuery<AppearanceComponent> _appearanceQuery;
         private EntityQuery<DamageableComponent> _damageableQuery;
         private EntityQuery<MindContainerComponent> _mindContainerQuery;
         private EntityQuery<TargetingComponent> _targetingQuery;
-
         public override void Initialize()
         {
             SubscribeLocalEvent<DamageableComponent, ComponentInit>(DamageableInit);
@@ -101,51 +103,11 @@ public void SetDamage(EntityUid uid, DamageableComponent damageable, DamageSpeci
         ///     The damage changed event is used by other systems, such as damage thresholds.
         /// </remarks>
         public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSpecifier? damageDelta = null,
-            bool interruptsDoAfters = true, EntityUid? origin = null, bool canSever = true, bool evade = false, float partMultiplier = 1.00f, TargetBodyPart? targetPart = null)
+            bool interruptsDoAfters = true, EntityUid? origin = null, bool? canSever = null)
+
         {
             component.Damage.GetDamagePerGroup(_prototypeManager, component.DamagePerGroup);
             component.TotalDamage = component.Damage.GetTotal();
-            // If our target has a TargetingComponent, that means they will take limb damage
-            // And if their attacker also has one, then we use that part.
-            if (_targetingQuery.TryComp(uid, out var target))
-            {
-                if (targetPart != null)
-                {
-                    // keep from args
-                }
-                else  if (origin.HasValue && _targetingQuery.TryComp(origin.Value, out var targeter))
-                {
-                    // Targeter has the targeting component, damage what it wants.
-                    targetPart = targeter.Target;
-                    // ...Or do we?
-                    // If the target is Torso then have a 33% chance to hit another part
-                    if (targetPart.Value == TargetBodyPart.Torso)
-                        targetPart = GetRandomPartSpread(_random, 10);
-                }
-                else
-                {
-                    // If there's some specific origin of the damage, probably we should attack just a random part.
-                    if (origin.HasValue)
-                    {
-                        targetPart = GetRandomBodyPart(uid, target);
-                    }
-                    // Otherwise damage all body parts equally
-                    else if (damageDelta != null)
-                    {
-                        // Divide damage between all parts, so it will be more fair
-                        var newDamageDelta = new DamageSpecifier();
-                        foreach (var (damage, value) in damageDelta.DamageDict)
-                        {
-                            // Division by 2 cuz damaging all parts by the same damage by default is too much.
-                            newDamageDelta.DamageDict.Add(damage, value / 2);
-                        }
-                        damageDelta = newDamageDelta;
-
-                        targetPart = TargetBodyPart.All;
-                    }
-                }
-            }
-
             Dirty(uid, component);
 
             if (_appearanceQuery.TryGetComponent(uid, out var appearance) && damageDelta != null)
@@ -153,7 +115,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 var data = new DamageVisualizerGroupData(component.DamagePerGroup.Keys.ToList());
                 _appearance.SetData(uid, DamageVisualizerKeys.DamageUpdateGroups, data, appearance);
             }
-            RaiseLocalEvent(uid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters, origin, targetPart, canSever, evade, partMultiplier));
+            RaiseLocalEvent(uid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters, origin, canSever ?? true));
         }
 
         /// <summary>
@@ -170,7 +132,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
         /// </returns>
         public DamageSpecifier? TryChangeDamage(EntityUid? uid, DamageSpecifier damage, bool ignoreResistances = false,
             bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null,
-            bool? canSever = true, bool? evade = false, float? partMultiplier = 1.00f, TargetBodyPart? targetPart = null)
+            bool? canSever = true, bool? canEvade = false, float? partMultiplier = 1.00f, TargetBodyPart? targetPart = null)
         {
             if (!uid.HasValue || !_damageableQuery.Resolve(uid.Value, ref damageable, false))
             {
@@ -183,10 +145,10 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 return damage;
             }
 
-            var before = new BeforeDamageChangedEvent(damage, origin, targetPart);
+            var before = new BeforeDamageChangedEvent(damage, origin, targetPart, canSever ?? true, canEvade ?? false, partMultiplier ?? 1.00f);
             RaiseLocalEvent(uid.Value, ref before);
 
-            if (before.Cancelled)
+            if (before.Cancelled || before.Evaded)
                 return null;
 
             // Apply resistances
@@ -197,6 +159,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 {
                     // TODO DAMAGE PERFORMANCE
                     // use a local private field instead of creating a new dictionary here..
+                    // TODO: We need to add a check to see if the given armor covers the targeted part (if any) to modify or not.
                     damage = DamageSpecifier.ApplyModifierSet(damage, modifierSet);
                 }
                 var ev = new DamageModifyEvent(damage, origin, targetPart);
@@ -231,7 +194,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
             }
 
             if (delta.DamageDict.Count > 0)
-                DamageChanged(uid.Value, damageable, delta, interruptsDoAfters, origin, canSever ?? true, evade ?? false, partMultiplier ?? 1.00f, targetPart);
+                DamageChanged(uid.Value, damageable, delta, interruptsDoAfters, origin, canSever);
 
             return delta;
         }
@@ -301,6 +264,11 @@ private void OnRejuvenate(EntityUid uid, DamageableComponent component, Rejuvena
             TryComp<MobThresholdsComponent>(uid, out var thresholds);
             _mobThreshold.SetAllowRevives(uid, true, thresholds); // do this so that the state changes when we set the damage
             SetAllDamage(uid, component, 0);
+            // Shitmed Start
+            if (HasComp<TargetingComponent>(uid))
+                foreach (var part in _body.GetBodyChildren(uid))
+                    RaiseLocalEvent(part.Id, new RejuvenateEvent());
+            // Shitmed End
             _mobThreshold.SetAllowRevives(uid, false, thresholds);
         }
 
@@ -325,44 +293,6 @@ private void DamageableHandleState(EntityUid uid, DamageableComponent component,
                 DamageChanged(uid, component, delta);
             }
         }
-
-        public TargetBodyPart? GetRandomBodyPart(EntityUid uid, TargetingComponent? target = null)
-        {
-            if (!Resolve(uid, ref target))
-                return null;
-
-            var totalWeight = target.TargetOdds.Values.Sum();
-            var randomValue = _random.NextFloat() * totalWeight;
-
-            foreach (var (part, weight) in target.TargetOdds)
-            {
-                if (randomValue <= weight)
-                    return part;
-                randomValue -= weight;
-            }
-
-            return TargetBodyPart.Torso; // Default to torso if something goes wrong
-        }
-
-        /// <summary>
-        /// Gets the random body part rolling a number between 1 and 5, and returns
-        /// Torso if rolled 6 or more. Bigger the parameter torsoWeight, bigger chance to return it.
-        /// By default the chance to return Torso is 50%.
-        /// </summary>
-        private static TargetBodyPart GetRandomPartSpread(IRobustRandom random, ushort torsoWeight = 5)
-        {
-            const int targetPartsAmount = 5;
-            // 5 = amount of target parts except Torso
-            return random.Next(1, targetPartsAmount + torsoWeight) switch
-            {
-                1 => TargetBodyPart.Head,
-                2 => TargetBodyPart.RightArm,
-                3 => TargetBodyPart.LeftArm,
-                4 => TargetBodyPart.RightLeg,
-                5 => TargetBodyPart.LeftLeg,
-                _ => TargetBodyPart.Torso,
-            };
-        }
     }
 
     /// <summary>
@@ -372,7 +302,11 @@ private static TargetBodyPart GetRandomPartSpread(IRobustRandom random, ushort t
     public record struct BeforeDamageChangedEvent(
         DamageSpecifier Damage,
         EntityUid? Origin = null,
-        TargetBodyPart? targetPart = null,
+        TargetBodyPart? TargetPart = null,
+        bool CanSever = true,
+        bool CanEvade = false,
+        float PartMultiplier = 1.00f,
+        bool Evaded = false,
         bool Cancelled = false);
 
     /// <summary>
@@ -386,7 +320,6 @@ public sealed class DamageModifyEvent : EntityEventArgs, IInventoryRelayEvent
     {
         // Whenever locational damage is a thing, this should just check only that bit of armour.
         public SlotFlags TargetSlots { get; } = ~SlotFlags.POCKET;
-
         public readonly DamageSpecifier OriginalDamage;
         public DamageSpecifier Damage;
         public EntityUid? Origin;
@@ -420,15 +353,10 @@ public sealed class DamageChangedEvent : EntityEventArgs
         public readonly DamageSpecifier? DamageDelta;
 
         /// <summary>
-        ///     Was any of the change dealing damage?
+        ///     Was any of the damage change dealing damage, or was it all healing?
         /// </summary>
         public readonly bool DamageIncreased;
 
-        /// <summary>
-        ///     Was any of the change healing?
-        /// </summary>
-        public readonly bool DamageDecreased;
-
         /// <summary>
         ///     Does this event interrupt DoAfters?
         ///     Note: As provided in the constructor, this *does not* account for DamageIncreased.
@@ -441,35 +369,18 @@ public sealed class DamageChangedEvent : EntityEventArgs
         /// </summary>
         public readonly EntityUid? Origin;
 
-        /// <summary>
-        ///     How much do we multiply this damage by for part damage?
-        /// </summary>
-        public readonly float PartMultiplier;
-
         /// <summary>
         ///     Can this damage event sever parts?
         /// </summary>
         public readonly bool CanSever;
 
-        /// <summary>
-        ///     Will this damage be guaranteed for all body parts?
-        /// </summary>
-        public readonly bool Evade;
-
-        /// <summary>
-        ///     What part of this entity is going to take damage?
-        /// </summary>
-        public readonly TargetBodyPart? TargetPart;
-
-        public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damageDelta, bool interruptsDoAfters,
-            EntityUid? origin, TargetBodyPart? targetPart = null, bool canSever = true, bool Evade = false, float partMultiplier = 1.00f)
+        public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damageDelta, bool interruptsDoAfters, EntityUid? origin, bool canSever = true)
         {
             Damageable = damageable;
             DamageDelta = damageDelta;
             Origin = origin;
-            TargetPart = targetPart;
             CanSever = canSever;
-            PartMultiplier = partMultiplier;
+
             if (DamageDelta == null)
                 return;
 
@@ -480,11 +391,6 @@ public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damag
                     DamageIncreased = true;
                     break;
                 }
-                else if (damageChange < 0)
-                {
-                    DamageDecreased = true;
-                    break;
-                }
             }
             InterruptsDoAfters = interruptsDoAfters && DamageIncreased;
         }
diff --git a/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs b/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs
index fc894854dcf..afe78a15172 100644
--- a/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs
+++ b/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs
@@ -1,9 +1,7 @@
 namespace Content.Shared.Humanoid.Events;
 
 /// <summary>
-/// Raised on an entity when their profile has finished being loaded
+///     Raised on an entity when their profile has finished being loaded
 /// </summary>
-public sealed class ProfileLoadFinishedEvent : EntityEventArgs
-{
-}
+public sealed class ProfileLoadFinishedEvent : EntityEventArgs { }
 
diff --git a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
index 0f8b940bd66..17912e400a5 100644
--- a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
+++ b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
@@ -47,18 +47,30 @@ public static IEnumerable<HumanoidVisualLayers> Sublayers(HumanoidVisualLayers l
                     yield return HumanoidVisualLayers.LArm;
                     yield return HumanoidVisualLayers.LHand;
                     break;
+                case HumanoidVisualLayers.LHand:
+                    yield return HumanoidVisualLayers.LHand;
+                    break;
                 case HumanoidVisualLayers.RArm:
                     yield return HumanoidVisualLayers.RArm;
                     yield return HumanoidVisualLayers.RHand;
                     break;
+                case HumanoidVisualLayers.RHand:
+                    yield return HumanoidVisualLayers.RHand;
+                    break;
                 case HumanoidVisualLayers.LLeg:
                     yield return HumanoidVisualLayers.LLeg;
                     yield return HumanoidVisualLayers.LFoot;
                     break;
+                case HumanoidVisualLayers.LFoot:
+                    yield return HumanoidVisualLayers.LFoot;
+                    break;
                 case HumanoidVisualLayers.RLeg:
                     yield return HumanoidVisualLayers.RLeg;
                     yield return HumanoidVisualLayers.RFoot;
                     break;
+                case HumanoidVisualLayers.RFoot:
+                    yield return HumanoidVisualLayers.RFoot;
+                    break;
                 case HumanoidVisualLayers.Chest:
                     yield return HumanoidVisualLayers.Chest;
                     yield return HumanoidVisualLayers.Tail;
diff --git a/Content.Shared/Inventory/InventoryTemplatePrototype.cs b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
index cc70a842314..0d900688fcc 100644
--- a/Content.Shared/Inventory/InventoryTemplatePrototype.cs
+++ b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
@@ -59,5 +59,5 @@ public sealed partial class SlotDefinition
     /// <summary>
     ///     Is this slot disabled? Could be due to severing or other reasons.
     /// </summary>
-    [DataField("disabled")] public bool Disabled = false;
+    [DataField] public bool Disabled;
 }
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
index 5928b3871ff..fe6d36a23b5 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Database;
+using Content.Shared.Backmen.Surgery.Body;
+using Content.Shared.Database;
 using Content.Shared.Mobs.Components;
 
 namespace Content.Shared.Mobs.Systems;
@@ -103,6 +104,9 @@ private void ChangeState(EntityUid target, MobStateComponent component, MobState
         if (oldState == newState || !component.AllowedStates.Contains(newState))
             return;
 
+        if (oldState == MobState.Dead && HasComp<DebrainedComponent>(target))
+            return;
+
         OnExitState(target, component, oldState);
         component.CurrentState = newState;
         OnEnterState(target, component, newState);
diff --git a/Resources/Locale/en-US/backmen/surgery/surgery-ui.ftl b/Resources/Locale/en-US/backmen/surgery/surgery-ui.ftl
index cf58da3977b..f09c9dc102a 100644
--- a/Resources/Locale/en-US/backmen/surgery/surgery-ui.ftl
+++ b/Resources/Locale/en-US/backmen/surgery/surgery-ui.ftl
@@ -9,3 +9,4 @@ surgery-ui-window-steps-error-armor = You need to remove their armor!
 surgery-ui-window-steps-error-tools = Missing tools.
 surgery-error-laying = They need to be laying down!
 surgery-error-self-surgery = You can't perform surgery on yourself!
+surgery-part-damage-evaded = {$user} narrowly evaded!
diff --git a/Resources/Prototypes/Body/Organs/felinid.yml b/Resources/Prototypes/Body/Organs/felinid.yml
new file mode 100644
index 00000000000..a7704b71a52
--- /dev/null
+++ b/Resources/Prototypes/Body/Organs/felinid.yml
@@ -0,0 +1,24 @@
+- type: entity
+  id: OrganFelinidEars
+  parent: OrganHumanEars
+  name: cat ears
+  description: "Holding these might potentially be contagious."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/catears.rsi
+    state: icon
+  - type: MarkingContainer
+    marking: FelinidEarsBasic
+
+- type: entity
+  id: OrganFelinidTail
+  parent: BaseHumanOrgan
+  name: cat tail
+  description: "Should you really have this?"
+  components:
+  - type: Sprite
+    sprite: Backmen/Mobs/Customization/felinid_tails.rsi
+    state: basic_tail_tip
+  - type: MarkingContainer
+    marking: FelinidTailBasic
+  - type: Tail
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 6882fa8c0ad..d918b17859d 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -121,8 +121,9 @@
   name: ears
   description: "There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible."
   components:
-    - type: Sprite
-      state: ears
+  - type: Sprite
+    state: ears
+  - type: Ears # backmen: surgery
 
 - type: entity
   id: OrganHumanLungs
diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml
index 347b052c8bc..21af8882eba 100644
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -12,7 +12,7 @@
   - type: Sprite
     sprite: Mobs/Species/Reptilian/parts.rsi
   - type: Damageable
-    damageContainer: Biological
+    damageContainer: OrganicPart # backmen: surgery Shitmed
   - type: BodyPart
   - type: ContainerContainer
     containers:
diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml
index bb5bdcca27f..3e29cf76914 100644
--- a/Resources/Prototypes/Body/Parts/base.yml
+++ b/Resources/Prototypes/Body/Parts/base.yml
@@ -1,5 +1,3 @@
-# TODO: Add descriptions (many)
-# TODO BODY: Part damage
 - type: entity
   id: BasePart
   parent: BaseItem
@@ -7,7 +5,7 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: Biological
+    damageContainer: OrganicPart # backmen: surgery
   - type: BodyPart
   # start-backmen: surgery
   - type: SurgeryTool
@@ -16,7 +14,6 @@
     endSound:
       path: /Audio/Medical/Surgery/organ2.ogg
   # end-backmen: surgery
-  - type: Gibbable
   - type: ContainerContainer
     containers:
       bodypart: !type:Container
@@ -27,12 +24,13 @@
     tags:
       - Trash
   # start-backmen: surgery
+  - type: Gibbable # backmen: surgery
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTypeTrigger
         damageType: Blunt
-        damage: 50
+        damage: 75
       behaviors:
       - !type:GibPartBehavior { }
     - trigger:
diff --git a/Resources/Prototypes/Body/Parts/skeleton.yml b/Resources/Prototypes/Body/Parts/skeleton.yml
index 35d1d0f3738..849d84b8a18 100644
--- a/Resources/Prototypes/Body/Parts/skeleton.yml
+++ b/Resources/Prototypes/Body/Parts/skeleton.yml
@@ -1,4 +1,3 @@
-# TODO BODY: Part damage
 - type: entity
   id: PartSkeleton
   parent: BaseItem
@@ -6,7 +5,7 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: Biological
+    damageContainer: OrganicPart # backmen: surgery
   - type: BodyPart
   - type: ContainerContainer
     containers:
@@ -14,16 +13,17 @@
         ents: []
   - type: StaticPrice
     price: 20
-  - type: Gibbable
   - type: Tag
     tags:
       - Trash
+  # start-backmen: surgery
+  - type: Gibbable
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTypeTrigger
         damageType: Blunt
-        damage: 50
+        damage: 75
       behaviors:
       - !type:GibPartBehavior { }
     - trigger:
@@ -47,6 +47,7 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MeatLaserImpact
+  # end-backmen: surgery
 
 - type: entity
   id: TorsoSkeleton
diff --git a/Resources/Prototypes/Body/Parts/vox.yml b/Resources/Prototypes/Body/Parts/vox.yml
index 9f89a0c583d..58427fe4f8b 100644
--- a/Resources/Prototypes/Body/Parts/vox.yml
+++ b/Resources/Prototypes/Body/Parts/vox.yml
@@ -7,7 +7,7 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: Biological
+    damageContainer: OrganicPart # backmen: surgery Shitmed
   - type: BodyPart
   - type: ContainerContainer
     containers:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 4287d6ba56d..d3c792be768 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -32,6 +32,8 @@
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
+      enum.SurgeryUIKey.Key: # backmen: surgery
+        type: SurgeryBui
   # to prevent bag open/honk spam
   - type: UseDelay
     delay: 0.5
diff --git a/Resources/Prototypes/_Backmen/Damage/containers.yml b/Resources/Prototypes/_Backmen/Damage/containers.yml
new file mode 100644
index 00000000000..d3e24daf03c
--- /dev/null
+++ b/Resources/Prototypes/_Backmen/Damage/containers.yml
@@ -0,0 +1,5 @@
+- type: damageContainer
+  id: OrganicPart # backmen: surgery
+  supportedGroups:
+    - Brute
+    - Burn
diff --git a/Resources/Prototypes/_Backmen/Damage/modifier_sets.yml b/Resources/Prototypes/_Backmen/Damage/modifier_sets.yml
new file mode 100644
index 00000000000..12dfd3bfabe
--- /dev/null
+++ b/Resources/Prototypes/_Backmen/Damage/modifier_sets.yml
@@ -0,0 +1,11 @@
+# backmen: surgery
+# Change this if you want to alter how damage types affect part severing/integrity.
+- type: damageModifierSet
+  id: PartDamage
+  coefficients:
+    Blunt: 0.8
+    Slash: 1.2
+    Piercing: 0.5
+    Cold: 0.5
+    Heat: 0.8
+    Shock: 0.5
diff --git a/Resources/Prototypes/_Backmen/Entities/Surgery/surgeries.yml b/Resources/Prototypes/_Backmen/Entities/Surgery/surgeries.yml
index 5b0e7c83abf..9f033333e4f 100644
--- a/Resources/Prototypes/_Backmen/Entities/Surgery/surgeries.yml
+++ b/Resources/Prototypes/_Backmen/Entities/Surgery/surgeries.yml
@@ -308,7 +308,7 @@
     steps:
     - SurgeryStepSawBones
     - SurgeryStepInsertOrgan
-    - SurgeryStepSealWounds
+    - SurgeryStepSealOrganWound
   - type: SurgeryPartCondition
     part: Head
   - type: SurgeryOrganCondition
@@ -347,7 +347,7 @@
     steps:
     - SurgeryStepSawBones
     - SurgeryStepInsertHeart
-    - SurgeryStepSealWounds
+    - SurgeryStepSealOrganWound
   - type: SurgeryPartCondition
     part: Torso
   - type: SurgeryOrganCondition
@@ -385,7 +385,7 @@
     steps:
     - SurgeryStepSawBones
     - SurgeryStepInsertLiver
-    - SurgeryStepSealWounds
+    - SurgeryStepSealOrganWound
   - type: SurgeryPartCondition
     part: Torso
   - type: SurgeryOrganCondition
@@ -423,7 +423,7 @@
     steps:
     - SurgeryStepSawBones
     - SurgeryStepInsertLungs
-    - SurgeryStepSealWounds
+    - SurgeryStepSealOrganWound
   - type: SurgeryPartCondition
     part: Torso
   - type: SurgeryOrganCondition
@@ -461,7 +461,7 @@
     steps:
     - SurgeryStepSawBones
     - SurgeryStepInsertEyes
-    - SurgeryStepSealWounds
+    - SurgeryStepSealOrganWound
   - type: SurgeryPartCondition
     part: Head
   - type: SurgeryOrganCondition
@@ -469,3 +469,71 @@
     - type: Eyes
     inverse: true
     reattaching: true
+
+# Fluff/Joke Surgeries
+
+#- type: entity
+#  parent: SurgeryBase
+#  id: SurgeryAddFelinidEars
+#  name: Add cat ears
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: Surgery
+#    #requirement: SurgeryOpenIncision
+#    steps:
+#    - SurgeryStepAddFelinidEars
+#  - type: SurgeryPartCondition
+#    part: Head
+#  - type: SurgeryMarkingCondition
+#    markingCategory: HeadTop
+#    matchString: FelinidEars
+#    inverse: true
+
+#- type: entity
+#  parent: SurgeryBase
+#  id: SurgeryRemoveFelinidEars
+#  name: Remove cat ears
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: Surgery
+#    requirement: SurgeryOpenIncision
+#    steps:
+#    - SurgeryStepRemoveFelinidEars
+#  - type: SurgeryPartCondition
+#    part: Head
+#  - type: SurgeryMarkingCondition
+#    markingCategory: HeadTop
+#    matchString: FelinidEars
+
+#- type: entity
+#  parent: SurgeryBase
+#  id: SurgeryAddFelinidTail
+#  name: Add cat tail
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: Surgery
+#    requirement: SurgeryOpenIncision
+#    steps:
+#    - SurgeryStepAddFelinidTail
+#  - type: SurgeryPartCondition
+#    part: Torso
+#  - type: SurgeryMarkingCondition
+#    markingCategory: Tail
+#    matchString: FelinidTail
+#    inverse: true
+
+#- type: entity
+#  parent: SurgeryBase
+#  id: SurgeryRemoveFelinidTail
+#  name: Remove cat tail
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: Surgery
+#    requirement: SurgeryOpenIncision
+#    steps:
+#    - SurgeryStepRemoveFelinidTail
+#  - type: SurgeryPartCondition
+#    part: Torso
+#  - type: SurgeryMarkingCondition
+#    markingCategory: Tail
+#    matchString: FelinidTail
diff --git a/Resources/Prototypes/_Backmen/Entities/Surgery/surgery_steps.yml b/Resources/Prototypes/_Backmen/Entities/Surgery/surgery_steps.yml
index ede2dce9060..434c06f35b5 100644
--- a/Resources/Prototypes/_Backmen/Entities/Surgery/surgery_steps.yml
+++ b/Resources/Prototypes/_Backmen/Entities/Surgery/surgery_steps.yml
@@ -194,8 +194,6 @@
   - type: SurgeryStep
     tool:
     - type: BodyPart
-    add:
-    - type: BodyPartReattached
   - type: Sprite
     sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
     state: insertion
@@ -214,13 +212,12 @@
     - type: SkinRetracted
     - type: BleedersClamped
     - type: IncisionOpen
-    - type: BodyPartReattached
     - type: InternalBleedersClamped
+  - type: SurgeryAffixPartStep
   - type: Sprite
     sprite: Objects/Specific/Medical/Surgery/cautery.rsi
     state: cautery
   - type: SurgeryStepEmoteEffect
-  - type: SurgeryStepAffixPartEffect
   - type: SurgeryDamageChangeEffect
     damage:
       types:
@@ -275,6 +272,7 @@
     tool:
     - type: BoneSaw
     remove:
+    # We remove these components to force people to go through all the steps again lol, otherwise you can just keep chopping.
     - type: SkinRetracted
     - type: BleedersClamped
     - type: InternalBleedersClamped
@@ -417,8 +415,6 @@
   - type: SurgeryStep
     tool:
     - type: Organ
-    add:
-    - type: OrganReattached
   - type: Sprite
     sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
     state: insertion
@@ -470,3 +466,98 @@
   - type: SurgerySpecialDamageChangeEffect
     damageType: Rot
     isConsumable: true
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepSealOrganWound
+  name: Seal wounds
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Cautery
+  - type: SurgeryAffixOrganStep
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
+    state: cautery
+  - type: SurgeryStepEmoteEffect
+  - type: SurgeryDamageChangeEffect
+    damage:
+      types:
+        Heat: -5
+    sleepModifier: 2
+
+# The lengths I go to just for a joke... I HATE HARDCODING AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+# Maybe I should modify species prototypes to include tails and ears properly...
+
+#- type: entity
+#  parent: SurgeryStepBase
+#  id: SurgeryStepAddFelinidEars
+#  name: Add cat ears
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: SurgeryStep
+#    tool:
+#    - type: Organ
+#  - type: SurgeryAddMarkingStep
+#    marking: FelinidEarsBasic
+#    markingCategory: HeadTop
+#    matchString: FelinidEars
+#    organ:
+#    - type: Ears
+#    accent:
+#    - type: OwOAccent
+#  - type: Sprite
+#    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
+#    state: insertion
+
+#- type: entity
+#  parent: SurgeryStepBase
+#  id: SurgeryStepAddFelinidTail
+#  name: Add cat tail
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: SurgeryStep
+#    tool:
+#    - type: Organ
+#  - type: SurgeryAddMarkingStep
+#    marking: FelinidTailBasic
+#    markingCategory: Tail
+#    matchString: FelinidTail
+#    organ:
+#    - type: Tail
+#  - type: Sprite
+#    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
+#    state: insertion
+
+#- type: entity
+#  parent: SurgeryStepBase
+#  id: SurgeryStepRemoveFelinidEars
+#  name: Remove cat ears
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: SurgeryStep
+#    tool:
+#    - type: Organ
+#  - type: SurgeryRemoveMarkingStep
+#    markingCategory: HeadTop
+#    matchString: FelinidEars
+#  - type: Sprite
+#    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
+#    state: insertion
+
+#- type: entity
+#  parent: SurgeryStepBase
+#  id: SurgeryStepRemoveFelinidTail
+#  name: Remove cat tail
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: SurgeryStep
+#    tool:
+#    - type: Organ
+#  - type: SurgeryRemoveMarkingStep
+#    markingCategory: Tail
+#    matchString: FelinidTail
+#  - type: Sprite
+#    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
+#    state: insertion
diff --git a/Resources/Textures/Interface/Ashen/target_doll.png b/Resources/Textures/Interface/Ashen/target_doll.png
new file mode 100644
index 00000000000..e8eb2f52717
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/target_doll.png differ
diff --git a/Resources/Textures/Interface/Clockwork/target_doll.png b/Resources/Textures/Interface/Clockwork/target_doll.png
new file mode 100644
index 00000000000..8426d42299a
Binary files /dev/null and b/Resources/Textures/Interface/Clockwork/target_doll.png differ
diff --git a/Resources/Textures/Interface/Default/target_doll.png b/Resources/Textures/Interface/Default/target_doll.png
new file mode 100644
index 00000000000..e8eb2f52717
Binary files /dev/null and b/Resources/Textures/Interface/Default/target_doll.png differ
diff --git a/Resources/Textures/Interface/Minimalist/target_doll.png b/Resources/Textures/Interface/Minimalist/target_doll.png
new file mode 100644
index 00000000000..e8eb2f52717
Binary files /dev/null and b/Resources/Textures/Interface/Minimalist/target_doll.png differ
diff --git a/Resources/Textures/Interface/Plasmafire/target_doll.png b/Resources/Textures/Interface/Plasmafire/target_doll.png
new file mode 100644
index 00000000000..57262d67028
Binary files /dev/null and b/Resources/Textures/Interface/Plasmafire/target_doll.png differ
diff --git a/Resources/Textures/Interface/Retro/target_doll.png b/Resources/Textures/Interface/Retro/target_doll.png
new file mode 100644
index 00000000000..a147539c3ae
Binary files /dev/null and b/Resources/Textures/Interface/Retro/target_doll.png differ
diff --git a/Resources/Textures/Interface/Slimecore/target_doll.png b/Resources/Textures/Interface/Slimecore/target_doll.png
new file mode 100644
index 00000000000..0706eb661b5
Binary files /dev/null and b/Resources/Textures/Interface/Slimecore/target_doll.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/eyes.png b/Resources/Textures/Interface/Targeting/Doll/eyes.png
new file mode 100644
index 00000000000..8cf9fa9e191
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/eyes.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/eyes_hover.png b/Resources/Textures/Interface/Targeting/Doll/eyes_hover.png
new file mode 100644
index 00000000000..72a30d73b84
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/eyes_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/groin.png b/Resources/Textures/Interface/Targeting/Doll/groin.png
new file mode 100644
index 00000000000..2c1a3debdaa
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/groin.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/groin_hover.png b/Resources/Textures/Interface/Targeting/Doll/groin_hover.png
new file mode 100644
index 00000000000..313b6a1124c
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/groin_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/head.png b/Resources/Textures/Interface/Targeting/Doll/head.png
new file mode 100644
index 00000000000..9c645d2353c
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/head.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/head_hover.png b/Resources/Textures/Interface/Targeting/Doll/head_hover.png
new file mode 100644
index 00000000000..3c03f2aebe1
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/head_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftarm.png b/Resources/Textures/Interface/Targeting/Doll/leftarm.png
new file mode 100644
index 00000000000..32661f5c6a1
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/leftarm.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftarm_hover.png b/Resources/Textures/Interface/Targeting/Doll/leftarm_hover.png
new file mode 100644
index 00000000000..a9b2c960cec
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/leftarm_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftfoot.png b/Resources/Textures/Interface/Targeting/Doll/leftfoot.png
new file mode 100644
index 00000000000..07da8e67b75
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/leftfoot.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftfoot_hover.png b/Resources/Textures/Interface/Targeting/Doll/leftfoot_hover.png
new file mode 100644
index 00000000000..2c9f9e38df4
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/leftfoot_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/lefthand.png b/Resources/Textures/Interface/Targeting/Doll/lefthand.png
new file mode 100644
index 00000000000..a0251efb2c6
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/lefthand.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/lefthand_hover.png b/Resources/Textures/Interface/Targeting/Doll/lefthand_hover.png
new file mode 100644
index 00000000000..3ff52eae555
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/lefthand_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftleg.png b/Resources/Textures/Interface/Targeting/Doll/leftleg.png
new file mode 100644
index 00000000000..99dc24ce62e
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/leftleg.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/leftleg_hover.png b/Resources/Textures/Interface/Targeting/Doll/leftleg_hover.png
new file mode 100644
index 00000000000..f2c2979e418
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/leftleg_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/mouth.png b/Resources/Textures/Interface/Targeting/Doll/mouth.png
new file mode 100644
index 00000000000..202f411874e
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/mouth.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/mouth_hover.png b/Resources/Textures/Interface/Targeting/Doll/mouth_hover.png
new file mode 100644
index 00000000000..a5014f42ca3
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/mouth_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightarm.png b/Resources/Textures/Interface/Targeting/Doll/rightarm.png
new file mode 100644
index 00000000000..223afaacad0
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/rightarm.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightarm_hover.png b/Resources/Textures/Interface/Targeting/Doll/rightarm_hover.png
new file mode 100644
index 00000000000..7121c80830d
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/rightarm_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightfoot.png b/Resources/Textures/Interface/Targeting/Doll/rightfoot.png
new file mode 100644
index 00000000000..d1c687c6815
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/rightfoot.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightfoot_hover.png b/Resources/Textures/Interface/Targeting/Doll/rightfoot_hover.png
new file mode 100644
index 00000000000..60897a28805
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/rightfoot_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/righthand.png b/Resources/Textures/Interface/Targeting/Doll/righthand.png
new file mode 100644
index 00000000000..e71f8de80ed
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/righthand.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/righthand_hover.png b/Resources/Textures/Interface/Targeting/Doll/righthand_hover.png
new file mode 100644
index 00000000000..d51910da173
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/righthand_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightleg.png b/Resources/Textures/Interface/Targeting/Doll/rightleg.png
new file mode 100644
index 00000000000..5f7b6836105
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/rightleg.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/rightleg_hover.png b/Resources/Textures/Interface/Targeting/Doll/rightleg_hover.png
new file mode 100644
index 00000000000..b0936de0a09
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/rightleg_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/torso.png b/Resources/Textures/Interface/Targeting/Doll/torso.png
new file mode 100644
index 00000000000..44297c96c32
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/torso.png differ
diff --git a/Resources/Textures/Interface/Targeting/Doll/torso_hover.png b/Resources/Textures/Interface/Targeting/Doll/torso_hover.png
new file mode 100644
index 00000000000..70f5e5969c0
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Doll/torso_hover.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_0.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_0.png
new file mode 100644
index 00000000000..2e46e3a8cf1
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_1.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_1.png
new file mode 100644
index 00000000000..7df0059c12c
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_2.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_2.png
new file mode 100644
index 00000000000..8a6e3add67f
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_3.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_3.png
new file mode 100644
index 00000000000..6d7966fc141
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_4.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_4.png
new file mode 100644
index 00000000000..cc36cf23ca4
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_5.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_5.png
new file mode 100644
index 00000000000..3f260e12259
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_6.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_6.png
new file mode 100644
index 00000000000..0bb632ba388
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_7.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_7.png
new file mode 100644
index 00000000000..0bb632ba388
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_8.png b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_8.png
new file mode 100644
index 00000000000..c23961f396b
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/groin.rsi/groin_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/groin.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/groin.rsi/meta.json
new file mode 100644
index 00000000000..6acd4a2c24b
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/groin.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "groin_0"
+        },
+        {
+        "name": "groin_1"
+        },
+        {
+        "name": "groin_2"
+        },
+        {
+        "name": "groin_3"
+        },
+        {
+        "name": "groin_4"
+        },
+        {
+        "name": "groin_5"
+        },
+        {
+        "name": "groin_6"
+        },
+        {
+        "name": "groin_7"
+        },
+        {
+        "name": "groin_8"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_0.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_0.png
index f2b97eeda69..22c7982489b 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_0.png and b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_1.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_1.png
index 98883b555e6..cd3b5d4c1c8 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_1.png and b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_2.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_2.png
index 057cf12cafc..e4db1961679 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_2.png and b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_3.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_3.png
index e225fda639d..d6a204a18a9 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_3.png and b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_4.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_4.png
index 4d250735a89..2c9e81508b3 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_4.png and b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_5.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_5.png
index 0f31b3bfccd..930a7b52ed1 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_5.png and b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_6.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_6.png
index 32cd12440e3..efc7380c270 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_6.png and b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png
index 32cd12440e3..efc7380c270 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png and b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png
index b89bb2c20ed..a00a6b1822e 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png and b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/meta.json
index a4883062b15..dab3ed611da 100644
--- a/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/meta.json
+++ b/Resources/Textures/Interface/Targeting/Status/leftarm.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_0.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_0.png
new file mode 100644
index 00000000000..af6e8eb45e5
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_1.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_1.png
new file mode 100644
index 00000000000..b8e10c8c48c
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_2.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_2.png
new file mode 100644
index 00000000000..31feb63b7bc
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_3.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_3.png
new file mode 100644
index 00000000000..274855e4194
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_4.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_4.png
new file mode 100644
index 00000000000..b3e5dfefa16
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_5.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_5.png
new file mode 100644
index 00000000000..b4af7c1c036
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_6.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_6.png
new file mode 100644
index 00000000000..9822dfba4cb
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_7.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_7.png
new file mode 100644
index 00000000000..9822dfba4cb
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_8.png b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_8.png
new file mode 100644
index 00000000000..bdaec2557cb
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/leftfoot_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/meta.json
new file mode 100644
index 00000000000..9396f537f80
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/leftfoot.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "leftfoot_0"
+        },
+        {
+        "name": "leftfoot_1"
+        },
+        {
+        "name": "leftfoot_2"
+        },
+        {
+        "name": "leftfoot_3"
+        },
+        {
+        "name": "leftfoot_4"
+        },
+        {
+        "name": "leftfoot_5"
+        },
+        {
+        "name": "leftfoot_6"
+        },
+        {
+        "name": "leftfoot_7"
+        },
+        {
+        "name": "leftfoot_8"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_0.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_0.png
new file mode 100644
index 00000000000..f56984a54eb
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_1.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_1.png
new file mode 100644
index 00000000000..e5a7aea1b40
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_2.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_2.png
new file mode 100644
index 00000000000..43c72f0b210
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_3.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_3.png
new file mode 100644
index 00000000000..3114a1995cd
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_4.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_4.png
new file mode 100644
index 00000000000..83c4daefabf
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_5.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_5.png
new file mode 100644
index 00000000000..06946c97c74
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_6.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_6.png
new file mode 100644
index 00000000000..7d2ed496616
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_7.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_7.png
new file mode 100644
index 00000000000..7d2ed496616
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_8.png b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_8.png
new file mode 100644
index 00000000000..2b33680d438
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/lefthand_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/meta.json
new file mode 100644
index 00000000000..f7d5a595258
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/lefthand.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "lefthand_0"
+        },
+        {
+        "name": "lefthand_1"
+        },
+        {
+        "name": "lefthand_2"
+        },
+        {
+        "name": "lefthand_3"
+        },
+        {
+        "name": "lefthand_4"
+        },
+        {
+        "name": "lefthand_5"
+        },
+        {
+        "name": "lefthand_6"
+        },
+        {
+        "name": "lefthand_7"
+        },
+        {
+        "name": "lefthand_8"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_0.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_0.png
index 2c1ff500970..9f8193be960 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_0.png and b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_1.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_1.png
index b3ea18c15af..ab0c3e410da 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_1.png and b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_2.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_2.png
index 4439c85a05f..6390bbf7ab6 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_2.png and b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_3.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_3.png
index eb0baeaedb5..9159aebd456 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_3.png and b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_4.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_4.png
index 8c0cc64f9b1..9dcd84fffdf 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_4.png and b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_5.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_5.png
index 3db84b2482a..4e302cda649 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_5.png and b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_6.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_6.png
index aafd9842ef1..d36a43c441d 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_6.png and b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png
index aafd9842ef1..d36a43c441d 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png and b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png
index 9652d363d4e..75bd581d69b 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png and b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/meta.json
index b94785bcb66..887c60f37cc 100644
--- a/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/meta.json
+++ b/Resources/Textures/Interface/Targeting/Status/leftleg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/meta.json
index c858492b6d8..eb19b5d4c47 100644
--- a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/meta.json
+++ b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png
index bc949f384b5..44c8aca6329 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png and b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_1.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_1.png
index e1c0b4c09e9..035e0ae12e9 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_1.png and b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_2.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_2.png
index 5c9f675a1d3..f6db2e12a9b 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_2.png and b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_3.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_3.png
index 6ccdf982379..cd974fdeea6 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_3.png and b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_4.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_4.png
index e38f50c3439..0a5977cfaf8 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_4.png and b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_5.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_5.png
index 1e0b6a768f9..1eb5f0eadd4 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_5.png and b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_6.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_6.png
index 90b26a759b4..35eec2905a5 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_6.png and b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png
index 90b26a759b4..35eec2905a5 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png and b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png
index 126b5e0cd08..9f894b1bfb3 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png and b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/meta.json
new file mode 100644
index 00000000000..ce1b1f37e7b
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "rightfoot_0"
+        },
+        {
+        "name": "rightfoot_1"
+        },
+        {
+        "name": "rightfoot_2"
+        },
+        {
+        "name": "rightfoot_3"
+        },
+        {
+        "name": "rightfoot_4"
+        },
+        {
+        "name": "rightfoot_5"
+        },
+        {
+        "name": "rightfoot_6"
+        },
+        {
+        "name": "rightfoot_7"
+        },
+        {
+        "name": "rightfoot_8"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_0.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_0.png
new file mode 100644
index 00000000000..573e32ca106
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_1.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_1.png
new file mode 100644
index 00000000000..967639b3fd1
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_2.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_2.png
new file mode 100644
index 00000000000..bff7d8016d0
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_3.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_3.png
new file mode 100644
index 00000000000..d74824df983
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_4.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_4.png
new file mode 100644
index 00000000000..50f6abc2c34
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_5.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_5.png
new file mode 100644
index 00000000000..c824c98dfc2
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_6.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_6.png
new file mode 100644
index 00000000000..ebc654d70e9
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_7.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_7.png
new file mode 100644
index 00000000000..ebc654d70e9
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_8.png b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_8.png
new file mode 100644
index 00000000000..06ab1d2519d
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/rightfoot.rsi/rightfoot_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/meta.json
new file mode 100644
index 00000000000..61c5b77862c
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "righthand_0"
+        },
+        {
+        "name": "righthand_1"
+        },
+        {
+        "name": "righthand_2"
+        },
+        {
+        "name": "righthand_3"
+        },
+        {
+        "name": "righthand_4"
+        },
+        {
+        "name": "righthand_5"
+        },
+        {
+        "name": "righthand_6"
+        },
+        {
+        "name": "righthand_7"
+        },
+        {
+        "name": "righthand_8"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_0.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_0.png
new file mode 100644
index 00000000000..a69056bb651
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_1.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_1.png
new file mode 100644
index 00000000000..e14168b2e7d
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_2.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_2.png
new file mode 100644
index 00000000000..b12b15e883b
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_3.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_3.png
new file mode 100644
index 00000000000..a030aa0980c
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_4.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_4.png
new file mode 100644
index 00000000000..4afd3e7f531
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_5.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_5.png
new file mode 100644
index 00000000000..5062dafc206
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_6.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_6.png
new file mode 100644
index 00000000000..87e8f18ef82
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_7.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_7.png
new file mode 100644
index 00000000000..87e8f18ef82
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_8.png b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_8.png
new file mode 100644
index 00000000000..797e0683e8b
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/righthand.rsi/righthand_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/meta.json
index 279743503cd..7dded85e45f 100644
--- a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/meta.json
+++ b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png
index d3461f477d7..f773330b026 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png and b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_1.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_1.png
index 014fa1c7671..786b0777c38 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_1.png and b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_2.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_2.png
index 6e52faa7d22..2ac7cbafa6d 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_2.png and b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_3.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_3.png
index e527d365684..2f9690690d7 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_3.png and b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_4.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_4.png
index f988d5c494f..ec62ccb0627 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_4.png and b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_5.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_5.png
index 3b06ca0bf24..d30e124e64d 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_5.png and b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_6.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_6.png
index 88368e0b007..9c4ee1f9038 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_6.png and b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png
index 88368e0b007..9c4ee1f9038 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png and b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png
index 2d99a1c8994..70ccb309add 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png and b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/torso.rsi/meta.json
index 491f5a0dfc2..7baeebd0801 100644
--- a/Resources/Textures/Interface/Targeting/Status/torso.rsi/meta.json
+++ b/Resources/Textures/Interface/Targeting/Status/torso.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "copyright": "Edited by Mocho from the original tgstation sprites taken at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_0.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_0.png
index 0ccc014503c..b20ce001ba6 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_0.png and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_1.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_1.png
index 4bda9828e74..591b6a5bab5 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_1.png and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_2.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_2.png
index d2e3d59a1c9..71f09fc7f6b 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_2.png and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_3.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_3.png
index 262e5601785..fa9f954321c 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_3.png and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_4.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_4.png
index 627d16dccbb..ada865a05fe 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_4.png and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_5.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_5.png
index 64ab60165f4..8f3a6ad7d0e 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_5.png and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_6.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_6.png
index c7d377ffb2c..c289a454bdb 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_6.png and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_7.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_7.png
index c7d377ffb2c..c289a454bdb 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_7.png and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_8.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_8.png
index bf0f5a312b1..eefec17cf60 100644
Binary files a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_8.png and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/doll.png b/Resources/Textures/Interface/Targeting/doll.png
deleted file mode 100644
index 086021b245a..00000000000
Binary files a/Resources/Textures/Interface/Targeting/doll.png and /dev/null differ