diff --git a/Content.Client/Body/Systems/BodySystem.cs b/Content.Client/Body/Systems/BodySystem.cs
deleted file mode 100644
index bab785525b0..00000000000
--- a/Content.Client/Body/Systems/BodySystem.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Body.Systems;
-
-namespace Content.Client.Body.Systems;
-
-public sealed class BodySystem : SharedBodySystem
-{
-}
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index 68800a2afe5..18e4540e153 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -4,6 +4,7 @@
 using Content.Client.Examine;
 using Content.Client.Strip;
 using Content.Client.Verbs.UI;
+using Content.Shared.Body.Part;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -40,7 +41,6 @@ public sealed class HandsSystem : SharedHandsSystem
         public event Action<string, EntityUid>? OnPlayerItemRemoved;
         public event Action<string>? OnPlayerHandBlocked;
         public event Action<string>? OnPlayerHandUnblocked;
-
         public override void Initialize()
         {
             base.Initialize();
@@ -51,6 +51,8 @@ public override void Initialize()
             SubscribeLocalEvent<HandsComponent, ComponentShutdown>(OnHandsShutdown);
             SubscribeLocalEvent<HandsComponent, ComponentHandleState>(HandleComponentState);
             SubscribeLocalEvent<HandsComponent, VisualsChangedEvent>(OnVisualsChanged);
+            SubscribeLocalEvent<HandsComponent, BodyPartRemovedEvent>(HandleBodyPartRemoved); // _CorvaxNext: surgery
+            SubscribeLocalEvent<HandsComponent, BodyPartDisabledEvent>(HandleBodyPartDisabled); // _CorvaxNext: surgery
 
             OnHandSetActive += OnHandActivated;
         }
@@ -238,8 +240,40 @@ public void UIHandAltActivateItem(string handName)
             RaisePredictiveEvent(new RequestHandAltInteractEvent(handName));
         }
 
+        #region pulling
+
+        #endregion
+
         #region visuals
 
+        // start-_CorvaxNext: surgery
+        private void HideLayers(EntityUid uid, HandsComponent component, Entity<BodyPartComponent> part, SpriteComponent? sprite = null)
+        {
+            if (part.Comp.PartType != BodyPartType.Hand || !Resolve(uid, ref sprite, logMissing: false))
+                return;
+
+            var location = part.Comp.Symmetry switch
+            {
+                BodyPartSymmetry.None => HandLocation.Middle,
+                BodyPartSymmetry.Left => HandLocation.Left,
+                BodyPartSymmetry.Right => HandLocation.Right,
+                _ => 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);
+        // end-_CorvaxNext: surgery
+
         protected override void HandleEntityInserted(EntityUid uid, HandsComponent hands, EntInsertedIntoContainerMessage args)
         {
             base.HandleEntityInserted(uid, hands, args);
@@ -264,6 +298,7 @@ protected override void HandleEntityRemoved(EntityUid uid, HandsComponent hands,
 
             if (!hands.Hands.TryGetValue(args.Container.ID, out var hand))
                 return;
+
             UpdateHandVisuals(uid, args.Entity, hand);
             _stripSys.UpdateUi(uid);
 
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
index baea03c8923..e2c75c4b391 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.MedicalScanner;
+using Content.Shared._CorvaxNext.Targeting;
 using JetBrains.Annotations;
-using Robust.Client.UserInterface;
+using Robust.Client.GameObjects;
 
 namespace Content.Client.HealthAnalyzer.UI
 {
@@ -17,10 +18,13 @@ public HealthAnalyzerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne
         protected override void Open()
         {
             base.Open();
-
-            _window = this.CreateWindow<HealthAnalyzerWindow>();
-
-            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+            _window = new HealthAnalyzerWindow
+            {
+                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
+            };
+            _window.OnClose += Close;
+            _window.OnBodyPartSelected += SendBodyPartMessage;
+            _window.OpenCentered();
         }
 
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
@@ -33,5 +37,22 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
 
             _window.Populate(cast);
         }
+
+        private void SendBodyPartMessage(TargetBodyPart? part, EntityUid target) => SendMessage(new HealthAnalyzerPartMessage(EntMan.GetNetEntity(target), part ?? null));
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing)
+                return;
+
+            if (_window != null)
+            {
+                _window.OnClose -= Close;
+                _window.OnBodyPartSelected -= SendBodyPartMessage;
+            }
+
+            _window?.Dispose();
+        }
     }
 }
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
index aae8785b1fe..0a0b5ac89e7 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
@@ -1,8 +1,8 @@
-<controls:FancyWindow
+<controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     MaxHeight="525"
-    MinWidth="300">
+    MinWidth="350">
     <ScrollContainer
         Margin="5 5 5 5"
         ReturnMeasure="True"
@@ -13,45 +13,215 @@
             Orientation="Vertical">
             <Label
                 Name="NoPatientDataText"
-                Text="{Loc health-analyzer-window-no-patient-data-text}" />
-
+                Text="{Loc health-analyzer-window-no-patient-data-text}"/>
+            <Button Name="ReturnButton"
+                    Text="{Loc 'health-analyzer-window-return-button-text'}"
+                    Margin="0 0 0 10"
+                    HorizontalExpand="False"/>
             <BoxContainer
                 Name="PatientDataContainer"
                 Margin="0 0 0 5"
                 Orientation="Vertical">
-                <BoxContainer Orientation="Horizontal" Margin="0 0 0 5">
-                    <SpriteView OverrideDirection="South" Scale="2 2" Name="SpriteView" Access="Public" SetSize="64 64" />
-                    <TextureRect Name="NoDataTex" Access="Public" SetSize="64 64" Visible="false" Stretch="KeepAspectCentered" TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/>
-                    <BoxContainer Margin="5 0 0 0" Orientation="Vertical" VerticalAlignment="Top">
-                        <RichTextLabel Name="NameLabel" SetWidth="150" />
-                        <Label Name="SpeciesLabel" VerticalAlignment="Top" StyleClasses="LabelSubText" />
+                <BoxContainer Orientation="Horizontal"
+                              Margin="0 0 0 5">
+                    <PanelContainer>
+                        <SpriteView OverrideDirection="South"
+                                    Scale="2.5 2.5"
+                                    Name="SpriteView"
+                                    Access="Public"
+                                    SetSize="96 96"/>
+                        <PanelContainer
+                            Name="PartView"
+                            SetSize="57 96"
+                            Margin="18 0 0 0"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Left">
+                            <PanelContainer
+                                SetSize="15 33"
+                                Margin="4 0 0 0"
+                                HorizontalAlignment="Left">
+                                <TextureButton
+                                    Name="RightArmButton"
+                                    MinSize="15 25"
+                                    StyleClasses="TargetDollButtonRightArm"
+                                    VerticalAlignment="Top">
+                                </TextureButton>
+                                <TextureButton
+                                    Name="RightHandButton"
+                                    MinSize="15 15"
+                                    VerticalAlignment="Bottom"
+                                    StyleClasses="TargetDollButtonRightHand">
+                                </TextureButton>
+                            </PanelContainer>
+                            <PanelContainer
+                                SetSize="43 75"
+                                Margin="0 0 0 0"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center">
+                                <TextureButton
+                                    Name="HeadButton"
+                                    MinSize="28 23"
+                                    VerticalAlignment="Top"
+                                    HorizontalAlignment="Center"
+                                    StyleClasses="TargetDollButtonHead">
+                                    <!--<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>
+                                <TextureButton
+                                    Name="ChestButton"
+                                    SetSize="28 30"
+                                    Margin="0 18 0 0"
+                                    VerticalAlignment="Top"
+                                    HorizontalAlignment="Center"
+                                    StyleClasses="TargetDollButtonChest">
+                                </TextureButton>
+                                <PanelContainer
+                                    MinSize="38 35"
+                                    VerticalAlignment="Bottom"
+                                    HorizontalAlignment="Center">
+                                    <TextureButton
+                                        Name="GroinButton"
+                                        MinSize="28 15"
+                                        VerticalAlignment="Top"
+                                        HorizontalAlignment="Center"
+                                        StyleClasses="TargetDollButtonGroin">
+                                    </TextureButton>
+                                    <PanelContainer
+                                        MinSize="20 30"
+                                        VerticalAlignment="Bottom"
+                                        HorizontalAlignment="Right">
+                                        <TextureButton
+                                            Name="LeftLegButton"
+                                            MinSize="15 28"
+                                            VerticalAlignment="Top"
+                                            HorizontalAlignment="Left"
+                                            StyleClasses="TargetDollButtonLeftLeg">
+                                        </TextureButton>
+                                        <TextureButton
+                                            Name="LeftFootButton"
+                                            MinSize="20 10"
+                                            VerticalAlignment="Bottom"
+                                            StyleClasses="TargetDollButtonLeftFoot">
+                                        </TextureButton>
+                                    </PanelContainer>
+                                    <PanelContainer
+                                        MinSize="20 30"
+                                        VerticalAlignment="Bottom"
+                                        HorizontalAlignment="Left">
+                                        <TextureButton
+                                            Name="RightLegButton"
+                                            MinSize="15 28"
+                                            VerticalAlignment="Top"
+                                            HorizontalAlignment="Right"
+                                            StyleClasses="TargetDollButtonRightLeg">
+                                        </TextureButton>
+                                        <TextureButton
+                                            Name="RightFootButton"
+                                            MinSize="20 10"
+                                            VerticalAlignment="Bottom"
+                                            HorizontalAlignment="Center"
+                                            StyleClasses="TargetDollButtonRightFoot">
+                                        </TextureButton>
+                                    </PanelContainer>
+                                </PanelContainer>
+                            </PanelContainer>
+                            <PanelContainer
+                                SetSize="15 33"
+                                Margin="0 0 4 0"
+                                HorizontalAlignment="Right">
+                                <TextureButton
+                                    Name="LeftArmButton"
+                                    MinSize="15 25"
+                                    StyleClasses="TargetDollButtonLeftArm"
+                                    VerticalAlignment="Top">
+                                </TextureButton>
+                                <TextureButton
+                                    Name="LeftHandButton"
+                                    MinSize="15 15"
+                                    VerticalAlignment="Bottom"
+                                    StyleClasses="TargetDollButtonLeftHand">
+                                </TextureButton>
+                            </PanelContainer>
+                        </PanelContainer>
+                    </PanelContainer>
+                    <TextureRect Name="NoDataTex"
+                                 Access="Public"
+                                 SetSize="64 64"
+                                 Visible="false"
+                                 Stretch="KeepAspectCentered"
+                                 TexturePath="/Textures/Interface/Misc/health_analyzer_out_of_range.png"/>
+                    <BoxContainer Margin="5 0 0 0"
+                                  Orientation="Vertical"
+                                  VerticalAlignment="Top">
+                        <RichTextLabel Name="NameLabel"
+                                       SetWidth="150"/>
+                        <Label Name="SpeciesLabel"
+                               VerticalAlignment="Top"
+                               StyleClasses="LabelSubText"/>
+                        <Label Name="PartNameLabel"
+                               VerticalAlignment="Bottom"
+                               StyleClasses="LabelSubText"/>
                     </BoxContainer>
-                    <Label Margin="0 0 5 0" HorizontalExpand="True" HorizontalAlignment="Right" VerticalExpand="True"
-                           VerticalAlignment="Top" Name="ScanModeLabel"
-                           Text="{Loc 'health-analyzer-window-entity-unknown-text'}" />
+                    <Label Margin="0 0 5 0"
+                           HorizontalExpand="True"
+                           HorizontalAlignment="Right"
+                           VerticalExpand="True"
+                           VerticalAlignment="Top"
+                           Name="ScanModeLabel"
+                           Text="{Loc 'health-analyzer-window-entity-unknown-text'}"/>
                 </BoxContainer>
 
-                <PanelContainer StyleClasses="LowDivider" />
+                <PanelContainer StyleClasses="LowDivider"/>
 
-                <GridContainer Margin="0 5 0 0" Columns="2">
-                    <Label Text="{Loc 'health-analyzer-window-entity-status-text'}" />
-                    <Label Name="StatusLabel" />
-                    <Label Text="{Loc 'health-analyzer-window-entity-temperature-text'}" />
-                    <Label Name="TemperatureLabel" />
-                    <Label Text="{Loc 'health-analyzer-window-entity-blood-level-text'}" />
-                    <Label Name="BloodLabel" />
-                    <Label Text="{Loc 'health-analyzer-window-entity-damage-total-text'}" />
-                    <Label Name="DamageLabel" />
+                <GridContainer Margin="0 5 0 0"
+                               Columns="2">
+                    <Label Text="{Loc 'health-analyzer-window-entity-status-text'}"/>
+                    <Label Name="StatusLabel"/>
+                    <Label Text="{Loc 'health-analyzer-window-entity-temperature-text'}"/>
+                    <Label Name="TemperatureLabel"/>
+                    <Label Text="{Loc 'health-analyzer-window-entity-blood-level-text'}"/>
+                    <Label Name="BloodLabel"/>
+                    <Label Text="{Loc 'health-analyzer-window-entity-damage-total-text'}"/>
+                    <Label Name="DamageLabel"/>
                 </GridContainer>
             </BoxContainer>
 
-            <PanelContainer Name="AlertsDivider" Visible="False" StyleClasses="LowDivider" />
+            <PanelContainer Name="AlertsDivider"
+                            Visible="False"
+                            StyleClasses="LowDivider"/>
 
-            <BoxContainer Name="AlertsContainer" Visible="False" Margin="0 5" Orientation="Vertical" HorizontalAlignment="Center">
+            <BoxContainer Name="AlertsContainer"
+                          Visible="False"
+                          Margin="0 5"
+                          Orientation="Vertical"
+                          HorizontalAlignment="Center">
 
             </BoxContainer>
 
-            <PanelContainer StyleClasses="LowDivider" />
+            <PanelContainer StyleClasses="LowDivider"/>
 
             <BoxContainer
                 Name="GroupsContainer"
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
index fd3615d59f5..4233c6efe07 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Atmos;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Alert;
+using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -36,6 +37,18 @@ public sealed partial class HealthAnalyzerWindow : FancyWindow
         private readonly IPrototypeManager _prototypes;
         private readonly IResourceCache _cache;
 
+        // Start-_CorvaxNext: surgery
+        public event Action<TargetBodyPart?, EntityUid>? OnBodyPartSelected;
+        private EntityUid _spriteViewEntity;
+
+        [ValidatePrototypeId<EntityPrototype>]
+        private readonly EntProtoId _bodyView = "AlertSpriteView";
+
+        private readonly Dictionary<TargetBodyPart, TextureButton> _bodyPartControls;
+        private EntityUid? _target;
+
+        // End-_CorvaxNext: surgery
+
         public HealthAnalyzerWindow()
         {
             RobustXamlLoader.Load(this);
@@ -45,19 +58,78 @@ public HealthAnalyzerWindow()
             _spriteSystem = _entityManager.System<SpriteSystem>();
             _prototypes = dependencies.Resolve<IPrototypeManager>();
             _cache = dependencies.Resolve<IResourceCache>();
+            // Start-_CorvaxNext: surgery
+            _bodyPartControls = new Dictionary<TargetBodyPart, TextureButton>
+            {
+                { 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 bodyPartButton in _bodyPartControls)
+            {
+                bodyPartButton.Value.MouseFilter = MouseFilterMode.Stop;
+                bodyPartButton.Value.OnPressed += _ => SetActiveBodyPart(bodyPartButton.Key, bodyPartButton.Value);
+            }
+            ReturnButton.OnPressed += _ => ResetBodyPart();
+            // End-_CorvaxNext: surgery
+        }
+
+        public void SetActiveBodyPart(TargetBodyPart part, TextureButton button)
+        {
+            if (_target == null)
+                return;
+
+            // Bit of the ole shitcode until we have Groins in the prototypes.
+            OnBodyPartSelected?.Invoke(part == TargetBodyPart.Groin ? TargetBodyPart.Torso : part, _target.Value);
+        }
+
+        public void ResetBodyPart()
+        {
+            if (_target == null)
+                return;
+
+            OnBodyPartSelected?.Invoke(null, _target.Value);
+        }
+
+        public void SetActiveButtons(bool isHumanoid)
+        {
+            foreach (var button in _bodyPartControls)
+                button.Value.Visible = isHumanoid;
         }
 
         public void Populate(HealthAnalyzerScannedUserMessage msg)
         {
-            var target = _entityManager.GetEntity(msg.TargetEntity);
+            // Start-_CorvaxNext: surgery
+            _target = _entityManager.GetEntity(msg.TargetEntity);
+            EntityUid? part = msg.Part != null ? _entityManager.GetEntity(msg.Part.Value) : null;
+            var isPart = part != null;
 
-            if (target == null
-                || !_entityManager.TryGetComponent<DamageableComponent>(target, out var damageable))
+            if (_target == null
+                || !_entityManager.TryGetComponent<DamageableComponent>(isPart ? part : _target, out var damageable))
             {
                 NoPatientDataText.Visible = true;
                 return;
             }
 
+            SetActiveButtons(_entityManager.HasComponent<TargetingComponent>(_target.Value));
+
+            ReturnButton.Visible = isPart;
+            PartNameLabel.Visible = isPart;
+
+            if (part != null)
+                PartNameLabel.Text = _entityManager.HasComponent<MetaDataComponent>(part)
+                    ? Identity.Name(part.Value, _entityManager)
+                    : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
+
             NoPatientDataText.Visible = false;
 
             // Scan Mode
@@ -72,19 +144,20 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
 
             // Patient Information
 
-            SpriteView.SetEntity(target.Value);
+            SpriteView.SetEntity(SetupIcon(msg.Body) ?? _target.Value);
             SpriteView.Visible = msg.ScanMode.HasValue && msg.ScanMode.Value;
+            PartView.Visible = SpriteView.Visible;
             NoDataTex.Visible = !SpriteView.Visible;
 
             var name = new FormattedMessage();
             name.PushColor(Color.White);
-            name.AddText(_entityManager.HasComponent<MetaDataComponent>(target.Value)
-                ? Identity.Name(target.Value, _entityManager)
+            name.AddText(_entityManager.HasComponent<MetaDataComponent>(_target.Value)
+                ? Identity.Name(_target.Value, _entityManager)
                 : Loc.GetString("health-analyzer-window-entity-unknown-text"));
             NameLabel.SetMessage(name);
 
             SpeciesLabel.Text =
-                _entityManager.TryGetComponent<HumanoidAppearanceComponent>(target.Value,
+                _entityManager.TryGetComponent<HumanoidAppearanceComponent>(_target.Value,
                     out var humanoidAppearanceComponent)
                     ? Loc.GetString(_prototypes.Index<SpeciesPrototype>(humanoidAppearanceComponent.Species).Name)
                     : Loc.GetString("health-analyzer-window-entity-unknown-species-text");
@@ -100,7 +173,7 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
                 : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
 
             StatusLabel.Text =
-                _entityManager.TryGetComponent<MobStateComponent>(target.Value, out var mobStateComponent)
+                _entityManager.TryGetComponent<MobStateComponent>(_target.Value, out var mobStateComponent)
                     ? GetStatus(mobStateComponent.CurrentState)
                     : Loc.GetString("health-analyzer-window-entity-unknown-text");
 
@@ -118,21 +191,27 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
             if (showAlerts)
                 AlertsContainer.DisposeAllChildren();
 
-            if (msg.Unrevivable == true)
-                AlertsContainer.AddChild(new RichTextLabel
+            if (msg.Unrevivable == true) // Right now this does nothing, but we have it just for parity :)
+            {
+                var unrevivableLabel = new RichTextLabel
                 {
-                    Text = Loc.GetString("health-analyzer-window-entity-unrevivable-text"),
                     Margin = new Thickness(0, 4),
                     MaxWidth = 300
-                });
+                };
+                unrevivableLabel.SetMessage(Loc.GetString("health-analyzer-window-entity-unrevivable-text"), defaultColor: Color.Red);
+                AlertsContainer.AddChild(unrevivableLabel);
+            }
 
             if (msg.Bleeding == true)
-                AlertsContainer.AddChild(new RichTextLabel
+            {
+                var bleedingLabel = new RichTextLabel
                 {
-                    Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"),
                     Margin = new Thickness(0, 4),
                     MaxWidth = 300
-                });
+                };
+                bleedingLabel.SetMessage(Loc.GetString("health-analyzer-window-entity-bleeding-text"), defaultColor: Color.Red);
+                AlertsContainer.AddChild(bleedingLabel);
+            }
 
             // Damage Groups
 
@@ -143,6 +222,7 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
             IReadOnlyDictionary<string, FixedPoint2> damagePerType = damageable.Damage.DamageDict;
 
             DrawDiagnosticGroups(damageSortedGroups, damagePerType);
+            // End-_CorvaxNext: surgery
         }
 
         private static string GetStatus(MobState mobState)
@@ -243,5 +323,41 @@ private BoxContainer CreateDiagnosticGroupTitle(string text, string id)
 
             return rootContainer;
         }
+
+        // Start-_CorvaxNext: surgery
+        /// <summary>
+        /// Sets up the Body Doll using Alert Entity to use in Health Analyzer.
+        /// </summary>
+        private EntityUid? SetupIcon(Dictionary<TargetBodyPart, TargetIntegrity>? body)
+        {
+            if (body is null)
+                return null;
+
+            if (!_entityManager.Deleted(_spriteViewEntity))
+                _entityManager.QueueDeleteEntity(_spriteViewEntity);
+
+            _spriteViewEntity = _entityManager.Spawn(_bodyView);
+
+            if (!_entityManager.TryGetComponent<SpriteComponent>(_spriteViewEntity, out var sprite))
+                return null;
+
+            int layer = 0;
+            foreach (var (bodyPart, integrity) in body)
+            {
+                // TODO: Fix this way PartStatusUIController and make it use layers instead of TextureRects
+                string enumName = Enum.GetName(typeof(TargetBodyPart), bodyPart) ?? "Unknown";
+                int enumValue = (int)integrity;
+                var rsi = new SpriteSpecifier.Rsi(new ResPath($"/Textures/Interface/Targeting/Status/{enumName.ToLowerInvariant()}.rsi"), $"{enumName.ToLowerInvariant()}_{enumValue}");
+                // It's probably shitcode but im lazy to get into sprite stuff - It is shitcode :)
+                if (!sprite.TryGetLayer(layer, out _))
+                    sprite.AddLayer(_spriteSystem.Frame0(rsi));
+                else
+                    sprite.LayerSetTexture(layer, _spriteSystem.Frame0(rsi));
+                sprite.LayerSetScale(layer, new Vector2(3f, 3f));
+                layer++;
+            }
+            return _spriteViewEntity;
+        }
+        // End-_CorvaxNext: surgery
     }
 }
diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index 6eb5dd9ec98..7bdc9483235 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -55,7 +55,8 @@ private void UpdateLayers(HumanoidAppearanceComponent component, SpriteComponent
         foreach (var (key, info) in component.CustomBaseLayers)
         {
             oldLayers.Remove(key);
-            SetLayerData(component, sprite, key, info.Id, sexMorph: false, color: info.Color);
+            // Shitmed modification: For whatever reason these weren't actually ignoring the skin color as advertised.
+            SetLayerData(component, sprite, key, info.Id, sexMorph: false, color: info.Color, overrideSkin: true);
         }
 
         // hide old layers
@@ -73,7 +74,8 @@ private void SetLayerData(
         HumanoidVisualLayers key,
         string? protoId,
         bool sexMorph = false,
-        Color? color = null)
+        Color? color = null,
+        bool overrideSkin = false)
     {
         var layerIndex = sprite.LayerMapReserveBlank(key);
         var layer = sprite[layerIndex];
@@ -91,7 +93,7 @@ private void SetLayerData(
         var proto = _prototypeManager.Index<HumanoidSpeciesSpriteLayer>(protoId);
         component.BaseLayers[key] = proto;
 
-        if (proto.MatchSkin)
+        if (proto.MatchSkin && !overrideSkin)
             layer.Color = component.SkinColor.WithAlpha(proto.LayerAlpha);
 
         if (proto.BaseSprite != null)
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index d90b0b5bda3..0523e70081a 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -84,6 +84,12 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
+            human.AddFunction(ContentKeyFunctions.TargetHead); // _CorvaxNext: surgery
+            human.AddFunction(ContentKeyFunctions.TargetTorso); // _CorvaxNext: surgery
+            human.AddFunction(ContentKeyFunctions.TargetLeftArm); // _CorvaxNext: surgery
+            human.AddFunction(ContentKeyFunctions.TargetRightArm); // _CorvaxNext: surgery
+            human.AddFunction(ContentKeyFunctions.TargetLeftLeg); // _CorvaxNext: surgery
+            human.AddFunction(ContentKeyFunctions.TargetRightLeg); // _CorvaxNext: surgery
             human.AddFunction(ContentKeyFunctions.OfferItem); // Corvax-Next-Offer
 
             // actions should be common (for ghosts, mobs, etc)
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index 87cea4e3d2f..ea218442084 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Storage;
+using Content.Shared._CorvaxNext.Targeting;
 using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
@@ -39,7 +40,7 @@ public override void Initialize()
 
             SubscribeLocalEvent<InventorySlotsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
             SubscribeLocalEvent<InventorySlotsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
-
+            SubscribeLocalEvent<InventorySlotsComponent, RefreshInventorySlotsEvent>(OnRefreshInventorySlots); // _CorvaxNext: surgery
             SubscribeLocalEvent<InventoryComponent, ComponentShutdown>(OnShutdown);
 
             SubscribeLocalEvent<InventorySlotsComponent, DidEquipEvent>((_, comp, args) =>
@@ -181,6 +182,17 @@ public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, strin
                 EntitySlotUpdate?.Invoke(newData);
         }
 
+        // start-_CorvaxNext: surgery
+        public void OnRefreshInventorySlots(EntityUid owner, InventorySlotsComponent component, RefreshInventorySlotsEvent args)
+        {
+            if (!component.SlotData.TryGetValue(args.SlotName, out var slotData)
+                || _playerManager.LocalEntity != owner)
+                return;
+
+            OnSlotRemoved?.Invoke(slotData);
+        }
+        // end-_CorvaxNext: surgery
+
         public bool TryAddSlotDef(EntityUid owner, InventorySlotsComponent component, SlotDefinition newSlotDef)
         {
             SlotData newSlotData = newSlotDef; //convert to slotData
@@ -237,6 +249,7 @@ public void UIInventoryAltActivateItem(string slot, EntityUid uid)
 
         public sealed class SlotData
         {
+            [ViewVariables]
             public readonly SlotDefinition SlotDef;
             public EntityUid? HeldEntity => Container?.ContainedEntity;
             public bool Blocked;
diff --git a/Content.Client/Inventory/InventorySlotsComponent.cs b/Content.Client/Inventory/InventorySlotsComponent.cs
index d4667bcef33..84bc7d54392 100644
--- a/Content.Client/Inventory/InventorySlotsComponent.cs
+++ b/Content.Client/Inventory/InventorySlotsComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Client.Inventory;
 public sealed partial class InventorySlotsComponent : Component
 {
     [ViewVariables]
-    public readonly Dictionary<string, ClientInventorySystem.SlotData> SlotData = new ();
+    public readonly Dictionary<string, ClientInventorySystem.SlotData> SlotData = new();
 
     /// <summary>
     ///     Data about the current layers that have been added to the players sprite due to the items in each equipment slot.
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index fe5a7adafbb..91ee3a06703 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -230,6 +230,16 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(EngineKeyFunctions.EscapeMenu);
             AddButton(ContentKeyFunctions.EscapeContext);
 
+            // start-_CorvaxNext: surgery
+            AddHeader("ui-options-header-targeting");
+            AddButton(ContentKeyFunctions.TargetHead);
+            AddButton(ContentKeyFunctions.TargetTorso);
+            AddButton(ContentKeyFunctions.TargetLeftArm);
+            AddButton(ContentKeyFunctions.TargetRightArm);
+            AddButton(ContentKeyFunctions.TargetLeftLeg);
+            AddButton(ContentKeyFunctions.TargetRightLeg);
+            // end-_CorvaxNext: surgery
+
             AddHeader("ui-options-header-misc");
             AddButton(ContentKeyFunctions.TakeScreenshot);
             AddButton(ContentKeyFunctions.TakeScreenshotNoUI);
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index ccd36c35e82..3dba4573d91 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,
                     }),
 
+                // end-_CorvaxNext: surgery 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")),
+                // end-_CorvaxNext: surgery 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 b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
index 54aeffe72c9..8d9d1b6716b 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml
@@ -9,6 +9,7 @@
     xmlns:hotbar="clr-namespace:Content.Client.UserInterface.Systems.Hotbar.Widgets"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Widgets"
+    xmlns:targeting="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets"
     Name="DefaultHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"
@@ -28,6 +29,7 @@
     <widgets:GhostGui Name="Ghost" Access="Protected" />
     <inventory:InventoryGui Name="Inventory" Access="Protected" />
     <hotbar:HotbarGui Name="Hotbar" Access="Protected" />
+    <targeting:TargetingControl Name="Targeting" Access="Protected"/>
     <chat:ResizableChatBox Name="Chat" Access="Protected" />
     <alerts:AlertsUI Name="Alerts" Access="Protected" />
 </screens:DefaultGameScreen>
diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
index 12f8422aeb2..f960c897294 100644
--- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs
@@ -22,6 +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: 5);
 
         Chat.OnResized += ChatOnResized;
         Chat.OnChatResizeFinish += ChatOnResizeFinish;
diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
index 653302fae4c..2f4570143ff 100644
--- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
@@ -10,6 +10,7 @@
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Widgets"
+    xmlns:targeting="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets"
     Name="SeparatedChatHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"
@@ -20,6 +21,7 @@
             <widgets:GhostGui Name="Ghost" Access="Protected" />
             <inventory:InventoryGui Name="Inventory" Access="Protected"/>
             <hotbar:HotbarGui Name="Hotbar" Access="Protected"/>
+            <targeting:TargetingControl Name="Targeting" Access="Protected"/>
             <BoxContainer Name="TopLeftContainer" Orientation="Vertical">
                 <actions:ActionsBar Name="Actions" Access="Protected" />
                 <BoxContainer Name="VoteMenu" Access="Public" Orientation="Vertical"/>
diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
index 2892ca44254..bd737b80beb 100644
--- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
+++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs
@@ -23,6 +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: 5);
 
         ScreenContainer.OnSplitResizeFinished += () =>
             OnChatResized?.Invoke(new Vector2(ScreenContainer.SplitFraction, 0));
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
index 9a273d2ed14..8898d3a4361 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
@@ -1,7 +1,11 @@
 <widgets:AlertsUI xmlns="https://spacestation14.io"
                   xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Alerts.Widgets"
+                  xmlns:partStatus="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets"
                   MinSize="64 64">
-    <PanelContainer HorizontalAlignment="Right" VerticalAlignment="Top">
-        <BoxContainer Name="AlertContainer" Access="Public" Orientation="Vertical" />
-    </PanelContainer>
+    <GridContainer Columns="1" HorizontalAlignment="Right" VerticalAlignment="Top">
+        <PanelContainer >
+            <BoxContainer Name="AlertContainer" Access="Public" Orientation="Vertical" />
+        </PanelContainer>
+        <partStatus:PartStatusControl Name="PartStatus" Access="Protected"/>
+    </GridContainer>
 </widgets:AlertsUI>
diff --git a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
index 49a2fba8981..0118f7f14f6 100644
--- a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
@@ -138,10 +138,9 @@ private void UpdateInventoryHotbar(InventorySlotsComponent? clientInv)
 
             return;
         }
-
         foreach (var (_, data) in clientInv.SlotData)
         {
-            if (!data.ShowInWindow || !_slotGroups.TryGetValue(data.SlotGroup, out var container))
+            if (!data.ShowInWindow || data.SlotDef.Disabled || !_slotGroups.TryGetValue(data.SlotGroup, out var container))
                 continue;
 
             if (!container.TryGetButton(data.SlotName, out var button))
@@ -214,7 +213,6 @@ private void UpdateStrippingWindow(InventorySlotsComponent? clientInv)
         {
             if (!data.ShowInWindow)
                 continue;
-
             if (!_strippingWindow!.InventoryButtons.TryGetButton(data.SlotName, out var button))
             {
                 button = CreateSlotButton(data);
diff --git a/Content.Client/Xenonids/UI/XenoChoiceControl.xaml b/Content.Client/Xenonids/UI/XenoChoiceControl.xaml
new file mode 100644
index 00000000000..9ca43289a28
--- /dev/null
+++ b/Content.Client/Xenonids/UI/XenoChoiceControl.xaml
@@ -0,0 +1,19 @@
+<!-- start-_CorvaxNext: surgery -->
+<ui:XenoChoiceControl
+    xmlns="https://spacestation14.io"
+    xmlns:ui="clr-namespace:Content.Client.Xenonids.UI">
+    <BoxContainer Orientation="Horizontal">
+        <Button Name="Button" Access="Public"
+                HorizontalExpand="True" VerticalExpand="False"
+                StyleClasses="ButtonSquare" Margin="0">
+            <BoxContainer Orientation="Horizontal" Margin="0">
+                <TextureRect Name="Texture" Access="Public"
+                             HorizontalExpand="False" VerticalExpand="False"
+                             Margin="1"/>
+                <Control MinWidth="5"/>
+                <RichTextLabel Name="NameLabel" Access="Public" VerticalAlignment="Center"/>
+            </BoxContainer>
+        </Button>
+    </BoxContainer>
+</ui:XenoChoiceControl>
+<!-- end-_CorvaxNext: surgery -->
diff --git a/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs b/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs
new file mode 100644
index 00000000000..62504368f2b
--- /dev/null
+++ b/Content.Client/Xenonids/UI/XenoChoiceControl.xaml.cs
@@ -0,0 +1,28 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Xenonids.UI;
+
+// start-_CorvaxNext: surgery
+[GenerateTypedNameReferences]
+[Virtual]
+public partial class XenoChoiceControl : Control
+{
+    public XenoChoiceControl() => RobustXamlLoader.Load(this);
+
+    public void Set(string name, Texture? texture)
+    {
+        NameLabel.SetMessage(name);
+        Texture.Texture = texture;
+    }
+
+    public void Set(FormattedMessage msg, Texture? texture)
+    {
+        NameLabel.SetMessage(msg);
+        Texture.Texture = texture;
+    }
+}
+// end-_CorvaxNext: surgery
diff --git a/Content.Client/_CorvaxNext/Body/BodySystem.cs b/Content.Client/_CorvaxNext/Body/BodySystem.cs
new file mode 100644
index 00000000000..10dc057a8fd
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Body/BodySystem.cs
@@ -0,0 +1,72 @@
+using Content.Shared.Body.Systems;
+using Content.Shared.Body.Part;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Client.GameObjects;
+using Robust.Shared.Utility;
+using Content.Shared.Body.Components;
+
+namespace Content.Client.Body.Systems;
+
+public sealed class BodySystem : SharedBodySystem
+{
+    [Dependency] private readonly MarkingManager _markingManager = default!;
+
+    private void ApplyMarkingToPart(MarkingPrototype markingPrototype,
+        IReadOnlyList<Color>? colors,
+        bool visible,
+        SpriteComponent sprite)
+    {
+        for (var j = 0; j < markingPrototype.Sprites.Count; j++)
+        {
+            var markingSprite = markingPrototype.Sprites[j];
+
+            if (markingSprite is not SpriteSpecifier.Rsi rsi)
+                continue;
+
+            var layerId = $"{markingPrototype.ID}-{rsi.RsiState}";
+
+            if (!sprite.LayerMapTryGet(layerId, out _))
+            {
+                var layer = sprite.AddLayer(markingSprite, j + 1);
+                sprite.LayerMapSet(layerId, layer);
+                sprite.LayerSetSprite(layerId, rsi);
+            }
+
+            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?
+            if (colors != null && j < colors.Count)
+                sprite.LayerSetColor(layerId, colors[j]);
+            else
+                sprite.LayerSetColor(layerId, Color.White);
+        }
+    }
+
+    protected override void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component)
+    {
+        if (!TryComp(target, out SpriteComponent? sprite))
+            return;
+
+        if (component.Color != null)
+            sprite.Color = component.Color.Value;
+
+        foreach (var (visualLayer, markingList) in component.Markings)
+            foreach (var marking in markingList)
+            {
+                if (!_markingManager.TryGetMarking(marking, out var markingPrototype))
+                    continue;
+
+                ApplyMarkingToPart(markingPrototype, marking.MarkingColors, marking.Visible, sprite);
+            }
+    }
+
+    protected override void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance)
+    {
+        return;
+    }
+}
diff --git a/Content.Client/_CorvaxNext/Body/Components/BrainComponent.cs b/Content.Client/_CorvaxNext/Body/Components/BrainComponent.cs
new file mode 100644
index 00000000000..41846ae38ff
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Body/Components/BrainComponent.cs
@@ -0,0 +1,4 @@
+namespace Content.Client._CorvaxNext.Body.Components;
+
+[RegisterComponent]
+public sealed partial class BrainComponent : Component;
diff --git a/Content.Client/_CorvaxNext/Body/Components/LungComponent.cs b/Content.Client/_CorvaxNext/Body/Components/LungComponent.cs
new file mode 100644
index 00000000000..ad5dbc8c48a
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Body/Components/LungComponent.cs
@@ -0,0 +1,4 @@
+namespace Content.Client._CorvaxNext.Body.Components;
+
+[RegisterComponent]
+public sealed partial class LungComponent : Component;
diff --git a/Content.Client/_CorvaxNext/Body/Components/StomachComponent.cs b/Content.Client/_CorvaxNext/Body/Components/StomachComponent.cs
new file mode 100644
index 00000000000..a960d4be298
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Body/Components/StomachComponent.cs
@@ -0,0 +1,4 @@
+namespace Content.Client._CorvaxNext.Body.Components;
+
+[RegisterComponent]
+public sealed partial class StomachComponent : Component;
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryBui.cs b/Content.Client/_CorvaxNext/Surgery/SurgeryBui.cs
new file mode 100644
index 00000000000..c851ce5162e
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Surgery/SurgeryBui.cs
@@ -0,0 +1,360 @@
+using Content.Client.Xenonids.UI;
+using Content.Client.Administration.UI.CustomControls;
+using Content.Shared._CorvaxNext.Surgery;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client._CorvaxNext.Surgery;
+
+[UsedImplicitly]
+public sealed class SurgeryBui : BoundUserInterface
+{
+    [Dependency] private readonly IEntityManager _entities = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
+    private readonly SurgerySystem _system;
+    [ViewVariables]
+    private SurgeryWindow? _window;
+    private EntityUid? _part;
+    private bool _isBody;
+    private (EntityUid Ent, EntProtoId Proto)? _surgery;
+    private readonly List<EntProtoId> _previousSurgeries = new();
+    public SurgeryBui(EntityUid owner, Enum uiKey) : base(owner, uiKey) => _system = _entities.System<SurgerySystem>();
+
+    protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+    {
+        if (_window is null
+            || message is not SurgeryBuiRefreshMessage)
+            return;
+
+        RefreshUI();
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (state is not SurgeryBuiState s)
+            return;
+
+        Update(s);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (disposing)
+            _window?.Dispose();
+    }
+
+    private void Update(SurgeryBuiState state)
+    {
+        if (!_entities.TryGetComponent(_player.LocalEntity, out SurgeryTargetComponent? surgeryTargetComp)
+            || !surgeryTargetComp.CanOperate)
+            return;
+        if (_window == null)
+        {
+            _window = new SurgeryWindow();
+            _window.OnClose += Close;
+            _window.Title = Loc.GetString("surgery-ui-window-title");
+
+            _window.PartsButton.OnPressed += _ =>
+            {
+                _part = null;
+                _isBody = false;
+                _surgery = null;
+                _previousSurgeries.Clear();
+                View(ViewType.Parts);
+            };
+
+            _window.SurgeriesButton.OnPressed += _ =>
+            {
+                _surgery = null;
+                _previousSurgeries.Clear();
+
+                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)
+                    return;
+
+                var last = _previousSurgeries[^1];
+                _previousSurgeries.RemoveAt(_previousSurgeries.Count - 1);
+
+                if (_system.GetSingleton(last) is not { } previousId
+                    || !_entities.TryGetComponent(previousId, out SurgeryComponent? previous))
+                    return;
+
+                OnSurgeryPressed((previousId, previous), netPart.Value, last);
+            };
+        }
+
+        _window.Surgeries.DisposeAllChildren();
+        _window.Steps.DisposeAllChildren();
+        _window.Parts.DisposeAllChildren();
+        View(ViewType.Parts);
+
+        var oldSurgery = _surgery;
+        var oldPart = _part;
+        _part = null;
+        _surgery = null;
+
+        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))
+                    options.Add((choice, ent.Value, _entities.GetComponent<MetaDataComponent>(ent.Value).EntityName, part.PartType));
+                else if (_entities.TryGetComponent(ent, out BodyComponent? body))
+                    options.Add((choice, ent.Value, _entities.GetComponent<MetaDataComponent>(ent.Value).EntityName, null));
+            }
+
+        options.Sort((a, b) =>
+        {
+            int GetScore(BodyPartType? partType)
+            {
+                return partType switch
+                {
+                    BodyPartType.Head => 1,
+                    BodyPartType.Torso => 2,
+                    BodyPartType.Arm => 3,
+                    BodyPartType.Hand => 4,
+                    BodyPartType.Leg => 5,
+                    BodyPartType.Foot => 6,
+                    // BodyPartType.Tail => 7, No tails yet!
+                    BodyPartType.Other => 8,
+                    _ => 9
+                };
+            }
+
+            return GetScore(a.PartType) - GetScore(b.PartType);
+        });
+
+        foreach (var (netEntity, entity, partName, _) in options)
+        {
+            //var netPart = _entities.GetNetEntity(part.Owner);
+            var surgeries = state.Choices[netEntity];
+            var partButton = new XenoChoiceControl();
+
+            partButton.Set(partName, null);
+            partButton.Button.OnPressed += _ => OnPartPressed(netEntity, surgeries);
+
+            _window.Parts.AddChild(partButton);
+
+            foreach (var surgeryId in surgeries)
+            {
+                if (_system.GetSingleton(surgeryId) is not { } surgery ||
+                    !_entities.TryGetComponent(surgery, out SurgeryComponent? surgeryComp))
+                    continue;
+
+                if (oldPart == entity && oldSurgery?.Proto == surgeryId)
+                    OnSurgeryPressed((surgery, surgeryComp), netEntity, surgeryId);
+            }
+
+            if (oldPart == entity && oldSurgery == null)
+                OnPartPressed(netEntity, surgeries);
+        }
+
+
+        if (!_window.IsOpen)
+        {
+            //Logger.Debug("Attempting to open");
+            _window.OpenCentered();
+        }
+    }
+
+    private void AddStep(EntProtoId stepId, NetEntity netPart, EntProtoId surgeryId)
+    {
+        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 };
+        stepButton.Button.OnPressed += _ => SendMessage(new SurgeryStepChosenBuiMsg(netPart, surgeryId, stepId, _isBody));
+
+        _window.Steps.AddChild(stepButton);
+    }
+
+    private void OnSurgeryPressed(Entity<SurgeryComponent> surgery, NetEntity netPart, EntProtoId surgeryId)
+    {
+        if (_window == null)
+            return;
+
+        _part = _entities.GetEntity(netPart);
+        _isBody = _entities.HasComponent<BodyComponent>(_part);
+        _surgery = (surgery, surgeryId);
+
+        _window.Steps.DisposeAllChildren();
+
+        // This apparently does not consider if theres multiple surgery requirements in one surgery. Maybe thats fine.
+        if (surgery.Comp.Requirement is { } requirementId && _system.GetSingleton(requirementId) is { } requirement)
+        {
+            var label = new XenoChoiceControl();
+            label.Button.OnPressed += _ =>
+            {
+                _previousSurgeries.Add(surgeryId);
+
+                if (_entities.TryGetComponent(requirement, out SurgeryComponent? requirementComp))
+                    OnSurgeryPressed((requirement, requirementComp), netPart, requirementId);
+            };
+
+            var msg = new FormattedMessage();
+            var surgeryName = _entities.GetComponent<MetaDataComponent>(requirement).EntityName;
+            msg.AddMarkup($"[bold]{Loc.GetString("surgery-ui-window-require")}: {surgeryName}[/bold]");
+            label.Set(msg, null);
+
+            _window.Steps.AddChild(label);
+            _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();
+    }
+
+    private void OnPartPressed(NetEntity netPart, List<EntProtoId> surgeryIds)
+    {
+        if (_window == null)
+            return;
+
+        _part = _entities.GetEntity(netPart);
+        _isBody = _entities.HasComponent<BodyComponent>(_part);
+        _window.Surgeries.DisposeAllChildren();
+
+        var surgeries = new List<(Entity<SurgeryComponent> Ent, EntProtoId Id, string Name)>();
+        foreach (var surgeryId in surgeryIds)
+        {
+            if (_system.GetSingleton(surgeryId) is not { } surgery ||
+                !_entities.TryGetComponent(surgery, out SurgeryComponent? surgeryComp))
+            {
+                continue;
+            }
+
+            var name = _entities.GetComponent<MetaDataComponent>(surgery).EntityName;
+            surgeries.Add(((surgery, surgeryComp), surgeryId, name));
+        }
+
+        surgeries.Sort((a, b) =>
+        {
+            var priority = a.Ent.Comp.Priority.CompareTo(b.Ent.Comp.Priority);
+            if (priority != 0)
+                return priority;
+
+            return string.Compare(a.Name, b.Name, StringComparison.Ordinal);
+        });
+
+        foreach (var surgery in surgeries)
+        {
+            var surgeryButton = new XenoChoiceControl();
+            surgeryButton.Set(surgery.Name, null);
+
+            surgeryButton.Button.OnPressed += _ => OnSurgeryPressed(surgery.Ent, netPart, surgery.Id);
+            _window.Surgeries.AddChild(surgeryButton);
+        }
+
+        RefreshUI();
+        View(ViewType.Surgeries);
+    }
+
+    private void RefreshUI()
+    {
+        if (_window == null
+            || !_window.IsOpen
+            || _part == null
+            || !_entities.HasComponent<SurgeryComponent>(_surgery?.Ent)
+            || !_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)
+        {
+            if (child is not SurgeryStepButton stepButton)
+                continue;
+
+            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;
+
+            var stepName = new FormattedMessage();
+            stepName.AddText(_entities.GetComponent<MetaDataComponent>(stepButton.Step).EntityName);
+
+            if (status == StepStatus.Complete)
+                stepButton.Button.Modulate = Color.Green;
+            else
+            {
+                stepButton.Button.Modulate = Color.White;
+                if (_player.LocalEntity is { } player
+                    && status == StepStatus.Next
+                    && !_system.CanPerformStep(player, Owner, _part.Value, stepButton.Step, false, out var popup, out var reason, out _))
+                    stepButton.ToolTip = popup;
+            }
+
+            var texture = _entities.GetComponentOrNull<SpriteComponent>(stepButton.Step)?.Icon?.Default;
+            stepButton.Set(stepName, texture);
+            i++;
+        }
+    }
+
+    private void View(ViewType type)
+    {
+        if (_window == null)
+            return;
+
+        _window.PartsButton.Parent!.Margin = new Thickness(0, 0, 0, 10);
+
+        _window.Parts.Visible = type == ViewType.Parts;
+        _window.PartsButton.Disabled = type == ViewType.Parts;
+
+        _window.Surgeries.Visible = type == ViewType.Surgeries;
+        _window.SurgeriesButton.Disabled = type != ViewType.Steps;
+
+        _window.Steps.Visible = type == ViewType.Steps;
+        _window.StepsButton.Disabled = type != ViewType.Steps || _previousSurgeries.Count == 0;
+
+        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
+    {
+        Parts,
+        Surgeries,
+        Steps
+    }
+
+    private enum StepStatus
+    {
+        Next,
+        Complete,
+        Incomplete
+    }
+}
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml b/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml
new file mode 100644
index 00000000000..d7878fb6572
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml
@@ -0,0 +1,4 @@
+<surgery:SurgeryStepButton
+    xmlns="https://spacestation14.io"
+    xmlns:surgery="clr-namespace:Content.Client._CorvaxNext.Surgery">
+</surgery:SurgeryStepButton>
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml.cs b/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml.cs
new file mode 100644
index 00000000000..c4b90e6e154
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml.cs
@@ -0,0 +1,16 @@
+using Content.Client.Xenonids.UI;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._CorvaxNext.Surgery;
+
+[GenerateTypedNameReferences]
+public sealed partial class SurgeryStepButton : XenoChoiceControl
+{
+    public EntityUid Step { get; set; }
+
+    public SurgeryStepButton()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgerySystem.cs b/Content.Client/_CorvaxNext/Surgery/SurgerySystem.cs
new file mode 100644
index 00000000000..bc4c51dc519
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Surgery/SurgerySystem.cs
@@ -0,0 +1,11 @@
+using Content.Shared._CorvaxNext.Surgery;
+
+namespace Content.Client._CorvaxNext.Surgery;
+
+public sealed class SurgerySystem : SharedSurgerySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+    }
+}
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml b/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml
new file mode 100644
index 00000000000..e3842228773
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml
@@ -0,0 +1,23 @@
+<controls:SurgeryWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client._CorvaxNext.Surgery"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    MinSize="400 400">
+    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 0 0 10">
+            <Button Name="PartsButton" Access="Public" Text="{Loc 'surgery-ui-window-parts'}"
+                    HorizontalExpand="True" StyleClasses="OpenBoth" />
+            <Button Name="SurgeriesButton" Access="Public" Text="{Loc 'surgery-ui-window-surgeries'}"
+                    HorizontalExpand="True" StyleClasses="OpenBoth" />
+            <Button Name="StepsButton" Access="Public" Text="{Loc 'surgery-ui-window-steps'}"
+                    HorizontalExpand="True" StyleClasses="OpenBoth" />
+        </BoxContainer>
+        <cc:HSeparator />
+        <ScrollContainer VScrollEnabled="True" HorizontalExpand="True" VerticalExpand="True">
+            <BoxContainer Name="Parts" Access="Public" Orientation="Vertical" Visible="False" />
+            <BoxContainer Name="Surgeries" Access="Public" Orientation="Vertical" Visible="False" />
+            <BoxContainer Name="Steps" Access="Public" Orientation="Vertical" Visible="False" />
+        </ScrollContainer>
+    </BoxContainer>
+</controls:SurgeryWindow>
diff --git a/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml.cs b/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml.cs
new file mode 100644
index 00000000000..84f13cb7784
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml.cs
@@ -0,0 +1,14 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._CorvaxNext.Surgery;
+
+[GenerateTypedNameReferences]
+public sealed partial class SurgeryWindow : DefaultWindow
+{
+    public SurgeryWindow()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}
diff --git a/Content.Client/_CorvaxNext/Targeting/TargetingSystem.cs b/Content.Client/_CorvaxNext/Targeting/TargetingSystem.cs
new file mode 100644
index 00000000000..96b0ce3df7c
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Targeting/TargetingSystem.cs
@@ -0,0 +1,101 @@
+using Content.Shared._CorvaxNext.Targeting;
+using Content.Shared.Input;
+using Robust.Client.Player;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
+
+namespace Content.Client._CorvaxNext.Targeting;
+public sealed class TargetingSystem : SharedTargetingSystem
+{
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    public event Action<TargetingComponent>? TargetingStartup;
+    public event Action? TargetingShutdown;
+    public event Action<TargetBodyPart>? TargetChange;
+    public event Action<TargetingComponent>? PartStatusStartup;
+    public event Action<TargetingComponent>? PartStatusUpdate;
+    public event Action? PartStatusShutdown;
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<TargetingComponent, LocalPlayerAttachedEvent>(HandlePlayerAttached);
+        SubscribeLocalEvent<TargetingComponent, LocalPlayerDetachedEvent>(HandlePlayerDetached);
+        SubscribeLocalEvent<TargetingComponent, ComponentStartup>(OnTargetingStartup);
+        SubscribeLocalEvent<TargetingComponent, ComponentShutdown>(OnTargetingShutdown);
+        SubscribeNetworkEvent<TargetIntegrityChangeEvent>(OnTargetIntegrityChange);
+
+        CommandBinds.Builder
+        .Bind(ContentKeyFunctions.TargetHead,
+            InputCmdHandler.FromDelegate((session) => HandleTargetChange(session, TargetBodyPart.Head)))
+        .Bind(ContentKeyFunctions.TargetTorso,
+            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>();
+    }
+
+    private void HandlePlayerAttached(EntityUid uid, TargetingComponent component, LocalPlayerAttachedEvent args)
+    {
+        TargetingStartup?.Invoke(component);
+        PartStatusStartup?.Invoke(component);
+    }
+
+    private void HandlePlayerDetached(EntityUid uid, TargetingComponent component, LocalPlayerDetachedEvent args)
+    {
+        TargetingShutdown?.Invoke();
+        PartStatusShutdown?.Invoke();
+    }
+
+    private void OnTargetingStartup(EntityUid uid, TargetingComponent component, ComponentStartup args)
+    {
+        if (_playerManager.LocalEntity != uid)
+            return;
+
+        TargetingStartup?.Invoke(component);
+        PartStatusStartup?.Invoke(component);
+    }
+
+    private void OnTargetingShutdown(EntityUid uid, TargetingComponent component, ComponentShutdown args)
+    {
+        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)
+            return;
+
+        PartStatusUpdate?.Invoke(component);
+    }
+
+    private void HandleTargetChange(ICommonSession? session, TargetBodyPart target)
+    {
+        if (session == null
+            || session.AttachedEntity is not { } uid
+            || !TryComp<TargetingComponent>(uid, out var targeting))
+            return;
+
+        TargetChange?.Invoke(target);
+    }
+}
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/PartStatusUIController.cs b/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/PartStatusUIController.cs
new file mode 100644
index 00000000000..7a39bfa63d4
--- /dev/null
+++ b/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/PartStatusUIController.cs
@@ -0,0 +1,80 @@
+using Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets;
+using Content.Client.Gameplay;
+using Content.Shared._CorvaxNext.Targeting;
+using Content.Client._CorvaxNext.Targeting;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Utility;
+using Robust.Client.Graphics;
+
+namespace Content.Client._CorvaxNext.UserInterface.Systems.PartStatus;
+
+public sealed class PartStatusUIController : UIController, IOnStateEntered<GameplayState>, IOnSystemChanged<TargetingSystem>
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IEntityNetworkManager _net = default!;
+    private SpriteSystem _spriteSystem = default!;
+    private TargetingComponent? _targetingComponent;
+    private PartStatusControl? PartStatusControl => UIManager.GetActiveUIWidgetOrNull<PartStatusControl>();
+
+    public void OnSystemLoaded(TargetingSystem system)
+    {
+        system.PartStatusStartup += AddPartStatusControl;
+        system.PartStatusShutdown += RemovePartStatusControl;
+        system.PartStatusUpdate += UpdatePartStatusControl;
+    }
+
+    public void OnSystemUnloaded(TargetingSystem system)
+    {
+        system.PartStatusStartup -= AddPartStatusControl;
+        system.PartStatusShutdown -= RemovePartStatusControl;
+        system.PartStatusUpdate -= UpdatePartStatusControl;
+    }
+
+    public void OnStateEntered(GameplayState state)
+    {
+        if (PartStatusControl != null)
+        {
+            PartStatusControl.SetVisible(_targetingComponent != null);
+
+            if (_targetingComponent != null)
+                PartStatusControl.SetTextures(_targetingComponent.BodyStatus);
+        }
+    }
+
+    public void AddPartStatusControl(TargetingComponent component)
+    {
+        _targetingComponent = component;
+
+        if (PartStatusControl != null)
+        {
+            PartStatusControl.SetVisible(_targetingComponent != null);
+
+            if (_targetingComponent != null)
+                PartStatusControl.SetTextures(_targetingComponent.BodyStatus);
+        }
+
+    }
+
+    public void RemovePartStatusControl()
+    {
+        if (PartStatusControl != null)
+            PartStatusControl.SetVisible(false);
+
+        _targetingComponent = null;
+    }
+
+    public void UpdatePartStatusControl(TargetingComponent component)
+    {
+        if (PartStatusControl != null && _targetingComponent != null)
+            PartStatusControl.SetTextures(_targetingComponent.BodyStatus);
+    }
+
+    public Texture GetTexture(SpriteSpecifier specifier)
+    {
+        if (_spriteSystem == null)
+            _spriteSystem = _entManager.System<SpriteSystem>();
+
+        return _spriteSystem.Frame0(specifier);
+    }
+}
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml b/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml
new file mode 100644
index 00000000000..8c8a1d9e1aa
--- /dev/null
+++ b/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml
@@ -0,0 +1,57 @@
+<widgets:PartStatusControl
+    xmlns="https://spacestation14.io"
+    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:widgets="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets"
+    Name="PartStatusIndicator"
+    VerticalAlignment="Center"
+    HorizontalAlignment="Center">
+    <Control>
+        <PanelContainer>
+            <TextureRect
+                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="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/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs b/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs
new file mode 100644
index 00000000000..db41ba21bcc
--- /dev/null
+++ b/Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs
@@ -0,0 +1,48 @@
+using Content.Shared._CorvaxNext.Targeting;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets;
+
+[GenerateTypedNameReferences]
+public sealed partial class PartStatusControl : UIWidget
+{
+    private readonly Dictionary<TargetBodyPart, TextureRect> _partStatusControls;
+    private readonly PartStatusUIController _controller;
+    public PartStatusControl()
+    {
+        RobustXamlLoader.Load(this);
+
+        _controller = UserInterfaceManager.GetUIController<PartStatusUIController>();
+        _partStatusControls = new Dictionary<TargetBodyPart, TextureRect>
+        {
+            { 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.LeftFoot, DollLeftFoot },
+            { TargetBodyPart.RightLeg, DollRightLeg },
+            { TargetBodyPart.RightFoot, DollRightFoot }
+        };
+    }
+
+    public void SetTextures(Dictionary<TargetBodyPart, TargetIntegrity> state)
+    {
+        foreach (var (bodyPart, integrity) in state)
+        {
+            string enumName = Enum.GetName(typeof(TargetBodyPart), bodyPart) ?? "Unknown";
+            int enumValue = (int) integrity;
+            var texture = new SpriteSpecifier.Rsi(new ResPath($"/Textures/Interface/Targeting/Status/{enumName.ToLowerInvariant()}.rsi"), $"{enumName.ToLowerInvariant()}_{enumValue}");
+            _partStatusControls[bodyPart].Texture = _controller.GetTexture(texture);
+        }
+    }
+
+    public void SetVisible(bool visible) => this.Visible = visible;
+
+}
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/TargetingUIController.cs b/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/TargetingUIController.cs
new file mode 100644
index 00000000000..a435b5002b0
--- /dev/null
+++ b/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/TargetingUIController.cs
@@ -0,0 +1,81 @@
+using Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets;
+using Content.Client.Gameplay;
+using Content.Client._CorvaxNext.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Client.Player;
+
+namespace Content.Client._CorvaxNext.UserInterface.Systems.Targeting;
+
+public sealed class TargetingUIController : UIController, IOnStateEntered<GameplayState>, IOnSystemChanged<TargetingSystem>
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IEntityNetworkManager _net = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    private TargetingComponent? _targetingComponent;
+    private TargetingControl? TargetingControl => UIManager.GetActiveUIWidgetOrNull<TargetingControl>();
+
+    public void OnSystemLoaded(TargetingSystem system)
+    {
+        system.TargetingStartup += AddTargetingControl;
+        system.TargetingShutdown += RemoveTargetingControl;
+        system.TargetChange += CycleTarget;
+    }
+
+    public void OnSystemUnloaded(TargetingSystem system)
+    {
+        system.TargetingStartup -= AddTargetingControl;
+        system.TargetingShutdown -= RemoveTargetingControl;
+        system.TargetChange -= CycleTarget;
+    }
+
+    public void OnStateEntered(GameplayState state)
+    {
+        if (TargetingControl == null)
+            return;
+
+        TargetingControl.SetTargetDollVisible(_targetingComponent != null);
+
+        if (_targetingComponent != null)
+            TargetingControl.SetBodyPartsVisible(_targetingComponent.Target);
+    }
+
+    public void AddTargetingControl(TargetingComponent component)
+    {
+        _targetingComponent = component;
+
+        if (TargetingControl != null)
+        {
+            TargetingControl.SetTargetDollVisible(_targetingComponent != null);
+
+            if (_targetingComponent != null)
+                TargetingControl.SetBodyPartsVisible(_targetingComponent.Target);
+        }
+
+    }
+
+    public void RemoveTargetingControl()
+    {
+        if (TargetingControl != null)
+            TargetingControl.SetTargetDollVisible(false);
+
+        _targetingComponent = null;
+    }
+
+    public void CycleTarget(TargetBodyPart bodyPart)
+    {
+        if (_playerManager.LocalEntity is not { } user
+            || _entManager.GetComponent<TargetingComponent>(user) is not { } targetingComponent
+            || TargetingControl == null)
+            return;
+
+        var player = _entManager.GetNetEntity(user);
+        if (bodyPart != targetingComponent.Target)
+        {
+            var msg = new TargetChangeEvent(player, bodyPart);
+            _net.SendSystemNetworkMessage(msg);
+            TargetingControl?.SetBodyPartsVisible(bodyPart);
+        }
+    }
+}
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml b/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml
new file mode 100644
index 00000000000..5d7b1becfac
--- /dev/null
+++ b/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml
@@ -0,0 +1,218 @@
+<widgets:TargetingControl
+    xmlns="https://spacestation14.io"
+    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:widgets="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets"
+    Name="TargetingButton"
+    VerticalExpand="True"
+    VerticalAlignment="Bottom"
+    HorizontalAlignment="Right">
+    <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="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>
+                </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>
+                    <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>
+                    <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>
+                </PanelContainer>
+            </PanelContainer>
+        </TextureRect>
+    </Control>
+</widgets:TargetingControl>
diff --git a/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs b/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs
new file mode 100644
index 00000000000..f1853d6eeb7
--- /dev/null
+++ b/Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs
@@ -0,0 +1,58 @@
+using System.Linq;
+using Content.Shared._CorvaxNext.Targeting;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets;
+
+[GenerateTypedNameReferences]
+public sealed partial class TargetingControl : UIWidget
+{
+    private readonly TargetingUIController _controller;
+    private readonly Dictionary<TargetBodyPart, TextureButton> _bodyPartControls;
+
+    public TargetingControl()
+    {
+        RobustXamlLoader.Load(this);
+        _controller = UserInterfaceManager.GetUIController<TargetingUIController>();
+
+        _bodyPartControls = new Dictionary<TargetBodyPart, TextureButton>
+        {
+            // 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 bodyPartButton in _bodyPartControls)
+        {
+            bodyPartButton.Value.MouseFilter = MouseFilterMode.Stop;
+            bodyPartButton.Value.OnPressed += _ => SetActiveBodyPart(bodyPartButton.Key);
+
+            TargetDoll.Texture = Theme.ResolveTexture("target_doll");
+        }
+    }
+
+    private void SetActiveBodyPart(TargetBodyPart bodyPart) => _controller.CycleTarget(bodyPart);
+
+    public void SetBodyPartsVisible(TargetBodyPart bodyPart)
+    {
+        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.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
index ec508790ba8..6dc18523fbb 100644
--- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
@@ -237,8 +237,7 @@ public override void Update(float frameTime)
                 if (pressure <= Atmospherics.HazardLowPressure)
                 {
                     // Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
-                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true, false);
-
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true, false, canSever: false); // _CorvaxNext
                     if (!barotrauma.TakingDamage)
                     {
                         barotrauma.TakingDamage = true;
@@ -252,7 +251,7 @@ public override void Update(float frameTime)
                     var damageScale = MathF.Min(((pressure / Atmospherics.HazardHighPressure) - 1) * Atmospherics.PressureDamageCoefficient, Atmospherics.MaxHighPressureDamage);
 
                     // Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
-                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false);
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false, canSever: false); // _CorvaxNext
 
                     if (!barotrauma.TakingDamage)
                     {
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index 4279f3ed2b8..c87a0eb0399 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -1,9 +1,12 @@
+using System.Linq;
 using Content.Server.Body.Components;
 using Content.Server.Ghost;
 using Content.Server.Humanoid;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Systems;
+using Content.Shared.Damage;
+using Content.Shared.Gibbing.Events;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Systems;
@@ -20,6 +23,7 @@ public sealed class BodySystem : SharedBodySystem
     [Dependency] private readonly GhostSystem _ghostSystem = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
 
@@ -29,8 +33,19 @@ public override void Initialize()
 
         SubscribeLocalEvent<BodyComponent, MoveInputEvent>(OnRelayMoveInput);
         SubscribeLocalEvent<BodyComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
+        SubscribeLocalEvent<BodyPartComponent, AttemptEntityGibEvent>(OnGibTorsoAttempt); // _CorvaxNext: surgery
     }
 
+    // start-_CorvaxNext: surgery
+    private void OnGibTorsoAttempt(Entity<BodyPartComponent> ent, ref AttemptEntityGibEvent args)
+    {
+        if (ent.Comp.PartType == BodyPartType.Torso)
+        {
+            args.GibType = GibType.Skip;
+        }
+    }
+    // end-_CorvaxNext: surgery
+
     private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
     {
         // If they haven't actually moved then ignore it.
@@ -70,9 +85,8 @@ protected override void AddPart(
             var layer = partEnt.Comp.ToHumanoidLayers();
             if (layer != null)
             {
-                var layers = HumanoidVisualLayersExtension.Sublayers(layer.Value);
                 _humanoidSystem.SetLayersVisibility(
-                    bodyEnt, layers, visible: true, permanent: true, humanoid);
+                    bodyEnt, new[] { layer.Value }, visible: true, permanent: true, humanoid);
             }
         }
     }
@@ -93,8 +107,10 @@ 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);
     }
 
     public override HashSet<EntityUid> GibBody(
@@ -105,8 +121,9 @@ public override HashSet<EntityUid> GibBody(
         Vector2? splatDirection = null,
         float splatModifier = 1,
         Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null
-    )
+        SoundSpecifier? gibSoundOverride = null,
+        GibType gib = GibType.Gib,
+        GibContentsOption contents = GibContentsOption.Drop)
     {
         if (!Resolve(bodyId, ref body, logMissing: false)
             || TerminatingOrDeleted(bodyId)
@@ -120,7 +137,8 @@ public override HashSet<EntityUid> GibBody(
             return new HashSet<EntityUid>();
 
         var gibs = base.GibBody(bodyId, gibOrgans, body, launchGibs: launchGibs,
-            splatDirection: splatDirection, splatModifier: splatModifier, splatCone:splatCone);
+            splatDirection: splatDirection, splatModifier: splatModifier, splatCone: splatCone,
+            gib: gib, contents: contents);
 
         var ev = new BeingGibbedEvent(gibs);
         RaiseLocalEvent(bodyId, ref ev);
@@ -129,4 +147,49 @@ public override HashSet<EntityUid> GibBody(
 
         return gibs;
     }
+
+    // start-_CorvaxNext: surgery
+    public override HashSet<EntityUid> GibPart(
+        EntityUid partId,
+        BodyPartComponent? part = null,
+        bool launchGibs = true,
+        Vector2? splatDirection = null,
+        float splatModifier = 1,
+        Angle splatCone = default,
+        SoundSpecifier? gibSoundOverride = null)
+    {
+        if (!Resolve(partId, ref part, logMissing: false)
+            || TerminatingOrDeleted(partId)
+            || EntityManager.IsQueuedForDeletion(partId))
+            return new HashSet<EntityUid>();
+
+        if (Transform(partId).MapUid is null)
+            return new HashSet<EntityUid>();
+
+        var gibs = base.GibPart(partId, part, launchGibs: launchGibs,
+            splatDirection: splatDirection, splatModifier: splatModifier, splatCone: splatCone);
+
+        var ev = new BeingGibbedEvent(gibs);
+        RaiseLocalEvent(partId, ref ev);
+
+        if (gibs.Any())
+            QueueDel(partId);
+
+        return gibs;
+    }
+
+    protected override void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component)
+    {
+        return;
+    }
+
+    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);
+    }
+    // end-_CorvaxNext: surgery
 }
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs
index 86d2cb61ffe..91d8e1e76e7 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Server/Body/Systems/BrainSystem.cs
@@ -1,7 +1,12 @@
 using Content.Server.Body.Components;
 using Content.Server.Ghost.Components;
+using Content.Shared._CorvaxNext.Surgery.Body;
 using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
 using Content.Shared.Body.Events;
+using Content.Shared.Body.Organ;
+using Content.Server._CorvaxNext.DelayedDeath;
+using Content.Shared._CorvaxNext.Surgery.Body.Organs;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Pointing;
@@ -11,16 +16,41 @@ namespace Content.Server.Body.Systems
     public sealed class BrainSystem : EntitySystem
     {
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+        [Dependency] private readonly SharedBodySystem _bodySystem = default!;
 
         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);
         }
 
+        // start-_CorvaxNext: surgery
+        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);
+            EnsureComp<DelayedDeathComponent>(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);
+            if (_bodySystem.TryGetBodyOrganEntityComps<HeartComponent>(args.Body, out var _))
+                RemComp<DelayedDeathComponent>(args.Body);
+            HandleMind(args.Body, uid);
+        }
+        // end-_CorvaxNext: surgery
+
         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..891f6d9f620 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._CorvaxNext.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;
@@ -294,7 +296,7 @@ private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
             }
         }
 
-        _damageableSys.TryChangeDamage(ent, ent.Comp.Damage, interruptsDoAfters: false);
+        _damageableSys.TryChangeDamage(ent, HasComp<DebrainedComponent>(ent) ? ent.Comp.Damage * 4.5f : ent.Comp.Damage, interruptsDoAfters: false); // _CorvaxNext: surgery
     }
 
     private void StopSuffocation(Entity<RespiratorComponent> ent)
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
index c83fed19069..3e391b7e784 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Body.Components;
+using Content.Shared.Gibbing.Events;
 using JetBrains.Annotations;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
@@ -7,13 +8,15 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
     [DataDefinition]
     public sealed partial class GibBehavior : IThresholdBehavior
     {
+        [DataField] public GibType GibType = GibType.Gib; // _CorvaxNext: surgery
+        [DataField] public GibContentsOption GibContents = GibContentsOption.Drop; // _CorvaxNext: surgery
         [DataField("recursive")] private bool _recursive = true;
 
         public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
         {
             if (system.EntityManager.TryGetComponent(owner, out BodyComponent? body))
             {
-                system.BodySystem.GibBody(owner, _recursive, body);
+                system.BodySystem.GibBody(owner, _recursive, body, gib: GibType, contents: GibContents);
             }
         }
     }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
new file mode 100644
index 00000000000..c7a4db708d4
--- /dev/null
+++ b/Content.Server/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using JetBrains.Annotations;
+
+namespace Content.Server.Destructible.Thresholds.Behaviors;
+
+// start-_CorvaxNext: surgery
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class GibPartBehavior : IThresholdBehavior
+{
+    public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
+    {
+        if (!system.EntityManager.TryGetComponent(owner, out BodyPartComponent? part))
+            return;
+
+        system.BodySystem.GibPart(owner, part);
+    }
+}
+// end-_CorvaxNext: surgery
diff --git a/Content.Server/EntityEffects/Effects/HealthChange.cs b/Content.Server/EntityEffects/Effects/HealthChange.cs
index fd2a658745b..f5723b661db 100644
--- a/Content.Server/EntityEffects/Effects/HealthChange.cs
+++ b/Content.Server/EntityEffects/Effects/HealthChange.cs
@@ -7,6 +7,7 @@
 using Robust.Shared.Prototypes;
 using System.Linq;
 using System.Text.Json.Serialization;
+using Content.Shared._CorvaxNext.Targeting;
 
 namespace Content.Server.EntityEffects.Effects
 {
@@ -124,7 +125,12 @@ public override void Effect(EntityEffectBaseArgs args)
                 args.TargetEntity,
                 Damage * scale,
                 IgnoreResistances,
-                interruptsDoAfters: false);
+                interruptsDoAfters: false,
+                // start-_CorvaxNext: surgery
+                targetPart: TargetBodyPart.All,
+                partMultiplier: 0.5f,
+                canSever: false);
+                // end-_CorvaxNext: surgery
         }
     }
 }
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 903fd1ff3f7..163104202dc 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -2,6 +2,8 @@
 using Content.Server.Inventory;
 using Content.Server.Stack;
 using Content.Server.Stunnable;
+using Content.Shared.Body.Systems;
+using Content.Shared.Body.Events;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Body.Part;
 using Content.Shared.CombatMode;
@@ -36,7 +38,7 @@ public sealed class HandsSystem : SharedHandsSystem
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PullingSystem _pullingSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
-
+        [Dependency] private readonly SharedBodySystem _bodySystem = default!;
         public override void Initialize()
         {
             base.Initialize();
@@ -52,6 +54,8 @@ public override void Initialize()
             SubscribeLocalEvent<HandsComponent, ComponentGetState>(GetComponentState);
 
             SubscribeLocalEvent<HandsComponent, BeforeExplodeEvent>(OnExploded);
+            SubscribeLocalEvent<HandsComponent, BodyPartEnabledEvent>(HandleBodyPartEnabled); // _CorvaxNext: surgery
+            SubscribeLocalEvent<HandsComponent, BodyPartDisabledEvent>(HandleBodyPartDisabled); // _CorvaxNext: surgery
 
             CommandBinds.Builder
                 .Bind(ContentKeyFunctions.ThrowItemInHand, new PointerInputCmdHandler(HandleThrowItem))
@@ -101,32 +105,60 @@ private void OnDisarmed(EntityUid uid, HandsComponent component, DisarmedEvent a
             args.Handled = true; // no shove/stun.
         }
 
-        private void HandleBodyPartAdded(EntityUid uid, HandsComponent component, ref BodyPartAddedEvent args)
+        // _CorvaxNext: surgery
+        private void TryAddHand(EntityUid uid, HandsComponent component, Entity<BodyPartComponent> part, string slot)
         {
-            if (args.Part.Comp.PartType != BodyPartType.Hand)
+            if (part.Comp is null
+                || part.Comp.PartType != BodyPartType.Hand)
                 return;
 
             // If this annoys you, which it should.
             // Ping Smugleaf.
-            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))
             };
 
-            AddHand(uid, args.Slot, location);
+            if (part.Comp.Enabled
+                && _bodySystem.TryGetParentBodyPart(part, out var _, out var parentPartComp)
+                && parentPartComp.Enabled)
+                AddHand(uid, slot, location);
         }
 
+        // start-_CorvaxNext: surgery
+        private void HandleBodyPartAdded(EntityUid uid, HandsComponent component, ref BodyPartAddedEvent args)
+        {
+            TryAddHand(uid, component, args.Part, args.Slot);
+        }
+        // end-_CorvaxNext: surgery
+
         private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref BodyPartRemovedEvent args)
         {
-            if (args.Part.Comp.PartType != BodyPartType.Hand)
+            if (args.Part.Comp is null
+                || args.Part.Comp.PartType != BodyPartType.Hand)
                 return;
-
             RemoveHand(uid, args.Slot);
         }
 
+        // start-_CorvaxNext: surgery
+        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)
+        {
+            if (TerminatingOrDeleted(uid)
+                || args.Part.Comp is null
+                || args.Part.Comp.PartType != BodyPartType.Hand)
+                return;
+
+            RemoveHand(uid, SharedBodySystem.GetPartSlotContainerId(args.Part.Comp.ParentSlot?.Id ?? string.Empty));
+        }
+        // end-_CorvaxNext: surgery
+
+
         #region pulling
 
         private void HandlePullStarted(EntityUid uid, HandsComponent component, PullStartedMessage args)
@@ -195,7 +227,7 @@ hands.ActiveHandEntity is not { } throwEnt ||
             {
                 var splitStack = _stackSystem.Split(throwEnt, 1, EntityManager.GetComponent<TransformComponent>(player).Coordinates, stack);
 
-                if (splitStack is not {Valid: true})
+                if (splitStack is not { Valid: true })
                     return false;
 
                 throwEnt = splitStack.Value;
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index 34b7af0212d..883e6c0b869 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -38,6 +38,14 @@ public sealed partial class HealthAnalyzerComponent : Component
     [DataField]
     public EntityUid? ScannedEntity;
 
+    // start-_CorvaxNext: surgery
+    /// <summary>
+    /// The body part that is currently being scanned.
+    /// </summary>
+    [DataField]
+    public EntityUid? CurrentBodyPart;
+    // end-_CorvaxNext: surgery
+
     /// <summary>
     /// The maximum range in tiles at which the analyzer can receive continuous updates
     /// </summary>
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 15fe2a69cf9..50fd66d6745 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -202,6 +202,7 @@ private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableU
                 : 0,
             null,
             null,
+            null,
             null
         ));
     }
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index cf5869d1cbb..2a2c874bbf2 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -1,14 +1,18 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
+using Content.Shared.Body.Part;
+using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Medical.Components;
 using Content.Server.Popups;
 using Content.Server.Stack;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Audio;
+using Content.Shared.Body.Systems;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
+using Content.Shared.Body.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
@@ -21,6 +25,8 @@
 using Content.Shared.Stacks;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
+using System.Linq;
+using Content.Shared._CorvaxNext.Targeting;
 
 namespace Content.Server.Medical;
 
@@ -36,6 +42,7 @@ public sealed class HealingSystem : EntitySystem
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
     public override void Initialize()
@@ -80,7 +87,7 @@ 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);
+        var healed = _damageable.TryChangeDamage(entity.Owner, healing.Damage, true, origin: args.User, canSever: false);
 
         if (healed == null && healing.BloodlossModifier != 0)
             return;
@@ -114,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);
+        // 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;
@@ -136,6 +143,22 @@ private bool HasDamage(DamageableComponent component, HealingComponent healing)
         return false;
     }
 
+    // start-_CorvaxNext: surgery
+    private bool IsPartDamaged(EntityUid user, EntityUid target)
+    {
+        if (!TryComp(user, out TargetingComponent? targeting))
+            return false;
+
+        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;
+    }
+    // end-_CorvaxNext: surgery
+
     private void OnHealingUse(Entity<HealingComponent> entity, ref UseInHandEvent args)
     {
         if (args.Handled)
@@ -174,6 +197,7 @@ targetDamage.DamageContainerID is not null &&
 
         var anythingToDo =
             HasDamage(targetDamage, component) ||
+            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.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 90646725bb7..83a776dd019 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -1,9 +1,15 @@
 using Content.Server.Body.Components;
+using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Medical.Components;
 using Content.Server.PowerCell;
 using Content.Server.Temperature.Components;
 using Content.Server.Traits.Assorted;
+using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Chemistry.EntitySystems;
+// _CorvaxNext: surgery Start
+using Content.Shared.Body.Part;
+using Content.Shared.Body.Systems;
+// _CorvaxNext: surgery End
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
@@ -17,7 +23,9 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
+using System.Linq;
 
 namespace Content.Server.Medical;
 
@@ -29,6 +37,7 @@ public sealed class HealthAnalyzerSystem : EntitySystem
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
@@ -40,6 +49,12 @@ public override void Initialize()
         SubscribeLocalEvent<HealthAnalyzerComponent, EntGotInsertedIntoContainerMessage>(OnInsertedIntoContainer);
         SubscribeLocalEvent<HealthAnalyzerComponent, ItemToggledEvent>(OnToggled);
         SubscribeLocalEvent<HealthAnalyzerComponent, DroppedEvent>(OnDropped);
+        // Start-_CorvaxNext: surgery
+        Subs.BuiEvents<HealthAnalyzerComponent>(HealthAnalyzerUiKey.Key, subs =>
+        {
+            subs.Event<HealthAnalyzerPartMessage>(OnHealthAnalyzerPartSelected);
+        });
+        // End-_CorvaxNext: surgery
     }
 
     public override void Update(float frameTime)
@@ -51,7 +66,7 @@ public override void Update(float frameTime)
             if (component.NextUpdate > _timing.CurTime)
                 continue;
 
-            if (component.ScannedEntity is not {} patient)
+            if (component.ScannedEntity is not { } patient)
                 continue;
 
             if (Deleted(patient))
@@ -60,6 +75,17 @@ public override void Update(float frameTime)
                 continue;
             }
 
+            // _CorvaxNext: surgery Change Start
+            if (component.CurrentBodyPart != null
+                && (Deleted(component.CurrentBodyPart)
+                || TryComp(component.CurrentBodyPart, out BodyPartComponent? bodyPartComponent)
+                && bodyPartComponent.Body is null))
+            {
+                BeginAnalyzingEntity((uid, component), patient, null);
+                continue;
+            }
+            // _CorvaxNext: surgery Change End
+
             component.NextUpdate = _timing.CurTime + component.UpdateInterval;
 
             //Get distance between health analyzer and the scanned entity
@@ -71,7 +97,7 @@ public override void Update(float frameTime)
                 continue;
             }
 
-            UpdateScannedUser(uid, patient, true);
+            UpdateScannedUser(uid, patient, true, component.CurrentBodyPart);
         }
     }
 
@@ -87,8 +113,8 @@ private void OnAfterInteract(Entity<HealthAnalyzerComponent> uid, ref AfterInter
 
         var doAfterCancelled = !_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, uid.Comp.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
         {
-            NeedHand = true,
             BreakOnMove = true,
+            NeedHand = true
         });
 
         if (args.Target == args.User || doAfterCancelled || uid.Comp.Silent)
@@ -151,14 +177,14 @@ private void OpenUserInterface(EntityUid user, EntityUid analyzer)
     /// </summary>
     /// <param name="healthAnalyzer">The health analyzer that should receive the updates</param>
     /// <param name="target">The entity to start analyzing</param>
-    private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target)
+    private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target, EntityUid? part = null)
     {
         //Link the health analyzer to the scanned entity
         healthAnalyzer.Comp.ScannedEntity = target;
+        healthAnalyzer.Comp.CurrentBodyPart = part;
 
         _toggle.TryActivate(healthAnalyzer.Owner);
-
-        UpdateScannedUser(healthAnalyzer, target, true);
+        UpdateScannedUser(healthAnalyzer, target, true, part);
     }
 
     /// <summary>
@@ -170,26 +196,50 @@ private void StopAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer,
     {
         //Unlink the analyzer
         healthAnalyzer.Comp.ScannedEntity = null;
+        healthAnalyzer.Comp.CurrentBodyPart = null;
 
         _toggle.TryDeactivate(healthAnalyzer.Owner);
 
         UpdateScannedUser(healthAnalyzer, target, false);
     }
 
+    // Start-_CorvaxNext: surgery
+    /// <summary>
+    /// Handle the selection of a body part on the health analyzer
+    /// </summary>
+    /// <param name="healthAnalyzer">The health analyzer that's receiving the updates</param>
+    /// <param name="args">The message containing the selected part</param>
+    private void OnHealthAnalyzerPartSelected(Entity<HealthAnalyzerComponent> healthAnalyzer, ref HealthAnalyzerPartMessage args)
+    {
+        if (!TryGetEntity(args.Owner, out var owner))
+            return;
+
+        if (args.BodyPart == null)
+        {
+            BeginAnalyzingEntity(healthAnalyzer, owner.Value, null);
+        }
+        else
+        {
+            var (targetType, targetSymmetry) = _bodySystem.ConvertTargetBodyPart(args.BodyPart.Value);
+            if (_bodySystem.GetBodyChildrenOfType(owner.Value, targetType, symmetry: targetSymmetry) is { } part)
+                BeginAnalyzingEntity(healthAnalyzer, owner.Value, part.FirstOrDefault().Id);
+        }
+    }
+// End-_CorvaxNext: surgery
+
     /// <summary>
     /// Send an update for the target to the healthAnalyzer
     /// </summary>
     /// <param name="healthAnalyzer">The health analyzer</param>
     /// <param name="target">The entity being scanned</param>
     /// <param name="scanMode">True makes the UI show ACTIVE, False makes the UI show INACTIVE</param>
-    public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode)
+    public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode, EntityUid? part = null)
     {
         if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key))
             return;
 
         if (!HasComp<DamageableComponent>(target))
             return;
-
         var bodyTemperature = float.NaN;
 
         if (TryComp<TemperatureComponent>(target, out var temp))
@@ -207,8 +257,15 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
             bleeding = bloodstream.BleedAmount > 0;
         }
 
-        if (HasComp<UnrevivableComponent>(target))
+        /*if (HasComp<UnrevivableComponent>(target)) Somehow we dont have unrevivable???
             unrevivable = true;
+        */
+
+        // Start-_CorvaxNext: surgery
+        Dictionary<TargetBodyPart, TargetIntegrity>? body = null;
+        if (HasComp<TargetingComponent>(target))
+            body = _bodySystem.GetBodyPartStatus(target);
+        // End-_CorvaxNext: surgery
 
         _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage(
             GetNetEntity(target),
@@ -216,7 +273,9 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
             bloodAmount,
             scanMode,
             bleeding,
-            unrevivable
+            unrevivable,
+            body, // _CorvaxNext: surgery
+            part != null ? GetNetEntity(part) : null // _CorvaxNext: surgery
         ));
     }
 }
diff --git a/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathComponent.cs b/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathComponent.cs
new file mode 100644
index 00000000000..54a6d848cc1
--- /dev/null
+++ b/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathComponent.cs
@@ -0,0 +1,16 @@
+namespace Content.Server._CorvaxNext.DelayedDeath;
+
+[RegisterComponent]
+public sealed partial class DelayedDeathComponent : Component
+{
+    /// <summary>
+    /// How long it takes to kill the entity.
+    /// </summary>
+    [DataField]
+    public float DeathTime = 60;
+
+    /// <summary>
+    /// How long it has been since the delayed death timer started.
+    /// </summary>
+    public float DeathTimer;
+}
\ No newline at end of file
diff --git a/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathSystem.cs b/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathSystem.cs
new file mode 100644
index 00000000000..7f53b7776b9
--- /dev/null
+++ b/Content.Server/_CorvaxNext/DelayedDeath/DelayedDeathSystem.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Body.Organ;
+using Content.Shared.Body.Events;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._CorvaxNext.DelayedDeath;
+
+public partial class DelayedDeathSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        using var query = EntityQueryEnumerator<DelayedDeathComponent>();
+        while (query.MoveNext(out var ent, out var component))
+        {
+            component.DeathTimer += frameTime;
+
+            if (component.DeathTimer >= component.DeathTime && !_mobState.IsDead(ent))
+            {
+                var damage = new DamageSpecifier(_prototypes.Index<DamageTypePrototype>("Bloodloss"), 150);
+                _damageable.TryChangeDamage(ent, damage, partMultiplier: 0f);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Content.Server/_CorvaxNext/Surgery/SurgerySystem.cs b/Content.Server/_CorvaxNext/Surgery/SurgerySystem.cs
new file mode 100644
index 00000000000..6a7711893d0
--- /dev/null
+++ b/Content.Server/_CorvaxNext/Surgery/SurgerySystem.cs
@@ -0,0 +1,177 @@
+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.Popups;
+using Content.Shared.Damage;
+using Content.Shared.Interaction;
+using Content.Shared.Medical.Surgery.Conditions;
+using Content.Shared.Medical.Surgery.Effects.Step;
+using Content.Shared.Eye.Blinding.Components;
+using Content.Shared.Eye.Blinding.Systems;
+using Content.Shared.Prototypes;
+using Robust.Server.GameObjects;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+using System.Linq;
+using Content.Shared._CorvaxNext.Surgery;
+using Content.Shared._CorvaxNext.Surgery.Effects.Step;
+using Content.Shared._CorvaxNext.Surgery.Tools;
+using Content.Shared.Bed.Sleep;
+using Content.Shared.Medical.Surgery;
+
+namespace Content.Server._CorvaxNext.Surgery;
+
+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 _damageable = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly RottingSystem _rot = default!;
+    [Dependency] private readonly BlindableSystem _blindableSystem = default!;
+
+    private readonly List<EntProtoId> _surgeries = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SurgeryToolComponent, AfterInteractEvent>(OnToolAfterInteract);
+        SubscribeLocalEvent<SurgeryTargetComponent, SurgeryStepDamageEvent>(OnSurgeryStepDamage);
+        // You might be wondering "why aren't we using StepEvent for these two?" reason being that StepEvent fires off regardless of success on the previous functions
+        // so this would heal entities even if you had a used or incorrect organ.
+        SubscribeLocalEvent<SurgerySpecialDamageChangeEffectComponent, SurgeryStepDamageChangeEvent>(OnSurgerySpecialDamageChange);
+        SubscribeLocalEvent<SurgeryDamageChangeEffectComponent, SurgeryStepDamageChangeEvent>(OnSurgeryDamageChange);
+        SubscribeLocalEvent<SurgeryStepEmoteEffectComponent, SurgeryStepEvent>(OnStepScreamComplete);
+        SubscribeLocalEvent<SurgeryStepSpawnEffectComponent, SurgeryStepEvent>(OnStepSpawnComplete);
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+        LoadPrototypes();
+    }
+
+    protected override void RefreshUI(EntityUid body)
+    {
+        var surgeries = new Dictionary<NetEntity, List<EntProtoId>>();
+        foreach (var surgery in _surgeries)
+        {
+            if (GetSingleton(surgery) is not { } surgeryEnt)
+                continue;
+
+            foreach (var part in _body.GetBodyChildren(body))
+            {
+                var ev = new SurgeryValidEvent(body, part.Id);
+                RaiseLocalEvent(surgeryEnt, ref ev);
+
+                if (ev.Cancelled)
+                    continue;
+
+                surgeries.GetOrNew(GetNetEntity(part.Id)).Add(surgery);
+            }
+
+        }
+        //Logger.Debug($"Setting UI state with {surgeries}, {body} and {SurgeryUIKey.Key}");
+        _ui.SetUiState(body, SurgeryUIKey.Key, new SurgeryBuiState(surgeries));
+        /*
+            Reason we do this is because when applying a BUI State, it rolls back the state on the entity temporarily,
+            which just so happens to occur right as we're checking for step completion, so we end up with the UI
+            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)
+    {
+        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)
+    {
+        var user = args.User;
+        if (args.Handled
+            || !args.CanReach
+            || args.Target == null
+            || !HasComp<SurgeryTargetComponent>(args.Target)
+            || !TryComp<SurgeryTargetComponent>(args.User, out var surgery)
+            || !surgery.CanOperate
+            || !IsLyingDown(args.Target.Value, args.User))
+        {
+            return;
+        }
+
+        if (user == args.Target && !_config.GetCVar(Shared._CorvaxNext.NextVars.NextVars.CanOperateOnSelf))
+        {
+            _popup.PopupEntity(Loc.GetString("surgery-error-self-surgery"), user, user);
+            return;
+        }
+
+        args.Handled = true;
+        _ui.OpenUi(args.Target.Value, SurgeryUIKey.Key, user);
+        //Logger.Debug("UI opened");
+        RefreshUI(args.Target.Value);
+    }
+
+    private void OnSurgeryStepDamage(Entity<SurgeryTargetComponent> ent, ref SurgeryStepDamageEvent args) =>
+        SetDamage(args.Body, args.Damage, args.PartMultiplier, args.User, args.Part);
+
+    private void OnSurgerySpecialDamageChange(Entity<SurgerySpecialDamageChangeEffectComponent> ent, ref SurgeryStepDamageChangeEvent args)
+    {
+        if (ent.Comp.DamageType == "Rot")
+            _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(ent, out BlindableComponent? blindComp)
+            && blindComp.EyeDamage > 0)
+            _blindableSystem.AdjustEyeDamage((args.Body, blindComp), -blindComp!.EyeDamage);
+    }
+
+    private void OnSurgeryDamageChange(Entity<SurgeryDamageChangeEffectComponent> ent, ref SurgeryStepDamageChangeEvent args)
+    {
+        var damageChange = ent.Comp.Damage;
+        if (HasComp<ForcedSleepingComponent>(args.Body))
+            damageChange = damageChange * ent.Comp.SleepModifier;
+
+        SetDamage(args.Body, damageChange, 0.5f, args.User, args.Part);
+    }
+
+    private void OnStepScreamComplete(Entity<SurgeryStepEmoteEffectComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (HasComp<ForcedSleepingComponent>(args.Body))
+            return;
+
+        _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>())
+            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/_CorvaxNext/Systems/HeartSystem.cs b/Content.Server/_CorvaxNext/Systems/HeartSystem.cs
new file mode 100644
index 00000000000..905575343b3
--- /dev/null
+++ b/Content.Server/_CorvaxNext/Systems/HeartSystem.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Content.Shared.Body.Events;
+using Content.Shared.Body.Organ;
+using Content.Server._CorvaxNext.DelayedDeath;
+using Content.Server.Body.Components;
+using Content.Shared._CorvaxNext.Surgery.Body.Organs;
+
+namespace Content.Server._CorvaxNext.Body.Systems;
+
+public sealed class HeartSystem : EntitySystem
+{
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HeartComponent, OrganAddedToBodyEvent>(HandleAddition);
+        SubscribeLocalEvent<HeartComponent, OrganRemovedFromBodyEvent>(HandleRemoval);
+    }
+
+    private void HandleRemoval(EntityUid uid, HeartComponent _, ref OrganRemovedFromBodyEvent args)
+    {
+        if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.OldBody))
+            return;
+
+        // TODO: Add some form of very violent bleeding effect.
+        EnsureComp<DelayedDeathComponent>(args.OldBody);
+    }
+
+    private void HandleAddition(EntityUid uid, HeartComponent _, ref OrganAddedToBodyEvent args)
+    {
+        if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.Body))
+            return;
+
+        if (_bodySystem.TryGetBodyOrganEntityComps<BrainComponent>(args.Body, out var _))
+            RemComp<DelayedDeathComponent>(args.Body);
+    }
+    // Shitmed-End
+}
diff --git a/Content.Server/_CorvaxNext/Targeting/TargetingSystem.cs b/Content.Server/_CorvaxNext/Targeting/TargetingSystem.cs
new file mode 100644
index 00000000000..3ff68b9ed69
--- /dev/null
+++ b/Content.Server/_CorvaxNext/Targeting/TargetingSystem.cs
@@ -0,0 +1,53 @@
+using Content.Shared._CorvaxNext.Targeting;
+using Content.Shared.Body.Systems;
+using Content.Shared.Mobs;
+
+namespace Content.Server._CorvaxNext.Targeting;
+public sealed class TargetingSystem : SharedTargetingSystem
+{
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeNetworkEvent<TargetChangeEvent>(OnTargetChange);
+        SubscribeLocalEvent<TargetingComponent, MobStateChangedEvent>(OnMobStateChange);
+    }
+
+    private void OnTargetChange(TargetChangeEvent message, EntitySessionEventArgs args)
+    {
+        if (!TryComp<TargetingComponent>(GetEntity(message.Uid), out var target))
+            return;
+
+        target.Target = message.BodyPart;
+        Dirty(GetEntity(message.Uid), target);
+    }
+
+    private void OnMobStateChange(EntityUid uid, TargetingComponent component, MobStateChangedEvent args)
+    {
+        // Revival is handled by the server, so we're keeping all of this here.
+        var changed = false;
+
+        if (args.NewMobState == MobState.Dead)
+        {
+            foreach (var part in GetValidParts())
+            {
+                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))
+        {
+            component.BodyStatus = _bodySystem.GetBodyPartStatus(uid);
+            changed = true;
+        }
+
+        if (changed)
+        {
+            Dirty(uid, component);
+            RaiseNetworkEvent(new TargetIntegrityChangeEvent(GetNetEntity(uid)), uid);
+        }
+    }
+}
diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs
index 3048927b5fb..43bbc99a9d4 100644
--- a/Content.Shared/Body/Organ/OrganComponent.cs
+++ b/Content.Shared/Body/Organ/OrganComponent.cs
@@ -1,16 +1,42 @@
+using Content.Shared._CorvaxNext.Surgery.Tools;
 using Content.Shared.Body.Systems;
-using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Body.Organ;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedBodySystem))]
-public sealed partial class OrganComponent : Component
+public sealed partial class OrganComponent : Component, ISurgeryToolComponent
 {
     /// <summary>
     /// Relevant body this organ is attached to.
     /// </summary>
     [DataField, AutoNetworkedField]
     public EntityUid? Body;
+
+    // start-_CorvaxNext: surgery
+    /// <summary>
+    ///     Relevant body this organ originally belonged to.
+    ///     ///     FOR WHATEVER FUCKING REASON AUTONETWORKING THIS CRASHES GIBTEST AAAAAAAAAAAAAAA
+    /// </summary>
+    [DataField]
+    public EntityUid? OriginalBody;
+
+    /// <summary>
+    /// Shitcodey solution to not being able to know what name corresponds to each organ's slot ID
+    /// without referencing the prototype or hardcoding.
+    /// </summary>
+
+    [DataField]
+    public string SlotId = "";
+
+    [DataField]
+    public string ToolName { get; set; } = "An organ";
+
+    /// <summary>
+    ///  If true, the organ will not heal an entity when transplanted into them.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool? Used { get; set; }
+    // end-_CorvaxNext: surgery
 }
diff --git a/Content.Shared/Body/Organ/TailComponent.cs b/Content.Shared/Body/Organ/TailComponent.cs
new file mode 100644
index 00000000000..41c12ef2208
--- /dev/null
+++ b/Content.Shared/Body/Organ/TailComponent.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Body.Organ;
+
+// start-_CorvaxNext: surgery
+[RegisterComponent]
+public sealed partial class TailComponent : Component;
+// end-_CorvaxNext: surgery
diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs
index c4e65c06a3f..3660fc2eef9 100644
--- a/Content.Shared/Body/Part/BodyPartComponent.cs
+++ b/Content.Shared/Body/Part/BodyPartComponent.cs
@@ -1,5 +1,9 @@
-using Content.Shared.Body.Components;
+using Content.Shared._CorvaxNext.Surgery.Tools;
+using Content.Shared._CorvaxNext.Targeting;
+using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -8,7 +12,7 @@ namespace Content.Shared.Body.Part;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedBodySystem))]
-public sealed partial class BodyPartComponent : Component
+public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
 {
     // Need to set this on container changes as it may be several transform parents up the hierarchy.
     /// <summary>
@@ -17,6 +21,14 @@ public sealed partial class BodyPartComponent : Component
     [DataField, AutoNetworkedField]
     public EntityUid? Body;
 
+    // start-_CorvaxNext: surgery
+    [DataField, AutoNetworkedField]
+    public EntityUid? OriginalBody;
+
+    [DataField, AutoNetworkedField]
+    public BodyPartSlot? ParentSlot;
+    // end-_CorvaxNext: surgery
+
     [DataField, AutoNetworkedField]
     public BodyPartType PartType = BodyPartType.Other;
 
@@ -28,9 +40,26 @@ public sealed partial class BodyPartComponent : Component
     [DataField("vital"), AutoNetworkedField]
     public bool IsVital;
 
+    // start-_CorvaxNext: surgery
+    /// <summary>
+    /// Amount of damage to deal when the part gets removed.
+    /// Only works if IsVital is true.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 VitalDamage = 100;
+    // end-_CorvaxNext: surgery
+
     [DataField, AutoNetworkedField]
     public BodyPartSymmetry Symmetry = BodyPartSymmetry.None;
 
+    // start-_CorvaxNext: surgery
+    [DataField]
+    public string ToolName { get; set; } = "A body part";
+
+    [DataField, AutoNetworkedField]
+    public bool? Used { get; set; } = null;
+    // end-_CorvaxNext: surgery
+
     /// <summary>
     /// Child body parts attached to this body part.
     /// </summary>
@@ -43,6 +72,74 @@ public sealed partial class BodyPartComponent : Component
     [DataField, AutoNetworkedField]
     public Dictionary<string, OrganSlot> Organs = new();
 
+    // start-_CorvaxNext: surgery
+    /// <summary>
+    /// What's the max health this body part can have?
+    /// </summary>
+    [DataField]
+    public float MinIntegrity;
+
+    /// <summary>
+    /// Whether this body part is enabled or not.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// How long it takes to run another self heal tick on the body part.
+    /// </summary>
+    [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;
+
+    /// <summary>
+    /// How much health to heal on the body part per tick.
+    /// </summary>
+    [DataField]
+    public float SelfHealingAmount = 5;
+
+    [DataField]
+    public string ContainerName { get; set; } = "part_slot";
+
+    [DataField, AutoNetworkedField]
+    public ItemSlot ItemInsertionSlot = new();
+
+
+    /// <summary>
+    ///     Current species. Dictates things like body part sprites.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string Species { get; set; } = "";
+
+    /// <summary>
+    /// The total damage that has to be dealt to a body part
+    /// to make possible severing it.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    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 },
+    };
+    // end-_CorvaxNext: surgery
+
     /// <summary>
     /// These are only for VV/Debug do not use these for gameplay/systems
     /// </summary>
@@ -56,7 +153,7 @@ private List<ContainerSlot> BodyPartSlotsVV
 
             foreach (var slotId in Children.Keys)
             {
-                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, SharedBodySystem.PartSlotContainerIdPrefix+slotId));
+                temp.Add((ContainerSlot)containerSystem.GetContainer(Owner, SharedBodySystem.PartSlotContainerIdPrefix + slotId));
             }
 
             return temp;
@@ -73,7 +170,7 @@ private List<ContainerSlot> OrganSlotsVV
 
             foreach (var slotId in Organs.Keys)
             {
-                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, SharedBodySystem.OrganSlotContainerIdPrefix+slotId));
+                temp.Add((ContainerSlot)containerSystem.GetContainer(Owner, SharedBodySystem.OrganSlotContainerIdPrefix + slotId));
             }
 
             return temp;
diff --git a/Content.Shared/Body/Part/BodyPartEvents.cs b/Content.Shared/Body/Part/BodyPartEvents.cs
index 0d8d2c8a268..d3aa89e592a 100644
--- a/Content.Shared/Body/Part/BodyPartEvents.cs
+++ b/Content.Shared/Body/Part/BodyPartEvents.cs
@@ -1,7 +1,31 @@
+using Content.Shared.Humanoid;
+
 namespace Content.Shared.Body.Part;
 
 [ByRefEvent]
 public readonly record struct BodyPartAddedEvent(string Slot, Entity<BodyPartComponent> Part);
 
+// start-_CorvaxNext: surgery
+// Kind of a clone of the above for surgical reattachment specifically.
+[ByRefEvent]
+public readonly record struct BodyPartAttachedEvent(Entity<BodyPartComponent> Part);
+// end-_CorvaxNext: surgery
+
 [ByRefEvent]
 public readonly record struct BodyPartRemovedEvent(string Slot, Entity<BodyPartComponent> Part);
+
+// start-_CorvaxNext: surgery
+// Kind of a clone of the above for any instances where we call DropPart(), reasoning being that RemovedEvent fires off
+// a lot more often than what I'd like due to PVS.
+[ByRefEvent]
+public readonly record struct BodyPartDroppedEvent(Entity<BodyPartComponent> Part);
+
+[ByRefEvent]
+public readonly record struct BodyPartEnableChangedEvent(bool Enabled);
+
+[ByRefEvent]
+public readonly record struct BodyPartEnabledEvent(Entity<BodyPartComponent> Part);
+
+[ByRefEvent]
+public readonly record struct BodyPartDisabledEvent(Entity<BodyPartComponent> Part);
+// end-_CorvaxNext: surgery
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index 250f90db8f3..0d44ba93d62 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -1,20 +1,27 @@
 using System.Linq;
 using System.Numerics;
+using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Prototypes;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Damage;
 using Content.Shared.DragDrop;
+using Content.Shared.FixedPoint;
 using Content.Shared.Gibbing.Components;
 using Content.Shared.Gibbing.Events;
 using Content.Shared.Gibbing.Systems;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Events;
 using Content.Shared.Inventory;
+using Content.Shared.Standing;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
-
+using Robust.Shared.Timing;
 namespace Content.Shared.Body.Systems;
 
 public partial class SharedBodySystem
@@ -27,9 +34,10 @@ public partial class SharedBodySystem
      */
 
     [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly ItemSlotsSystem _slots = default!;
     [Dependency] private readonly GibbingSystem _gibbingSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
     private const float GibletLaunchImpulse = 8;
     private const float GibletLaunchImpulseVariance = 3;
 
@@ -42,6 +50,8 @@ private void InitializeBody()
         SubscribeLocalEvent<BodyComponent, ComponentInit>(OnBodyInit);
         SubscribeLocalEvent<BodyComponent, MapInitEvent>(OnBodyMapInit);
         SubscribeLocalEvent<BodyComponent, CanDragEvent>(OnBodyCanDrag);
+        SubscribeLocalEvent<BodyComponent, StandAttemptEvent>(OnStandAttempt); // _CorvaxNext: surgery
+        SubscribeLocalEvent<BodyComponent, ProfileLoadFinishedEvent>(OnProfileLoadFinished); // _CorvaxNext: surgery
     }
 
     private void OnBodyInserted(Entity<BodyComponent> ent, ref EntInsertedIntoContainerMessage args)
@@ -115,11 +125,11 @@ private void MapInitBody(EntityUid bodyEntity, BodyPrototype prototype)
         var rootPartUid = SpawnInContainerOrDrop(protoRoot.Part, bodyEntity, BodyRootContainerId);
         var rootPart = Comp<BodyPartComponent>(rootPartUid);
         rootPart.Body = bodyEntity;
+        rootPart.OriginalBody = bodyEntity;
         Dirty(rootPartUid, rootPart);
-
         // Setup the rest of the body entities.
         SetupOrgans((rootPartUid, rootPart), protoRoot.Organs);
-        MapInitParts(rootPartUid, prototype);
+        MapInitParts(rootPartUid, rootPart, prototype);
     }
 
     private void OnBodyCanDrag(Entity<BodyComponent> ent, ref CanDragEvent args)
@@ -127,10 +137,18 @@ private void OnBodyCanDrag(Entity<BodyComponent> ent, ref CanDragEvent args)
         args.Handled = true;
     }
 
+    // start-_CorvaxNext: surgery
+    private void OnStandAttempt(Entity<BodyComponent> ent, ref StandAttemptEvent args)
+    {
+        if (ent.Comp.LegEntities.Count == 0)
+            args.Cancel();
+    }
+    // end-_CorvaxNext: surgery
+
     /// <summary>
     /// Sets up all of the relevant body parts for a particular body entity and root part.
     /// </summary>
-    private void MapInitParts(EntityUid rootPartId, BodyPrototype prototype)
+    private void MapInitParts(EntityUid rootPartId, BodyPartComponent rootPart, BodyPrototype prototype)
     {
         // Start at the root part and traverse the body graph, setting up parts as we go.
         // Basic BFS pathfind.
@@ -168,6 +186,9 @@ private void MapInitParts(EntityUid rootPartId, BodyPrototype prototype)
 
                 var childPartComponent = Comp<BodyPartComponent>(childPart);
                 var partSlot = CreatePartSlot(parentEntity, connection, childPartComponent.PartType, parentPartComponent);
+                childPartComponent.ParentSlot = partSlot;
+                childPartComponent.OriginalBody = rootPart.Body;
+                Dirty(childPart, childPartComponent);
                 var cont = Containers.GetContainer(parentEntity, GetPartSlotContainerId(connection));
 
                 if (partSlot is null || !Containers.Insert(childPart, cont))
@@ -177,6 +198,22 @@ private void MapInitParts(EntityUid rootPartId, BodyPrototype prototype)
                     continue;
                 }
 
+                // // start-_CorvaxNext: surgery
+                // if (TryComp(parentPartComponent.Body, out HumanoidAppearanceComponent? bodyAppearance))
+                // {
+                //     var appearance = AddComp<BodyPartAppearanceComponent>(childPart);
+                //     appearance.OriginalBody = childPartComponent.OriginalBody;
+                //     appearance.Color = bodyAppearance.SkinColor;
+                //
+                //     var symmetry = ((BodyPartSymmetry) childPartComponent.Symmetry).ToString();
+                //     if (symmetry == "None")
+                //         symmetry = "";
+                //     appearance.ID = "removed" + symmetry + ((BodyPartType) childPartComponent.PartType).ToString();
+                //
+                //     Dirty(childPart, appearance);
+                // }
+                // // end-_CorvaxNext: surgery
+
                 // Add organs
                 SetupOrgans((childPart, childPartComponent), connectionSlot.Organs);
 
@@ -233,11 +270,11 @@ public IEnumerable<BaseContainer> GetBodyContainers(
     {
         if (id is null
             || !Resolve(id.Value, ref body, logMissing: false)
+            || body is null
+            || body.RootContainer == default
             || body.RootContainer.ContainedEntity is null
             || !Resolve(body.RootContainer.ContainedEntity.Value, ref rootPart))
-        {
             yield break;
-        }
 
         foreach (var child in GetBodyPartChildren(body.RootContainer.ContainedEntity.Value, rootPart))
         {
@@ -291,7 +328,9 @@ public virtual HashSet<EntityUid> GibBody(
         Vector2? splatDirection = null,
         float splatModifier = 1,
         Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null)
+        SoundSpecifier? gibSoundOverride = null,
+        GibType gib = GibType.Gib,
+        GibContentsOption contents = GibContentsOption.Drop)
     {
         var gibs = new HashSet<EntityUid>();
 
@@ -308,9 +347,9 @@ public virtual HashSet<EntityUid> GibBody(
         foreach (var part in parts)
         {
 
-            _gibbingSystem.TryGibEntityWithRef(bodyId, part.Id, GibType.Gib, GibContentsOption.Skip, ref gibs,
-                playAudio: false, launchGibs:true, launchDirection:splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
-                launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
+            _gibbingSystem.TryGibEntityWithRef(bodyId, part.Id, gib, contents, ref gibs,
+                playAudio: false, launchGibs: true, launchDirection: splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
+                launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
 
             if (!gibOrgans)
                 continue;
@@ -319,7 +358,7 @@ public virtual HashSet<EntityUid> GibBody(
             {
                 _gibbingSystem.TryGibEntityWithRef(bodyId, organ.Id, GibType.Drop, GibContentsOption.Skip,
                     ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
-                    launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
+                    launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
             }
         }
 
@@ -335,4 +374,65 @@ public virtual HashSet<EntityUid> GibBody(
         _audioSystem.PlayPredicted(gibSoundOverride, bodyTransform.Coordinates, null);
         return gibs;
     }
+
+    // start-_CorvaxNext: surgery
+    public virtual HashSet<EntityUid> GibPart(
+        EntityUid partId,
+        BodyPartComponent? part = null,
+        bool launchGibs = true,
+        Vector2? splatDirection = null,
+        float splatModifier = 1,
+        Angle splatCone = default,
+        SoundSpecifier? gibSoundOverride = null)
+    {
+        var gibs = new HashSet<EntityUid>();
+
+        if (!Resolve(partId, ref part, logMissing: false))
+            return gibs;
+
+        if (part.Body is { } bodyEnt)
+        {
+            if (IsPartRoot(bodyEnt, partId, part: part))
+                return gibs;
+
+            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)))
+            {
+                SharedTransform.AttachToGridOrMap(item);
+                gibs.Add(item);
+            }
+        }
+
+        _audioSystem.PlayPredicted(gibSoundOverride, Transform(partId).Coordinates, null);
+        return gibs;
+    }
+
+    private void OnProfileLoadFinished(EntityUid uid, BodyComponent component, ProfileLoadFinishedEvent args)
+    {
+        if (!HasComp<HumanoidAppearanceComponent>(uid)
+            || TerminatingOrDeleted(uid))
+            return;
+
+        foreach (var part in GetBodyChildren(uid, component))
+        {
+            EnsureComp<BodyPartAppearanceComponent>(part.Id);
+        }
+    }
+    // end-_CorvaxNext: surgery
 }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
index f83dd50c998..14137e7057c 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
+using Content.Shared.Damage;
 using Robust.Shared.Containers;
 
 namespace Content.Shared.Body.Systems;
@@ -20,6 +21,7 @@ private void AddOrgan(
 
         if (organEnt.Comp.Body is not null)
         {
+            organEnt.Comp.OriginalBody = organEnt.Comp.Body; // _CorvaxNext: surgery
             var addedInBodyEv = new OrganAddedToBodyEvent(bodyUid, parentPartUid);
             RaiseLocalEvent(organEnt, ref addedInBodyEv);
         }
@@ -38,6 +40,10 @@ private void RemoveOrgan(Entity<OrganComponent> organEnt, EntityUid parentPartUi
             RaiseLocalEvent(organEnt, ref removedInBodyEv);
         }
 
+        if (TryComp(parentPartUid, out DamageableComponent? damageable) // _CorvaxNext: surgery
+            && damageable.TotalDamage > 200)
+            TrySetOrganUsed(organEnt, true, organEnt.Comp);
+
         organEnt.Comp.Body = null;
         Dirty(organEnt, organEnt.Comp);
     }
@@ -209,4 +215,17 @@ public bool TryGetBodyOrganEntityComps<T>(
         comps = null;
         return false;
     }
+
+    // start-_CorvaxNext: surgery
+    public bool TrySetOrganUsed(EntityUid organId, bool used, OrganComponent? organ = null)
+    {
+        if (!Resolve(organId, ref organ)
+            || organ.Used == used)
+            return false;
+
+        organ.Used = used;
+        Dirty(organId, organ);
+        return true;
+    }
+    // end-_CorvaxNext: surgery
 }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index 0917197e29f..ca05e568767 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -1,28 +1,58 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Humanoid;
+using Content.Shared.Inventory;
 using Content.Shared.Movement.Components;
+using Content.Shared.Random;
+using Content.Shared._CorvaxNext.Targeting;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace Content.Shared.Body.Systems;
 
 public partial class SharedBodySystem
 {
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly RandomHelperSystem _randomHelper = default!;
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
+
     private void InitializeParts()
     {
         // TODO: This doesn't handle comp removal on child ents.
 
         // If you modify this also see the Body partial for root parts.
+        SubscribeLocalEvent<BodyPartComponent, MapInitEvent>(OnMapInit); // _CorvaxNext: surgery
+        SubscribeLocalEvent<BodyPartComponent, ComponentRemove>(OnBodyPartRemove); // _CorvaxNext: surgery
         SubscribeLocalEvent<BodyPartComponent, EntInsertedIntoContainerMessage>(OnBodyPartInserted);
         SubscribeLocalEvent<BodyPartComponent, EntRemovedFromContainerMessage>(OnBodyPartRemoved);
+        SubscribeLocalEvent<BodyPartComponent, AmputateAttemptEvent>(OnAmputateAttempt); // _CorvaxNext: surgery
+        SubscribeLocalEvent<BodyPartComponent, BodyPartEnableChangedEvent>(OnPartEnableChanged); // _CorvaxNext: surgery
     }
 
+    // start-_CorvaxNext: surgery
+    private void OnMapInit(Entity<BodyPartComponent> ent, ref MapInitEvent args)
+    {
+        if (ent.Comp.PartType == BodyPartType.Torso)
+        {
+            _slots.AddItemSlot(ent, ent.Comp.ContainerName, ent.Comp.ItemInsertionSlot);
+            Dirty(ent, ent.Comp);
+        }
+    }
+
+    private void OnBodyPartRemove(Entity<BodyPartComponent> ent, ref ComponentRemove args)
+    {
+        if (ent.Comp.PartType == BodyPartType.Torso)
+            _slots.RemoveItemSlot(ent, ent.Comp.ItemInsertionSlot);
+    }
+    // end-_CorvaxNext: surgery
     private void OnBodyPartInserted(Entity<BodyPartComponent> ent, ref EntInsertedIntoContainerMessage args)
     {
         // Body part inserted into another body part.
@@ -47,12 +77,12 @@ private void OnBodyPartRemoved(Entity<BodyPartComponent> ent, ref EntRemovedFrom
         // Body part removed from another body part.
         var removedUid = args.Entity;
         var slotId = args.Container.ID;
-
         DebugTools.Assert(!TryComp(removedUid, out BodyPartComponent? b) || b.Body == ent.Comp.Body);
         DebugTools.Assert(!TryComp(removedUid, out OrganComponent? o) || o.Body == ent.Comp.Body);
 
         if (TryComp(removedUid, out BodyPartComponent? part) && part.Body is not null)
         {
+            CheckBodyPart((removedUid, part), GetTargetBodyPart(part), true); // _CorvaxNext: surgery
             RemovePart(part.Body.Value, (removedUid, part), slotId);
             RecursiveBodyUpdate((removedUid, part), null);
         }
@@ -93,6 +123,8 @@ private void RecursiveBodyUpdate(Entity<BodyPartComponent> ent, EntityUid? bodyU
             }
         }
 
+        // The code for RemovePartEffect() should live here, because it literally is the point of this recursive function.
+        // But the debug asserts at the top plus existing tests need refactoring for this. So we'll be lazy.
         foreach (var slotId in ent.Comp.Children.Keys)
         {
             if (!Containers.TryGetContainer(ent, GetPartSlotContainerId(slotId), out var container))
@@ -127,15 +159,44 @@ protected virtual void RemovePart(
     {
         Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false);
         Dirty(partEnt, partEnt.Comp);
-        partEnt.Comp.Body = null;
 
+        partEnt.Comp.ParentSlot = null;
+        partEnt.Comp.OriginalBody = partEnt.Comp.Body;
         var ev = new BodyPartRemovedEvent(slotId, partEnt);
         RaiseLocalEvent(bodyEnt, ref ev);
-
         RemoveLeg(partEnt, bodyEnt);
+        RemovePartEffect(partEnt, bodyEnt);
         PartRemoveDamage(bodyEnt, partEnt);
     }
 
+    // start-_CorvaxNext: surgery
+    protected virtual void DropPart(Entity<BodyPartComponent> partEnt)
+    {
+        // 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();
+        if (TryComp(partEnt, out TransformComponent? transform) && _gameTiming.IsFirstTimePredicted)
+        {
+            var enableEvent = new BodyPartEnableChangedEvent(false);
+            RaiseLocalEvent(partEnt, ref enableEvent);
+
+            if (TryComp(body, out HumanoidAppearanceComponent? bodyAppearance)
+                && !HasComp<BodyPartAppearanceComponent>(partEnt)
+                && !TerminatingOrDeleted(body)
+                && !TerminatingOrDeleted(partEnt))
+                EnsureComp<BodyPartAppearanceComponent>(partEnt);
+
+            SharedTransform.AttachToGridOrMap(partEnt, transform);
+            _randomHelper.RandomOffset(partEnt, 0.5f);
+            var droppedEvent = new BodyPartDroppedEvent(partEnt);
+            RaiseLocalEvent(body, ref droppedEvent);
+        }
+
+    }
+
+    private void OnAmputateAttempt(Entity<BodyPartComponent> partEnt, ref AmputateAttemptEvent args) =>
+        DropPart(partEnt);
+    // end-_CorvaxNext: surgery
     private void AddLeg(Entity<BodyPartComponent> legEnt, Entity<BodyComponent?> bodyEnt)
     {
         if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
@@ -159,13 +220,44 @@ private void RemoveLeg(Entity<BodyPartComponent> legEnt, Entity<BodyComponent?>
             bodyEnt.Comp.LegEntities.Remove(legEnt);
             UpdateMovementSpeed(bodyEnt);
             Dirty(bodyEnt, bodyEnt.Comp);
+            Standing.Down(bodyEnt); // _CorvaxNext: surgery
+        }
+    }
+
+    // start-_CorvaxNext: surgery
+    // TODO: Refactor this crap.
+    private void RemovePartEffect(Entity<BodyPartComponent> partEnt, Entity<BodyComponent?> bodyEnt)
+    {
+        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 (!bodyEnt.Comp.LegEntities.Any())
+        if (partEnt.Comp.Children.Any())
+        {
+            foreach (var slotId in partEnt.Comp.Children.Keys)
             {
-                Standing.Down(bodyEnt);
+                if (Containers.TryGetContainer(partEnt, GetPartSlotContainerId(slotId), out var container) &&
+                    container is ContainerSlot slot &&
+                    slot.ContainedEntity is { } childEntity &&
+                    TryComp(childEntity, out BodyPartComponent? childPart))
+                {
+                    var ev = new BodyPartEnableChangedEvent(false);
+                    RaiseLocalEvent(childEntity, ref ev);
+                    DropPart((childEntity, childPart));
+                }
             }
+
+            Dirty(bodyEnt, body);
         }
     }
+    // end-_CorvaxNext: surgery
 
     private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartComponent> partEnt)
     {
@@ -177,11 +269,79 @@ private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartCom
             && !GetBodyChildrenOfType(bodyEnt, partEnt.Comp.PartType, bodyEnt.Comp).Any()
         )
         {
-            // TODO BODY SYSTEM KILL : remove this when wounding and required parts are implemented properly
-            var damage = new DamageSpecifier(Prototypes.Index<DamageTypePrototype>("Bloodloss"), 300);
-            Damageable.TryChangeDamage(bodyEnt, damage);
+            // start-_CorvaxNext: surgery
+            var damage = new DamageSpecifier(Prototypes.Index<DamageTypePrototype>("Bloodloss"), partEnt.Comp.VitalDamage);
+            Damageable.TryChangeDamage(bodyEnt, damage, partMultiplier: 0f);
+            // end-_CorvaxNext: surgery
+        }
+    }
+
+    // start-_CorvaxNext: surgery
+    private void OnPartEnableChanged(Entity<BodyPartComponent> partEnt, ref BodyPartEnableChangedEvent args)
+    {
+        partEnt.Comp.Enabled = args.Enabled;
+        Dirty(partEnt, partEnt.Comp);
+
+        if (args.Enabled)
+            EnablePart(partEnt);
+        else
+            DisablePart(partEnt);
+    }
+    private void EnablePart(Entity<BodyPartComponent> partEnt)
+    {
+        if (!TryComp(partEnt.Comp.Body, out BodyComponent? body))
+            return;
+
+        // I hate having to hardcode these checks so much.
+        if (partEnt.Comp.PartType == BodyPartType.Leg)
+        {
+            AddLeg(partEnt, (partEnt.Comp.Body.Value, body));
+        }
+
+        if (partEnt.Comp.PartType == BodyPartType.Arm)
+        {
+            var hand = GetBodyChildrenOfType(partEnt.Comp.Body.Value, BodyPartType.Hand, symmetry: partEnt.Comp.Symmetry).FirstOrDefault();
+            if (hand != default)
+            {
+                var ev = new BodyPartEnabledEvent(hand);
+                RaiseLocalEvent(partEnt.Comp.Body.Value, ref ev);
+            }
+        }
+
+        if (partEnt.Comp.PartType == BodyPartType.Hand)
+        {
+            var ev = new BodyPartEnabledEvent(partEnt);
+            RaiseLocalEvent(partEnt.Comp.Body.Value, ref ev);
+        }
+    }
+
+    private void DisablePart(Entity<BodyPartComponent> partEnt)
+    {
+        if (!TryComp(partEnt.Comp.Body, out BodyComponent? body))
+            return;
+
+        if (partEnt.Comp.PartType == BodyPartType.Leg)
+        {
+            RemoveLeg(partEnt, (partEnt.Comp.Body.Value, body));
+        }
+
+        if (partEnt.Comp.PartType == BodyPartType.Arm)
+        {
+            var hand = GetBodyChildrenOfType(partEnt.Comp.Body.Value, BodyPartType.Hand, symmetry: partEnt.Comp.Symmetry).FirstOrDefault();
+            if (hand != default)
+            {
+                var ev = new BodyPartDisabledEvent(hand);
+                RaiseLocalEvent(partEnt.Comp.Body.Value, ref ev);
+            }
+        }
+
+        if (partEnt.Comp.PartType == BodyPartType.Hand)
+        {
+            var ev = new BodyPartDisabledEvent(partEnt);
+            RaiseLocalEvent(partEnt.Comp.Body.Value, ref ev);
         }
     }
+    // end-_CorvaxNext: surgery
 
     /// <summary>
     /// Tries to get the parent body part to this if applicable.
@@ -401,6 +561,20 @@ public bool AttachPartToRoot(
             && Containers.Insert(partId, body.RootContainer);
     }
 
+    // start-_CorvaxNext: surgery
+    /// <summary>
+    ///     Returns true if this parentId supports attaching a new part to the specified slot.
+    /// </summary>
+    public bool CanAttachToSlot(
+        EntityUid parentId,
+        string slotId,
+        BodyPartComponent? parentPart = null)
+    {
+        return Resolve(parentId, ref parentPart, logMissing: false)
+               && parentPart.Children.ContainsKey(slotId);
+    }
+    // end-_CorvaxNext: surgery
+
     #endregion
 
     #region Attach/Detach
@@ -438,12 +612,22 @@ public bool AttachPart(
             return false;
         }
 
+
         if (!Containers.TryGetContainer(parentPartId, GetPartSlotContainerId(slot.Id), out var container))
         {
             DebugTools.Assert($"Unable to find body slot {slot.Id} for {ToPrettyString(parentPartId)}");
             return false;
         }
 
+        // start-_CorvaxNext: surgery
+        part.ParentSlot = slot;
+
+        if (TryComp(part.Body, out HumanoidAppearanceComponent? bodyAppearance)
+            && !HasComp<BodyPartAppearanceComponent>(partId)
+            && !TerminatingOrDeleted(parentPartId)
+            && !TerminatingOrDeleted(partId)) // Saw some exceptions involving these due to the spawn menu.
+            EnsureComp<BodyPartAppearanceComponent>(partId);
+        // end-_CorvaxNext: surgery
         return Containers.Insert(partId, container);
     }
 
@@ -656,11 +840,12 @@ public bool BodyHasChild(
     public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyChildrenOfType(
         EntityUid bodyId,
         BodyPartType type,
-        BodyComponent? body = null)
+        BodyComponent? body = null,
+        BodyPartSymmetry? symmetry = null)
     {
         foreach (var part in GetBodyChildren(bodyId, body))
         {
-            if (part.Component.PartType == type)
+            if (part.Component.PartType == type && (symmetry == null || part.Component.Symmetry == symmetry)) // _CorvaxNext: surgery
                 yield return part;
         }
     }
@@ -722,6 +907,50 @@ public bool TryGetBodyPartOrganComponents<T>(
         return false;
     }
 
+    // start-_CorvaxNext: surgery
+    /// <summary>
+    ///     Tries to get a list of ValueTuples of EntityUid and OrganComponent on each organ
+    ///     in the given part.
+    /// </summary>
+    /// <param name="uid">The part entity id to check on.</param>
+    /// <param name="type">The type of component to check for.</param>
+    /// <param name="part">The part to check for organs on.</param>
+    /// <returns>Whether any were found.</returns>
+    /// <remarks>
+    ///     This method is somewhat of a copout to the fact that we can't use reflection to generically
+    ///     get the type of a component on runtime due to sandboxing. So we simply do a HasComp check for each organ.
+    /// </remarks>
+    public bool TryGetBodyPartOrgans(
+        EntityUid uid,
+        Type type,
+        [NotNullWhen(true)] out List<(EntityUid Id, OrganComponent Organ)>? organs,
+        BodyPartComponent? part = null)
+    {
+        if (!Resolve(uid, ref part))
+        {
+            organs = null;
+            return false;
+        }
+
+        var list = new List<(EntityUid Id, OrganComponent Organ)>();
+
+        foreach (var organ in GetPartOrgans(uid, part))
+        {
+            if (HasComp(organ.Id, type))
+                list.Add((organ.Id, organ.Component));
+        }
+
+        if (list.Count != 0)
+        {
+            organs = list;
+            return true;
+        }
+
+        organs = null;
+        return false;
+    }
+    // end-_CorvaxNext: surgery
+
     /// <summary>
     /// Gets the parent body part and all immediate child body parts for the partId.
     /// </summary>
@@ -790,5 +1019,33 @@ public bool TryGetBodyPartAdjacentPartsComponents<T>(
         return false;
     }
 
+    // start-_CorvaxNext: surgery
+    private bool TryGetPartSlotContainerName(BodyPartType partType, out HashSet<string> containerNames)
+    {
+        containerNames = partType switch
+        {
+            BodyPartType.Arm => new() { "gloves" },
+            BodyPartType.Leg => new() { "shoes" },
+            BodyPartType.Head => new() { "eyes", "ears", "head", "mask" },
+            _ => new()
+        };
+        return containerNames.Count > 0;
+    }
+
+    public int GetBodyPartCount(EntityUid bodyId, BodyPartType partType, BodyComponent? body = null)
+    {
+        if (!Resolve(bodyId, ref body, logMissing: false))
+            return 0;
+
+        int count = 0;
+        foreach (var part in GetBodyChildren(bodyId, body))
+        {
+            if (part.Component.PartType == partType)
+                count++;
+        }
+        return count;
+    }
+    // end-_CorvaxNext: surgery
+
     #endregion
 }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.cs b/Content.Shared/Body/Systems/SharedBodySystem.cs
index a45966fcc37..441aeb256cd 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.cs
@@ -28,7 +28,7 @@ public abstract partial class SharedBodySystem : EntitySystem
     /// </summary>
     public const string OrganSlotContainerIdPrefix = "body_organ_slot_";
 
-    [Dependency] private   readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] protected readonly IPrototypeManager Prototypes = default!;
     [Dependency] protected readonly DamageableSystem Damageable = default!;
     [Dependency] protected readonly MovementSpeedModifierSystem Movement = default!;
@@ -42,6 +42,9 @@ public override void Initialize()
 
         InitializeBody();
         InitializeParts();
+        InitializeBkm(); // _CorvaxNext: surgery
+        // To try and mitigate the server load due to integrity checks, we set up a Job Queue.
+        InitializePartAppearances();
     }
 
     /// <summary>
diff --git a/Content.Shared/Corvax/CCCVars/CCCVars.cs b/Content.Shared/Corvax/CCCVars/CCCVars.cs
index 6a9ab3b0840..fdbce0cd984 100644
--- a/Content.Shared/Corvax/CCCVars/CCCVars.cs
+++ b/Content.Shared/Corvax/CCCVars/CCCVars.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.Corvax.CCCVars;
 
diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
index cc3b3f6d5d9..8938c748756 100644
--- a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
@@ -1,6 +1,8 @@
 using Content.Shared.Administration.Logs;
+using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Damage.Components;
 using Content.Shared.Database;
+using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
@@ -58,8 +60,23 @@ private void OnHandInteract(Entity<DamageOnInteractComponent> entity, ref Intera
                 totalDamage = DamageSpecifier.ApplyModifierSet(totalDamage, protectiveEntity.Comp.DamageProtection);
             }
         }
+        // start-_CorvaxNext: surgery
 
-        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage,  origin: args.Target);
+        TargetBodyPart? targetPart = null;
+        var hands = CompOrNull<HandsComponent>(args.User);
+        if (hands is { ActiveHand: not null })
+        {
+            targetPart = hands.ActiveHand.Location switch
+            {
+                HandLocation.Left => TargetBodyPart.LeftArm,
+                HandLocation.Right => TargetBodyPart.RightArm,
+                _ => null
+            };
+        }
+
+        // end-_CorvaxNext: surgery
+
+        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage,  origin: args.Target, targetPart: targetPart);
 
         if (totalDamage != null && totalDamage.AnyPositive())
         {
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index 3c3e1b736df..b65eabaa660 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -5,11 +5,14 @@
 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._CorvaxNext.Targeting;
 using Robust.Shared.GameStates;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Damage
@@ -21,6 +24,8 @@ public sealed class DamageableSystem : EntitySystem
         [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;
@@ -97,7 +102,8 @@ 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 interruptsDoAfters = true, EntityUid? origin = null, bool? canSever = null)
+
         {
             component.Damage.GetDamagePerGroup(_prototypeManager, component.DamagePerGroup);
             component.TotalDamage = component.Damage.GetTotal();
@@ -108,7 +114,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));
+            RaiseLocalEvent(uid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters, origin, canSever ?? true));
         }
 
         /// <summary>
@@ -124,7 +130,8 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
         ///     null if the user had no applicable components that can take damage.
         /// </returns>
         public DamageSpecifier? TryChangeDamage(EntityUid? uid, DamageSpecifier damage, bool ignoreResistances = false,
-            bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null)
+            bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null,
+            bool? canSever = true, bool? canEvade = false, float? partMultiplier = 1.00f, TargetBodyPart? targetPart = null)
         {
             if (!uid.HasValue || !_damageableQuery.Resolve(uid.Value, ref damageable, false))
             {
@@ -137,10 +144,10 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
                 return damage;
             }
 
-            var before = new BeforeDamageChangedEvent(damage, origin);
+            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
@@ -151,10 +158,10 @@ 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);
+                var ev = new DamageModifyEvent(damage, origin, targetPart);
                 RaiseLocalEvent(uid.Value, ev);
                 damage = ev.Damage;
 
@@ -186,7 +193,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
             }
 
             if (delta.DamageDict.Count > 0)
-                DamageChanged(uid.Value, damageable, delta, interruptsDoAfters, origin);
+                DamageChanged(uid.Value, damageable, delta, interruptsDoAfters, origin, canSever);
 
             return delta;
         }
@@ -256,6 +263,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);
+            // start-_CorvaxNext: surgery Shitmed Start
+            if (HasComp<TargetingComponent>(uid))
+                foreach (var part in _body.GetBodyChildren(uid))
+                    RaiseLocalEvent(part.Id, new RejuvenateEvent());
+            // start-_CorvaxNext: surgery Shitmed End
             _mobThreshold.SetAllowRevives(uid, false, thresholds);
         }
 
@@ -286,7 +298,15 @@ private void DamageableHandleState(EntityUid uid, DamageableComponent component,
     ///     Raised before damage is done, so stuff can cancel it if necessary.
     /// </summary>
     [ByRefEvent]
-    public record struct BeforeDamageChangedEvent(DamageSpecifier Damage, EntityUid? Origin = null, bool Cancelled = false);
+    public record struct BeforeDamageChangedEvent(
+        DamageSpecifier Damage,
+        EntityUid? Origin = null,
+        TargetBodyPart? TargetPart = null,
+        bool CanSever = true,
+        bool CanEvade = false,
+        float PartMultiplier = 1.00f,
+        bool Evaded = false,
+        bool Cancelled = false);
 
     /// <summary>
     ///     Raised on an entity when damage is about to be dealt,
@@ -299,16 +319,17 @@ 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;
+        public readonly TargetBodyPart? TargetPart;
 
-        public DamageModifyEvent(DamageSpecifier damage, EntityUid? origin = null)
+        public DamageModifyEvent(DamageSpecifier damage, EntityUid? origin = null, TargetBodyPart? targetPart = null)
         {
             OriginalDamage = damage;
             Damage = damage;
             Origin = origin;
+            TargetPart = targetPart;
         }
     }
 
@@ -347,11 +368,17 @@ public sealed class DamageChangedEvent : EntityEventArgs
         /// </summary>
         public readonly EntityUid? Origin;
 
-        public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damageDelta, bool interruptsDoAfters, EntityUid? origin)
+        /// <summary>
+        ///     Can this damage event sever parts?
+        /// </summary>
+        public readonly bool CanSever;
+
+        public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damageDelta, bool interruptsDoAfters, EntityUid? origin, bool canSever = true)
         {
             Damageable = damageable;
             DamageDelta = damageDelta;
             Origin = origin;
+            CanSever = canSever;
 
             if (DamageDelta == null)
                 return;
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index b3cb51ae359..3147606a71d 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -30,6 +30,7 @@ public sealed partial class HandsComponent : Component
     /// <summary>
     ///     List of hand-names. These are keys for <see cref="Hands"/>. The order of this list determines the order in which hands are iterated over.
     /// </summary>
+    [ViewVariables]
     public List<string> SortedHands = new();
 
     /// <summary>
diff --git a/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs b/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs
new file mode 100644
index 00000000000..ccccf2f1113
--- /dev/null
+++ b/Content.Shared/Humanoid/Events/ProfileLoadFinishedEvent.cs
@@ -0,0 +1,8 @@
+namespace Content.Shared.Humanoid.Events;
+
+// start-_CorvaxNext: surgery
+/// <summary>
+///     Raised on an entity when their profile has finished being loaded
+/// </summary>
+public sealed class ProfileLoadFinishedEvent : EntityEventArgs { }
+// end-_CorvaxNext: surgery
diff --git a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
index 0f8b940bd66..5417bad82be 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: // _CorvaxNext: surgery
+                    yield return HumanoidVisualLayers.LHand;
+                    break;
                 case HumanoidVisualLayers.RArm:
                     yield return HumanoidVisualLayers.RArm;
                     yield return HumanoidVisualLayers.RHand;
                     break;
+                case HumanoidVisualLayers.RHand: // _CorvaxNext: surgery
+                    yield return HumanoidVisualLayers.RHand;
+                    break;
                 case HumanoidVisualLayers.LLeg:
                     yield return HumanoidVisualLayers.LLeg;
                     yield return HumanoidVisualLayers.LFoot;
                     break;
+                case HumanoidVisualLayers.LFoot: // _CorvaxNext: surgery
+                    yield return HumanoidVisualLayers.LFoot;
+                    break;
                 case HumanoidVisualLayers.RLeg:
                     yield return HumanoidVisualLayers.RLeg;
                     yield return HumanoidVisualLayers.RFoot;
                     break;
+                case HumanoidVisualLayers.RFoot: // _CorvaxNext: surgery
+                    yield return HumanoidVisualLayers.RFoot;
+                    break;
                 case HumanoidVisualLayers.Chest:
                     yield return HumanoidVisualLayers.Chest;
                     yield return HumanoidVisualLayers.Tail;
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 4f011cba982..3df780c177b 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Linq;
+using System.Numerics;
 using Content.Corvax.Interfaces.Shared;
 using Content.Shared.CCVar;
 using Content.Shared.Decals;
@@ -7,6 +8,7 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Corvax.TTS;
+using Content.Shared.Humanoid.Events;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Preferences;
 using Robust.Shared;
@@ -401,7 +403,7 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profile
         }
 
         humanoid.Age = profile.Age;
-
+        
         Dirty(uid, humanoid);
     }
 
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index b34fdab30f2..bd98f514470 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -60,6 +60,12 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ZoomOut = "ZoomOut";
         public static readonly BoundKeyFunction ZoomIn = "ZoomIn";
         public static readonly BoundKeyFunction ResetZoom = "ResetZoom";
+        public static readonly BoundKeyFunction TargetHead = "TargetHead"; // _CorvaxNext: surgery
+        public static readonly BoundKeyFunction TargetTorso = "TargetTorso"; // _CorvaxNext: surgery
+        public static readonly BoundKeyFunction TargetLeftArm = "TargetLeftArm"; // _CorvaxNext: surgery
+        public static readonly BoundKeyFunction TargetRightArm = "TargetRightArm"; // _CorvaxNext: surgery
+        public static readonly BoundKeyFunction TargetLeftLeg = "TargetLeftLeg"; // _CorvaxNext: surgery
+        public static readonly BoundKeyFunction TargetRightLeg = "TargetRightLeg"; // _CorvaxNext: surgery
 
         public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp";
         public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown";
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index 629cf1169c4..db761ad693b 100644
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -15,6 +15,7 @@ public sealed partial class InventoryComponent : Component
     [DataField("speciesId")] public string? SpeciesId { get; set; }
 
     public SlotDefinition[] Slots = Array.Empty<SlotDefinition>();
+
     public ContainerSlot[] Containers = Array.Empty<ContainerSlot>();
 
     [DataField]
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 2522dd5d0a3..86d175cefb5 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -1,17 +1,19 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Storage;
+using Content.Shared.Random;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Inventory;
-
 public partial class InventorySystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IViewVariablesManager _vvm = default!;
-
+    [Dependency] private readonly RandomHelperSystem _randomHelper = default!; // _CorvaxNext: surgery
+    [Dependency] private readonly ISerializationManager _serializationManager = default!; // _CorvaxNext: surgery
     private void InitializeSlots()
     {
         SubscribeLocalEvent<InventoryComponent, ComponentInit>(OnInit);
@@ -57,7 +59,8 @@ protected virtual void OnInit(EntityUid uid, InventoryComponent component, Compo
         if (!_prototypeManager.TryIndex(component.TemplateId, out InventoryTemplatePrototype? invTemplate))
             return;
 
-        component.Slots = invTemplate.Slots;
+        _serializationManager.CopyTo(invTemplate.Slots, ref component.Slots, notNullableOverride: true);  // _CorvaxNext: surgery
+
         component.Containers = new ContainerSlot[component.Slots.Length];
         for (var i = 0; i < component.Containers.Length; i++)
         {
@@ -115,7 +118,7 @@ public bool TryGetSlot(EntityUid uid, string slot, [NotNullWhen(true)] out SlotD
 
         foreach (var slotDef in inventory.Slots)
         {
-            if (!slotDef.Name.Equals(slot))
+            if (!slotDef.Name.Equals(slot) || slotDef.Disabled) // _CorvaxNext: surgery
                 continue;
             slotDefinition = slotDef;
             return true;
@@ -170,6 +173,37 @@ private IEnumerable<string> ListViewVariablesSlots(EntityUid uid, InventoryCompo
         }
     }
 
+    // start-_CorvaxNext: surgery
+    public void SetSlotStatus(EntityUid uid, string slotName, bool isDisabled, InventoryComponent? inventory = null)
+    {
+        if (!Resolve(uid, ref inventory))
+            return;
+
+        foreach (var slot in inventory.Slots)
+        {
+            if (slot.Name != slotName)
+                continue;
+
+
+            if (!TryGetSlotContainer(uid, slotName, out var container, out _, inventory))
+                break;
+
+            if (isDisabled)
+            {
+                if (container.ContainedEntity is { } entityUid && TryComp(entityUid, out TransformComponent? transform) && _gameTiming.IsFirstTimePredicted)
+                {
+                    _transform.AttachToGridOrMap(entityUid, transform);
+                    _randomHelper.RandomOffset(entityUid, 0.5f);
+                }
+            }
+            slot.Disabled = isDisabled;
+            break;
+        }
+
+        Dirty(uid, inventory);
+    }
+    // end-_CorvaxNext: surgery
+
     /// <summary>
     /// Enumerator for iterating over an inventory's slot containers. Also has methods that skip empty containers.
     /// It should be safe to add or remove items while enumerating.
@@ -203,7 +237,7 @@ public bool MoveNext([NotNullWhen(true)] out ContainerSlot? container)
                 var i = _nextIdx++;
                 var slot = _slots[i];
 
-                if ((slot.SlotFlags & _flags) == 0)
+                if ((slot.SlotFlags & _flags) == 0 || slot.Disabled) // _CorvaxNext: surgery
                     continue;
 
                 container = _containers[i];
@@ -221,7 +255,7 @@ public bool NextItem(out EntityUid item)
                 var i = _nextIdx++;
                 var slot = _slots[i];
 
-                if ((slot.SlotFlags & _flags) == 0)
+                if ((slot.SlotFlags & _flags) == 0 || slot.Disabled) // _CorvaxNext: surgery
                     continue;
 
                 var container = _containers[i];
diff --git a/Content.Shared/Inventory/InventoryTemplatePrototype.cs b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
index a4d77767e37..428b5fd505f 100644
--- a/Content.Shared/Inventory/InventoryTemplatePrototype.cs
+++ b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
@@ -55,4 +55,11 @@ public sealed partial class SlotDefinition
     ///     Entity blacklist for CanEquip checks.
     /// </summary>
     [DataField("blacklist")] public EntityWhitelist? Blacklist = null;
+
+    // start-_CorvaxNext: surgery
+    /// <summary>
+    ///     Is this slot disabled? Could be due to severing or other reasons.
+    /// </summary>
+    [DataField] public bool Disabled;
+    // end-_CorvaxNext: surgery
 }
diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
index 08af1a36a7b..1bb203c434e 100644
--- a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
+++ b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
@@ -1,3 +1,5 @@
+using Content.Shared._CorvaxNext.Targeting;
+using Content.Shared.Body.Components;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.MedicalScanner;
@@ -14,8 +16,10 @@ public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
     public bool? ScanMode;
     public bool? Bleeding;
     public bool? Unrevivable;
+    public Dictionary<TargetBodyPart, TargetIntegrity>? Body; // _CorvaxNext: surgery
+    public NetEntity? Part; // _CorvaxNext: surgery
 
-    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable)
+    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable, Dictionary<TargetBodyPart, TargetIntegrity>? body, NetEntity? part = null)
     {
         TargetEntity = targetEntity;
         Temperature = temperature;
@@ -23,6 +27,17 @@ public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperatu
         ScanMode = scanMode;
         Bleeding = bleeding;
         Unrevivable = unrevivable;
+        Body = body; // _CorvaxNext: surgery
+        Part = part; // _CorvaxNext: surgery
     }
 }
 
+// start-_CorvaxNext: surgery
+[Serializable, NetSerializable]
+public sealed class HealthAnalyzerPartMessage(NetEntity? owner, TargetBodyPart? bodyPart) : BoundUserInterfaceMessage
+{
+    public readonly NetEntity? Owner = owner;
+    public readonly TargetBodyPart? BodyPart = bodyPart;
+
+}
+// end-_CorvaxNext: surgery
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
index 5928b3871ff..7cf68883f0c 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._CorvaxNext.Surgery.Body;
+using Content.Shared.Database;
 using Content.Shared.Mobs.Components;
 
 namespace Content.Shared.Mobs.Systems;
@@ -103,6 +104,11 @@ private void ChangeState(EntityUid target, MobStateComponent component, MobState
         if (oldState == newState || !component.AllowedStates.Contains(newState))
             return;
 
+        // start-_CorvaxNext: surgery
+        if (oldState == MobState.Dead && HasComp<DebrainedComponent>(target))
+            return;
+        // end-_CorvaxNext: surgery
+
         OnExitState(target, component, oldState);
         component.CurrentState = newState;
         OnEnterState(target, component, newState);
diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
index 95abea63db0..bb83bd3caee 100644
--- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
@@ -44,7 +44,7 @@ public override void Update(float frameTime)
                     continue;
                 }
 
-                foreach (var state in status.ActiveEffects)
+                foreach (var state in status.ActiveEffects.ToArray())
                 {
                     if (curTime > state.Value.Cooldown.Item2)
                         TryRemoveStatusEffect(uid, state.Key, status);
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index 212c03475cf..c7d1a129f48 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -72,7 +72,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public bool ResistanceBypass = false;
-    
+
     /// <summary>
     /// Base damage for this weapon. Can be modified via heavy damage or other means.
     /// </summary>
@@ -90,6 +90,14 @@ public sealed partial class MeleeWeaponComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField]
     public FixedPoint2 ClickDamageModifier = FixedPoint2.New(1);
 
+    // start-_CorvaxNext: surgery
+    /// <summary>
+    ///     Part damage is multiplied by this amount for single-target attacks
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float ClickPartDamageMultiplier = 1.00f;
+    // end-_CorvaxNext: surgery
+
     // TODO: Temporarily 1.5 until interactionoutline is adjusted to use melee, then probably drop to 1.2
     /// <summary>
     /// Nearest edge range to hit an entity.
@@ -97,6 +105,26 @@ public sealed partial class MeleeWeaponComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public float Range = 1.5f;
 
+    // start-_CorvaxNext: surgery
+    /// <summary>
+    ///     Attack range for heavy swings
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float HeavyRangeModifier = 1f;
+
+    /// <summary>
+    ///     Weapon damage is multiplied by this amount for heavy swings
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float HeavyDamageBaseModifier = 1.2f;
+
+    /// <summary>
+    ///     Part damage is multiplied by this amount for heavy swings
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float HeavyPartDamageMultiplier = 0.5f;
+    // end-_CorvaxNext: surgery
+
     /// <summary>
     /// Total width of the angle for wide attacks.
     /// </summary>
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 767b5c4ef62..fd6c5215c60 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -511,7 +511,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         RaiseLocalEvent(target.Value, attackedEvent);
 
         var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
-        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user, ignoreResistances:resistanceBypass);
+        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin: user, ignoreResistances:resistanceBypass, partMultiplier: component.ClickPartDamageMultiplier);
 
         if (damageResult is {Empty: false})
         {
@@ -666,7 +666,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
             RaiseLocalEvent(entity, attackedEvent);
             var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
 
-            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin:user);
+            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, partMultiplier: component.HeavyPartDamageMultiplier);
 
             if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero)
             {
diff --git a/Content.Shared/_CorvaxNext/NextVars.cs b/Content.Shared/_CorvaxNext/NextVars.cs
index 5d232025ae7..9b3323e71e7 100644
--- a/Content.Shared/_CorvaxNext/NextVars.cs
+++ b/Content.Shared/_CorvaxNext/NextVars.cs
@@ -14,4 +14,14 @@ public sealed class NextVars
     /// </summary>
     public static readonly CVarDef<bool> OfferModeIndicatorsPointShow =
         CVarDef.Create("hud.offer_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    /// <summary>
+    /// _CorvaxNext Surgery cvars
+    /// </summary>
+    #region Surgery
+
+    public static readonly CVarDef<bool> CanOperateOnSelf =
+        CVarDef.Create("surgery.can_operate_on_self", false, CVar.SERVERONLY);
+
+    #endregion
 }
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/AmputateAttemptEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/AmputateAttemptEvent.cs
new file mode 100644
index 00000000000..b71a0407bf2
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Body/AmputateAttemptEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Body.Events;
+
+/// <summary>
+/// Raised on an entity when attempting to remove a body part.
+/// </summary>
+[ByRefEvent]
+public readonly record struct AmputateAttemptEvent(EntityUid Part);
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/BodyPartAppearanceComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/BodyPartAppearanceComponent.cs
new file mode 100644
index 00000000000..31165801f38
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Body/BodyPartAppearanceComponent.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Humanoid.Markings;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Body.Part;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+public sealed partial class BodyPartAppearanceComponent : Component
+{
+    /// <summary>
+    ///     HumanoidVisualLayer type for this body part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HumanoidVisualLayers Type { get; set; }
+
+    /// <summary>
+    ///     Relevant markings for this body part that will be applied on attachment.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Dictionary<HumanoidVisualLayers, List<Marking>> Markings = new();
+
+    /// <summary>
+    ///     ID of this custom base layer. Must be a <see cref="HumanoidSpeciesSpriteLayer"/>.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<HumanoidSpeciesSpriteLayer>)), AutoNetworkedField]
+    public string? ID { get; set; }
+
+    /// <summary>
+    ///     Color of this custom base layer. Null implies skin colour if the corresponding <see cref="HumanoidSpeciesSpriteLayer"/> is set to match skin.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color? Color { get; set; }
+
+    /// <summary>
+    ///     Color of this custom base eye layer. Null implies eye colour if the corresponding <see cref="HumanoidSpeciesSpriteLayer"/> is set to match skin.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color? EyeColor { get; set; }
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? OriginalBody { get; set; }
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/DebrainedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/DebrainedComponent.cs
new file mode 100644
index 00000000000..dae95a87243
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Body/DebrainedComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Body;
+
+[RegisterComponent]
+public sealed partial class DebrainedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EarsComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EarsComponent.cs
new file mode 100644
index 00000000000..006d4243951
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EarsComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
+
+[RegisterComponent]
+public sealed partial class EarsComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EyesComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EyesComponent.cs
new file mode 100644
index 00000000000..f96cba4d616
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/EyesComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
+
+[RegisterComponent]
+public sealed partial class EyesComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/HeartComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/HeartComponent.cs
new file mode 100644
index 00000000000..55ea025d1dd
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/HeartComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
+
+[RegisterComponent]
+public sealed partial class HeartComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/LiverComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/LiverComponent.cs
new file mode 100644
index 00000000000..4001ece74b1
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/LiverComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Body.Organs;
+
+[RegisterComponent]
+public sealed partial class LiverComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/Organs/MarkingContainerComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Body/Organs/MarkingContainerComponent.cs
new file mode 100644
index 00000000000..a07de8614fb
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/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._CorvaxNext.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/_CorvaxNext/Surgery/Body/SharedBodySystem.PartAppearance.cs b/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.PartAppearance.cs
new file mode 100644
index 00000000000..9ec90434327
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.PartAppearance.cs
@@ -0,0 +1,194 @@
+using System.Diagnostics;
+using System.Linq;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Content.Shared.Humanoid.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+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();
+
+        SubscribeLocalEvent<BodyPartAppearanceComponent, ComponentStartup>(OnPartAppearanceStartup);
+        SubscribeLocalEvent<BodyPartAppearanceComponent, AfterAutoHandleStateEvent>(HandleState);
+        SubscribeLocalEvent<BodyComponent, BodyPartAttachedEvent>(OnPartAttachedToBody);
+        SubscribeLocalEvent<BodyComponent, BodyPartDroppedEvent>(OnPartDroppedFromBody);
+    }
+
+    private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent component, ComponentStartup args)
+    {
+        if (!TryComp(uid, out BodyPartComponent? part)
+            || part.ToHumanoidLayers() is not { } relevantLayer)
+            return;
+
+        if (part.OriginalBody == null
+            || TerminatingOrDeleted(part.OriginalBody.Value)
+            || !TryComp(part.OriginalBody.Value, out HumanoidAppearanceComponent? bodyAppearance))
+        {
+            //component.ID = part.BaseLayerId;
+            component.Type = relevantLayer;
+            return;
+        }
+
+        var customLayers = bodyAppearance.CustomBaseLayers;
+        var spriteLayers = bodyAppearance.BaseLayers;
+        component.Type = relevantLayer;
+        component.OriginalBody = part.OriginalBody.Value;
+
+        part.Species = bodyAppearance.Species;
+
+        if (customLayers.ContainsKey(component.Type))
+        {
+            component.ID = customLayers[component.Type].Id;
+            component.Color = customLayers[component.Type].Color;
+        }
+        else if (spriteLayers.ContainsKey(component.Type))
+        {
+            component.ID = spriteLayers[component.Type].ID;
+            component.Color = bodyAppearance.SkinColor;
+        }
+        else
+        {
+            component.ID = CreateIdFromPart(bodyAppearance, relevantLayer);
+            component.Color = bodyAppearance.SkinColor;
+        }
+
+        // I HATE HARDCODED CHECKS I HATE HARDCODED CHECKS I HATE HARDCODED CHECKS
+        if (part.PartType == BodyPartType.Head)
+            component.EyeColor = bodyAppearance.EyeColor;
+
+        var markingsByLayer = new Dictionary<HumanoidVisualLayers, List<Marking>>();
+
+        foreach (var layer in HumanoidVisualLayersExtension.Sublayers(relevantLayer))
+        {
+            var category = MarkingCategoriesConversion.FromHumanoidVisualLayers(layer);
+            if (bodyAppearance.MarkingSet.Markings.TryGetValue(category, out var markingList))
+                markingsByLayer[layer] =
+                    markingList.Select(m => new Marking(m.MarkingId, m.MarkingColors.ToList())).ToList();
+        }
+
+        component.Markings = markingsByLayer;
+    }
+
+    private string? CreateIdFromPart(HumanoidAppearanceComponent bodyAppearance, HumanoidVisualLayers part)
+    {
+        var speciesProto = _prototypeManager.Index(bodyAppearance.Species);
+        var baseSprites = _prototypeManager.Index<HumanoidSpeciesBaseSpritesPrototype>(speciesProto.SpriteSet);
+
+        if (!baseSprites.Sprites.ContainsKey(part))
+            return null;
+
+        return HumanoidVisualLayersExtension.GetSexMorph(part, bodyAppearance.Sex, baseSprites.Sprites[part]);
+    }
+
+    public void ModifyMarkings(EntityUid uid,
+        Entity<BodyPartAppearanceComponent?> partAppearance,
+        HumanoidAppearanceComponent bodyAppearance,
+        HumanoidVisualLayers targetLayer,
+        string markingId,
+        bool remove = false)
+    {
+
+        if (!Resolve(partAppearance, ref partAppearance.Comp))
+            return;
+
+        if (!remove)
+        {
+
+            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) =>
+        ApplyPartMarkings(uid, component);
+
+    private void OnPartAttachedToBody(EntityUid uid, BodyComponent component, ref BodyPartAttachedEvent args)
+    {
+        if (!TryComp(args.Part, out BodyPartAppearanceComponent? partAppearance)
+            || !TryComp(uid, out HumanoidAppearanceComponent? bodyAppearance))
+            return;
+
+        if (partAppearance.ID != null)
+            _humanoid.SetBaseLayerId(uid, partAppearance.Type, partAppearance.ID, sync: true, bodyAppearance);
+
+        UpdateAppearance(uid, partAppearance);
+    }
+
+    private void OnPartDroppedFromBody(EntityUid uid, BodyComponent component, ref BodyPartDroppedEvent args)
+    {
+        if (TerminatingOrDeleted(uid)
+            || !TryComp(args.Part, out BodyPartAppearanceComponent? appearance))
+            return;
+
+        RemoveAppearance(uid, appearance, args.Part);
+    }
+
+    protected void UpdateAppearance(EntityUid target,
+        BodyPartAppearanceComponent component)
+    {
+        if (!TryComp(target, out HumanoidAppearanceComponent? bodyAppearance))
+            return;
+
+        if (component.EyeColor != null)
+            bodyAppearance.EyeColor = component.EyeColor.Value;
+
+        if (component.Color != null)
+            _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);
+    }
+
+    protected void RemoveAppearance(EntityUid entity, BodyPartAppearanceComponent component, EntityUid partEntity)
+    {
+        if (!TryComp(entity, out HumanoidAppearanceComponent? bodyAppearance))
+            return;
+
+        foreach (var (visualLayer, markingList) in component.Markings)
+        {
+            _humanoid.SetLayerVisibility(entity, visualLayer, false, true, bodyAppearance);
+        }
+        RemoveBodyMarkings(entity, component, bodyAppearance);
+    }
+
+    protected abstract void ApplyPartMarkings(EntityUid target, BodyPartAppearanceComponent component);
+
+    protected abstract void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceComponent partAppearance, HumanoidAppearanceComponent bodyAppearance);
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.Targeting.cs b/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.Targeting.cs
new file mode 100644
index 00000000000..503b77910e3
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.Targeting.cs
@@ -0,0 +1,500 @@
+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._CorvaxNext.Targeting;
+using Robust.Shared.CPUJob.JobQueues;
+using Robust.Shared.CPUJob.JobQueues.Queues;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using System.Threading;
+using System.Threading.Tasks;
+using Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+
+// ReSharper disable once CheckNamespace
+namespace Content.Shared.Body.Systems;
+
+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 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;
+        private readonly Entity<BodyPartComponent> _ent;
+        public IntegrityJob(SharedBodySystem self, Entity<BodyPartComponent> ent, double maxTime, CancellationToken cancellation = default) : base(maxTime, cancellation)
+        {
+            _self = self;
+            _ent = ent;
+        }
+
+        public IntegrityJob(SharedBodySystem self, Entity<BodyPartComponent> ent, double maxTime, IStopwatch stopwatch, CancellationToken cancellation = default) : base(maxTime, stopwatch, cancellation)
+        {
+            _self = self;
+            _ent = ent;
+        }
+
+        protected override Task<object?> Process()
+        {
+            _self.ProcessIntegrityTick(_ent);
+
+            return Task.FromResult<object?>(null);
+        }
+    }
+
+    private EntityQuery<TargetingComponent> _queryTargeting;
+    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)
+    {
+        var damage = new DamageSpecifier()
+        {
+            DamageDict = new Dictionary<string, FixedPoint2>()
+            {
+                { "Blunt", -part.SelfHealingAmount },
+                { "Slash", -part.SelfHealingAmount },
+                { "Piercing", -part.SelfHealingAmount },
+                { "Heat", -part.SelfHealingAmount },
+                { "Cold", -part.SelfHealingAmount },
+                { "Shock", -part.SelfHealingAmount },
+                { "Caustic", -part.SelfHealingAmount * 0.1}, // not much caustic healing
+            }
+        };
+
+        return damage;
+    }
+
+    private void ProcessIntegrityTick(Entity<BodyPartComponent> entity)
+    {
+        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))
+            _damageable.TryChangeDamage(entity, GetHealingSpecifier(entity), canSever: false, targetPart: GetTargetBodyPart(entity));
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        _integrityJobQueue.Process();
+
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        using var query = EntityQueryEnumerator<BodyPartComponent>();
+        while (query.MoveNext(out var ent, out var part))
+        {
+            part.HealingTimer += frameTime;
+
+            if (part.HealingTimer >= part.HealingTime)
+            {
+                part.HealingTimer = 0;
+                _integrityJobQueue.EnqueueJob(new IntegrityJob(this, (ent, part), IntegrityJobTime));
+            }
+        }
+    }
+
+    private void OnBeforeDamageChanged(Entity<BodyComponent> ent, ref BeforeDamageChangedEvent args)
+    {
+        // 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 (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)
+        {
+            var (targetType, _) = ConvertTargetBodyPart(args.TargetPart.Value);
+            args.Damage = args.Damage * GetPartDamageModifier(targetType);
+        }
+    }
+
+    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,
+        bool canEvade,
+        float partMultiplier,
+        TargetBodyPart targetParts)
+    {
+        var landed = false;
+        var targets = SharedTargetingSystem.GetValidParts();
+        foreach (var target in targets)
+        {
+            if (!targetParts.HasFlag(target))
+                continue;
+
+            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;
+    }
+
+    private void OnDamageChanged(Entity<BodyPartComponent> partEnt, ref DamageChangedEvent args)
+    {
+        if (!TryComp<DamageableComponent>(partEnt, out var damageable))
+            return;
+
+        var severed = false;
+        var partIdSlot = GetParentPartAndSlotOrNull(partEnt)?.Slot;
+        var delta = args.DamageDelta;
+
+        if (args.CanSever
+            && partIdSlot is not null
+            && delta != null
+            && !HasComp<BodyPartReattachedComponent>(partEnt)
+            && !partEnt.Comp.Enabled
+            && damageable.TotalDamage >= partEnt.Comp.SeverIntegrity
+            && _severingDamageTypes.Any(damageType => delta.DamageDict.TryGetValue(damageType, out var value) && value > 0))
+            severed = true;
+
+        CheckBodyPart(partEnt, GetTargetBodyPart(partEnt), severed, damageable);
+
+        if (severed)
+            DropPart(partEnt);
+
+        Dirty(partEnt, partEnt.Comp);
+    }
+
+    /// <summary>
+    /// 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>
+    private static TargetBodyPart GetRandomPartSpread(IRobustRandom random, ushort torsoWeight = 9)
+    {
+        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,
+        };
+    }
+
+    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
+    }
+
+    /// This should be called after body part damage was changed.
+    /// </summary>
+    protected void CheckBodyPart(
+        Entity<BodyPartComponent> partEnt,
+        TargetBodyPart? targetPart,
+        bool severed,
+        DamageableComponent? damageable = null)
+    {
+        if (!Resolve(partEnt, ref damageable))
+            return;
+
+        var integrity = damageable.TotalDamage;
+
+        // KILL the body part
+        if (partEnt.Comp.Enabled && integrity >= partEnt.Comp.IntegrityThresholds[TargetIntegrity.CriticallyWounded])
+        {
+            var ev = new BodyPartEnableChangedEvent(false);
+            RaiseLocalEvent(partEnt, ref ev);
+        }
+
+        // LIVE the body part
+        if (!partEnt.Comp.Enabled && integrity <= partEnt.Comp.IntegrityThresholds[partEnt.Comp.EnableIntegrity] && !severed)
+        {
+            var ev = new BodyPartEnableChangedEvent(true);
+            RaiseLocalEvent(partEnt, ref ev);
+        }
+
+        if (_queryTargeting.TryComp(partEnt.Comp.Body, out var targeting)
+            && HasComp<MobStateComponent>(partEnt.Comp.Body))
+        {
+            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 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);
+        }
+    }
+
+    /// <summary>
+    /// Gets the integrity of all body parts in the entity.
+    /// </summary>
+    public Dictionary<TargetBodyPart, TargetIntegrity> GetBodyPartStatus(EntityUid entityUid)
+    {
+        var result = new Dictionary<TargetBodyPart, TargetIntegrity>();
+
+        if (!TryComp<BodyComponent>(entityUid, out var body))
+            return result;
+
+        foreach (var part in SharedTargetingSystem.GetValidParts())
+        {
+            result[part] = TargetIntegrity.Severed;
+        }
+
+        foreach (var partComponent in GetBodyChildren(entityUid, body))
+        {
+            var targetBodyPart = GetTargetBodyPart(partComponent.Component.PartType, partComponent.Component.Symmetry);
+
+            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;
+    }
+
+    public TargetBodyPart? GetTargetBodyPart(Entity<BodyPartComponent> part) => GetTargetBodyPart(part.Comp.PartType, part.Comp.Symmetry);
+    public TargetBodyPart? GetTargetBodyPart(BodyPartComponent part) => GetTargetBodyPart(part.PartType, part.Symmetry);
+    /// <summary>
+    /// Converts Enums from BodyPartType to their Targeting system equivalent.
+    /// </summary>
+    public TargetBodyPart? GetTargetBodyPart(BodyPartType type, BodyPartSymmetry symmetry)
+    {
+        return (type, symmetry) switch
+        {
+            (BodyPartType.Head, _) => TargetBodyPart.Head,
+            (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
+        };
+    }
+
+    /// <summary>
+    /// Converts Enums from Targeting system to their BodyPartType equivalent.
+    /// </summary>
+    public (BodyPartType Type, BodyPartSymmetry Symmetry) ConvertTargetBodyPart(TargetBodyPart targetPart)
+    {
+        return targetPart switch
+        {
+            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)
+        };
+
+    }
+
+    /// <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.7f, // 70% damage
+            BodyPartType.Hand => 0.7f, // 70% damage
+            BodyPartType.Leg => 0.7f, // 70% damage
+            BodyPartType.Foot => 0.7f, // 70% damage
+        };
+    }
+
+    /// <summary>
+    /// Fetches the TargetIntegrity equivalent of the current integrity value for the body part.
+    /// </summary>
+    public static TargetIntegrity GetIntegrityThreshold(BodyPartComponent component, float integrity, bool severed)
+    {
+        var enabled = component.Enabled;
+
+        if (severed)
+            return TargetIntegrity.Severed;
+        else if (!component.Enabled)
+            return TargetIntegrity.Disabled;
+
+        var targetIntegrity = TargetIntegrity.Healthy;
+        foreach (var threshold in component.IntegrityThresholds)
+        {
+            if (integrity <= threshold.Value)
+                targetIntegrity = threshold.Key;
+        }
+
+        return targetIntegrity;
+    }
+
+    /// <summary>
+    /// Fetches the chance to evade integrity damage for a body part.
+    /// Used when the entity is not dead, laying down, or incapacitated.
+    /// </summary>
+    public static float GetEvadeChance(BodyPartType partType)
+    {
+        return partType switch
+        {
+            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
+        };
+    }
+
+    public bool CanEvadeDamage(Entity<MobStateComponent?> uid)
+    {
+        if (!Resolve(uid, ref uid.Comp))
+            return false;
+
+        return TryComp<StandingStateComponent>(uid, out var standingState)
+               && !_mobState.IsCritical(uid, uid)
+               && !_mobState.IsDead(uid, uid);
+    }
+
+    public bool TryEvadeDamage(Entity<MobStateComponent?> uid, float evadeChance)
+    {
+        if (!Resolve(uid, ref uid.Comp))
+            return false;
+
+        if (!CanEvadeDamage(uid))
+            return false;
+
+        return _random.NextFloat() < evadeChance;
+    }
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs
new file mode 100644
index 00000000000..bab7e405ad5
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryCloseIncisionConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryLarvaConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryLarvaConditionComponent.cs
new file mode 100644
index 00000000000..3aac5951c6f
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryLarvaConditionComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryLarvaConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryMarkingConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryMarkingConditionComponent.cs
new file mode 100644
index 00000000000..f22b1f682e2
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/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/_CorvaxNext/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs
new file mode 100644
index 00000000000..0c43549e669
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryOperatingTableConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOrganConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOrganConditionComponent.cs
new file mode 100644
index 00000000000..c8c475f115a
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOrganConditionComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Body.Organ;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryOrganConditionComponent : Component
+{
+    [DataField]
+    public ComponentRegistry? Organ;
+
+    [DataField]
+    public bool Inverse;
+
+    [DataField]
+    public bool Reattaching;
+}
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartConditionComponent.cs
new file mode 100644
index 00000000000..08a89eb9e1b
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartConditionComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Body.Part;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryPartConditionComponent : Component
+{
+    [DataField]
+    public BodyPartType Part;
+
+    [DataField]
+    public BodyPartSymmetry? Symmetry;
+
+    [DataField]
+    public bool Inverse;
+}
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartPresentCondition.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartPresentCondition.cs
new file mode 100644
index 00000000000..608f90ba4cb
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartPresentCondition.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryPartPresentConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs
new file mode 100644
index 00000000000..1ad5025480b
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Body.Part;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryPartRemovedConditionComponent : Component
+{
+    /// <summary>
+    ///     Requires that the parent part can attach a new part to this slot.
+    /// </summary>
+    [DataField(required: true)]
+    public string Connection = string.Empty;
+
+    [DataField]
+    public BodyPartType Part;
+
+    [DataField]
+    public BodyPartSymmetry? Symmetry;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryValidEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryValidEvent.cs
new file mode 100644
index 00000000000..da769a457ac
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryValidEvent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Body.Part;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+/// <summary>
+///     Raised on the entity that is receiving surgery.
+/// </summary>
+[ByRefEvent]
+public record struct SurgeryValidEvent(EntityUid Body, EntityUid Part, bool Cancelled = false, BodyPartType PartType = default, BodyPartSymmetry? Symmetry = default);
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryWoundedConditionComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryWoundedConditionComponent.cs
new file mode 100644
index 00000000000..2279fcd0440
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryWoundedConditionComponent.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Body.Part;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Conditions;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryWoundedConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryCompletedEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryCompletedEvent.cs
new file mode 100644
index 00000000000..a0e040fbe7a
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryCompletedEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Medical.Surgery.Effects.Complete;
+
+/// <summary>
+///     Raised on the entity that received the surgery.
+/// </summary>
+[ByRefEvent]
+public record struct SurgeryCompletedEvent;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs
new file mode 100644
index 00000000000..2077dfa53b8
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Effects.Complete;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryRemoveLarvaComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs
new file mode 100644
index 00000000000..4752d169a18
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Damage;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryDamageChangeEffectComponent : Component
+{
+    [DataField]
+    public DamageSpecifier Damage = default!;
+
+    [DataField]
+    public float SleepModifier = 0.5f;
+
+    [DataField]
+    public bool IsConsumable;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs
new file mode 100644
index 00000000000..e375865277f
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Damage;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+namespace Content.Shared.Medical.Surgery.Effects.Step;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgerySpecialDamageChangeEffectComponent : Component
+{
+    [DataField]
+    public string DamageType = "";
+
+    [DataField]
+    public bool IsConsumable;
+}
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs
new file mode 100644
index 00000000000..8a4f5aa2ace
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryStepCavityEffectComponent : Component
+{
+    [DataField]
+    public string Action = "Insert";
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs
new file mode 100644
index 00000000000..6f7f7fefe46
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs
@@ -0,0 +1,12 @@
+using Content.Shared.Chat.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SurgeryStepEmoteEffectComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public ProtoId<EmotePrototype> Emote = "Scream";
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs
new file mode 100644
index 00000000000..138a506739a
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Chat.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using System.ComponentModel.DataAnnotations;
+
+namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SurgeryStepSpawnEffectComponent : Component
+{
+    [DataField(required: true), AutoNetworkedField]
+    public EntProtoId Entity;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs
new file mode 100644
index 00000000000..b3775fb8afb
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Damage;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SurgeryTendWoundsEffectComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public string MainGroup = "Brute";
+
+    [DataField, AutoNetworkedField]
+    public bool IsAutoRepeatable = true;
+
+    [DataField, AutoNetworkedField]
+    public DamageSpecifier Damage = default!;
+
+    [DataField, AutoNetworkedField]
+    public float HealMultiplier = 0.07f;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/OperatingTableComponent.cs b/Content.Shared/_CorvaxNext/Surgery/OperatingTableComponent.cs
new file mode 100644
index 00000000000..39546749fff
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/OperatingTableComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class OperatingTableComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.Steps.cs
new file mode 100644
index 00000000000..faddb67af6c
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.Steps.cs
@@ -0,0 +1,772 @@
+using Content.Shared.Medical.Surgery.Conditions;
+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.IdentityManagement;
+using Content.Shared.Inventory;
+using Content.Shared.Item;
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+using System.Linq;
+using Content.Shared._CorvaxNext.Surgery.Body.Organs;
+using Content.Shared._CorvaxNext.Surgery.Effects.Step;
+using Content.Shared._CorvaxNext.Surgery.Steps;
+using Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+using Content.Shared._CorvaxNext.Surgery.Tools;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Medical.Surgery;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+public abstract partial class SharedSurgerySystem
+{
+    private static readonly string[] BruteDamageTypes = { "Slash", "Blunt", "Piercing" };
+    private static readonly string[] BurnDamageTypes = { "Heat", "Shock", "Cold", "Caustic" };
+    private void InitializeSteps()
+    {
+        SubscribeLocalEvent<SurgeryStepComponent, SurgeryStepEvent>(OnToolStep);
+        SubscribeLocalEvent<SurgeryStepComponent, SurgeryStepCompleteCheckEvent>(OnToolCheck);
+        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);
+        SubSurgery<SurgeryAffixOrganStepComponent>(OnAffixOrganStep, OnAffixOrganCheck);
+        SubSurgery<SurgeryAddMarkingStepComponent>(OnAddMarkingStep, OnAddMarkingCheck);
+        SubSurgery<SurgeryRemoveMarkingStepComponent>(OnRemoveMarkingStep, OnRemoveMarkingCheck);
+        Subs.BuiEvents<SurgeryTargetComponent>(SurgeryUIKey.Key, subs =>
+        {
+            subs.Event<SurgeryStepChosenBuiMsg>(OnSurgeryTargetStepChosen);
+        });
+    }
+
+    private void SubSurgery<TComp>(EntityEventRefHandler<TComp, SurgeryStepEvent> onStep,
+        EntityEventRefHandler<TComp, SurgeryStepCompleteCheckEvent> onComplete) where TComp : IComponent
+    {
+        SubscribeLocalEvent(onStep);
+        SubscribeLocalEvent(onComplete);
+    }
+
+    private void OnToolStep(Entity<SurgeryStepComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (ent.Comp.Tool != null)
+        {
+            foreach (var reg in ent.Comp.Tool.Values)
+            {
+                if (!AnyHaveComp(args.Tools, reg.Component, out var tool))
+                    return;
+
+                if (_net.IsServer &&
+                    TryComp(tool, out SurgeryToolComponent? toolComp) &&
+                    toolComp.EndSound != null)
+                {
+                    _audio.PlayEntity(toolComp.EndSound, args.User, tool);
+                }
+            }
+        }
+
+        if (ent.Comp.Add != null)
+        {
+            foreach (var reg in ent.Comp.Add.Values)
+            {
+                var compType = reg.Component.GetType();
+                if (HasComp(args.Part, compType))
+                    continue;
+                AddComp(args.Part, _compFactory.GetComponent(compType));
+            }
+        }
+
+        if (ent.Comp.Remove != null)
+        {
+            foreach (var reg in ent.Comp.Remove.Values)
+            {
+                RemComp(args.Part, reg.Component.GetType());
+            }
+        }
+
+        if (ent.Comp.BodyRemove != null)
+        {
+            foreach (var reg in ent.Comp.BodyRemove.Values)
+            {
+                RemComp(args.Body, reg.Component.GetType());
+            }
+        }
+
+        if (!_inventory.TryGetSlotEntity(args.User, "gloves", out var gloves)
+        || !_inventory.TryGetSlotEntity(args.User, "mask", out var mask))
+        {
+            var sepsis = new DamageSpecifier(_prototypes.Index<DamageTypePrototype>("Poison"), 5);
+            var ev = new SurgeryStepDamageEvent(args.User, args.Body, args.Part, args.Surgery, sepsis, 0.5f);
+            RaiseLocalEvent(args.Body, ref ev);
+        }
+    }
+
+    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)
+            {
+                if (!HasComp(args.Part, reg.Component.GetType()))
+                {
+                    args.Cancelled = true;
+                    return;
+                }
+            }
+        }
+
+        if (ent.Comp.Remove != null)
+        {
+            foreach (var reg in ent.Comp.Remove.Values)
+            {
+                if (HasComp(args.Part, reg.Component.GetType()))
+                {
+                    args.Cancelled = true;
+                    return;
+                }
+            }
+        }
+
+        if (ent.Comp.BodyRemove != null)
+        {
+            foreach (var reg in ent.Comp.BodyRemove.Values)
+            {
+                if (HasComp(args.Body, reg.Component.GetType()))
+                {
+                    args.Cancelled = true;
+                    return;
+                }
+            }
+        }
+    }
+
+    private void OnToolCanPerform(Entity<SurgeryStepComponent> ent, ref SurgeryCanPerformStepEvent args)
+    {
+        if (HasComp<SurgeryOperatingTableConditionComponent>(ent))
+        {
+            if (!TryComp(args.Body, out BuckleComponent? buckle) ||
+                !HasComp<OperatingTableComponent>(buckle.BuckledTo))
+            {
+                args.Invalid = StepInvalidReason.NeedsOperatingTable;
+                return;
+            }
+        }
+
+        if (_inventory.TryGetContainerSlotEnumerator(args.Body, out var containerSlotEnumerator, args.TargetSlots))
+        {
+            while (containerSlotEnumerator.MoveNext(out var containerSlot))
+            {
+                if (!containerSlot.ContainedEntity.HasValue)
+                    continue;
+
+                args.Invalid = StepInvalidReason.Armor;
+                args.Popup = Loc.GetString("surgery-ui-window-steps-error-armor");
+                return;
+            }
+        }
+
+        RaiseLocalEvent(args.Body, ref args);
+
+        if (args.Invalid != StepInvalidReason.None)
+            return;
+
+        if (ent.Comp.Tool != null)
+        {
+            args.ValidTools ??= new HashSet<EntityUid>();
+
+            foreach (var reg in ent.Comp.Tool.Values)
+            {
+                if (!AnyHaveComp(args.Tools, reg.Component, out var withComp))
+                {
+                    args.Invalid = StepInvalidReason.MissingTool;
+
+                    if (reg.Component is ISurgeryToolComponent tool)
+                        args.Popup = $"You need {tool.ToolName} to perform this step!";
+
+                    return;
+                }
+
+                args.ValidTools.Add(withComp);
+            }
+        }
+    }
+
+    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 (!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;
+
+        var adjustedDamage = new DamageSpecifier(ent.Comp.Damage);
+        var bonusPerType = bonus / group.Length;
+
+        foreach (var type in group)
+        {
+            adjustedDamage.DamageDict[type] -= bonusPerType;
+        }
+
+        var ev = new SurgeryStepDamageEvent(args.User, args.Body, args.Part, args.Surgery, adjustedDamage, 0.5f);
+        RaiseLocalEvent(args.Body, ref ev);
+    }
+
+    private void OnTendWoundsCheck(Entity<SurgeryTendWoundsEffectComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+        var group = ent.Comp.MainGroup == "Brute" ? BruteDamageTypes : BurnDamageTypes;
+
+        if (HasDamageGroup(args.Body, group, out var _)
+            || HasDamageGroup(args.Part, group, out var _))
+            args.Cancelled = true;
+    }
+
+    /*private void OnCutLarvaRootsStep(Entity<SurgeryCutLarvaRootsStepComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (TryComp(args.Body, out VictimInfectedComponent? infected) &&
+            infected.BurstAt > _timing.CurTime &&
+            infected.SpawnedLarva == null)
+        {
+            infected.RootsCut = true;
+        }
+    }
+
+    private void OnCutLarvaRootsCheck(Entity<SurgeryCutLarvaRootsStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+        if (!TryComp(args.Body, out VictimInfectedComponent? infected) || !infected.RootsCut)
+            args.Cancelled = true;
+
+        // The larva has fully developed and surgery is now impossible
+        // TODO: Surgery should still be possible, but the fully developed larva should escape while also saving the hosts life
+        if (infected != null && infected.SpawnedLarva != null)
+            args.Cancelled = true;
+    }*/
+
+    private void OnCavityStep(Entity<SurgeryStepCavityEffectComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (!TryComp(args.Part, out BodyPartComponent? partComp) || partComp.PartType != BodyPartType.Torso)
+            return;
+
+        var activeHandEntity = _hands.EnumerateHeld(args.User).FirstOrDefault();
+        if (activeHandEntity != default
+            && ent.Comp.Action == "Insert"
+            && TryComp(activeHandEntity, out ItemComponent? itemComp)
+            && (itemComp.Size.Id == "Tiny"
+            || itemComp.Size.Id == "Small"))
+            _itemSlotsSystem.TryInsert(ent, partComp.ItemInsertionSlot, activeHandEntity, args.User);
+        else if (ent.Comp.Action == "Remove")
+            _itemSlotsSystem.TryEjectToHands(ent, partComp.ItemInsertionSlot, args.User);
+    }
+
+    private void OnCavityCheck(Entity<SurgeryStepCavityEffectComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+        // Normally this check would simply be partComp.ItemInsertionSlot.HasItem, but as mentioned before,
+        // For whatever reason it's not instantiating the field on the clientside after the wizmerge.
+        if (!TryComp(args.Part, out BodyPartComponent? partComp)
+            || !TryComp(args.Part, out ItemSlotsComponent? itemComp)
+            || ent.Comp.Action == "Insert"
+            && !itemComp.Slots[partComp.ContainerName].HasItem
+            || ent.Comp.Action == "Remove"
+            && itemComp.Slots[partComp.ContainerName].HasItem)
+            args.Cancelled = true;
+    }
+
+    private void OnAddPartStep(Entity<SurgeryAddPartStepComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (!TryComp(args.Surgery, out SurgeryPartRemovedConditionComponent? removedComp))
+            return;
+
+        foreach (var tool in args.Tools)
+        {
+            if (TryComp(tool, out BodyPartComponent? partComp)
+                && partComp.PartType == removedComp.Part
+                && (removedComp.Symmetry == null || partComp.Symmetry == removedComp.Symmetry))
+            {
+                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 _);
+                _body.AttachPart(args.Part, slotName, tool);
+                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)
+            || !_body.GetBodyChildrenOfType(args.Body, removedComp.Part, symmetry: removedComp.Symmetry).Any())
+            args.Cancelled = true;
+    }
+
+    private void OnRemovePartStep(Entity<SurgeryRemovePartStepComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (!TryComp(args.Part, out BodyPartComponent? partComp)
+            || partComp.Body != args.Body)
+            return;
+
+        var ev = new AmputateAttemptEvent(args.Part);
+        RaiseLocalEvent(args.Part, ref ev);
+        _hands.TryPickupAnyHand(args.User, args.Part);
+    }
+
+    private void OnRemovePartCheck(Entity<SurgeryRemovePartStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+        if (!TryComp(args.Part, out BodyPartComponent? partComp)
+            || partComp.Body == args.Body)
+            args.Cancelled = true;
+    }
+
+    private void OnAddOrganStep(Entity<SurgeryAddOrganStepComponent> ent, ref SurgeryStepEvent args)
+    {
+        if (!TryComp(args.Part, out BodyPartComponent? partComp)
+            || partComp.Body != args.Body
+            || !TryComp(args.Surgery, out SurgeryOrganConditionComponent? organComp)
+            || organComp.Organ == null)
+            return;
+
+        // Adding organs is generally done for a single one at a time, so we only need to check for the first.
+        var firstOrgan = organComp.Organ.Values.FirstOrDefault();
+        if (firstOrgan == default)
+            return;
+
+        foreach (var tool in args.Tools)
+        {
+            if (HasComp(tool, firstOrgan.Component.GetType())
+                && TryComp<OrganComponent>(tool, out var insertedOrgan)
+                && _body.InsertOrgan(args.Part, tool, insertedOrgan.SlotId, partComp, insertedOrgan))
+            {
+                EnsureComp<OrganReattachedComponent>(tool);
+                if (_body.TrySetOrganUsed(tool, true, insertedOrgan)
+                    && insertedOrgan.OriginalBody != args.Body)
+                {
+                    var ev = new SurgeryStepDamageChangeEvent(args.User, args.Body, args.Part, ent);
+                    RaiseLocalEvent(ent, ref ev);
+                }
+                break;
+            }
+        }
+    }
+
+    private void OnAddOrganCheck(Entity<SurgeryAddOrganStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+        if (!TryComp<SurgeryOrganConditionComponent>(args.Surgery, out var organComp)
+            || organComp.Organ is null
+            || !TryComp(args.Part, out BodyPartComponent? partComp)
+            || partComp.Body != args.Body)
+            return;
+
+        // For now we naively assume that every entity will only have one of each organ type.
+        // that we do surgery on, but in the future we'll need to reference their prototype somehow
+        // to know if they need 2 hearts, 2 lungs, etc.
+        foreach (var reg in organComp.Organ.Values)
+        {
+            if (!_body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var _))
+            {
+                args.Cancelled = true;
+            }
+        }
+    }
+
+    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)
+            || organComp.Organ == null)
+            return;
+
+        foreach (var reg in organComp.Organ.Values)
+        {
+            _body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs);
+            if (organs != null && organs.Count > 0)
+            {
+                _body.RemoveOrgan(organs[0].Id, organs[0].Organ);
+                _hands.TryPickupAnyHand(args.User, organs[0].Id);
+            }
+        }
+    }
+
+    private void OnRemoveOrganCheck(Entity<SurgeryRemoveOrganStepComponent> ent, ref SurgeryStepCompleteCheckEvent args)
+    {
+        if (!TryComp<SurgeryOrganConditionComponent>(args.Surgery, out var organComp)
+            || organComp.Organ == null
+            || !TryComp(args.Part, out BodyPartComponent? partComp)
+            || partComp.Body != args.Body)
+            return;
+
+        foreach (var reg in organComp.Organ.Values)
+        {
+            if (_body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs)
+                && organs != null
+                && organs.Count > 0)
+            {
+                args.Cancelled = true;
+                return;
+            }
+        }
+    }
+
+    // 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;
+        if (GetEntity(args.Entity) is not { Valid: true } body ||
+            GetEntity(args.Part) is not { Valid: true } targetPart ||
+            !IsSurgeryValid(body, targetPart, args.Surgery, args.Step, user, out var surgery, out var part, out var step))
+        {
+            return;
+        }
+
+        if (!PreviousStepsComplete(body, part, surgery, args.Step) ||
+            IsStepComplete(body, part, args.Step, surgery))
+            return;
+
+        if (!CanPerformStep(user, body, part, step, true, out _, out _, out var validTools))
+            return;
+
+        if (_net.IsServer && validTools?.Count > 0)
+        {
+            foreach (var tool in validTools)
+            {
+                if (TryComp(tool, out SurgeryToolComponent? toolComp) &&
+                    toolComp.EndSound != null)
+                {
+                    _audio.PlayEntity(toolComp.StartSound, user, tool);
+                }
+            }
+        }
+
+        if (TryComp(body, out TransformComponent? xform))
+            _rotateToFace.TryFaceCoordinates(user, _transform.GetMapCoordinates(body, xform).Position);
+
+        var ev = new SurgeryDoAfterEvent(args.Surgery, args.Step);
+        // TODO: Make this serialized on a per surgery step basis, and also add penalties based on ghetto tools.
+        var duration = 2f;
+        if (TryComp(user, out SurgerySpeedModifierComponent? surgerySpeedMod)
+            && surgerySpeedMod is not null)
+            duration = duration / surgerySpeedMod.SpeedModifier;
+
+        var doAfter = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(duration), ev, body, part)
+        {
+            BreakOnMove = true,
+            CancelDuplicate = true,
+            DuplicateCondition = DuplicateConditions.SameEvent,
+            NeedHand = true,
+            BreakOnHandChange = true,
+        };
+
+        if (_doAfter.TryStartDoAfter(doAfter))
+        {
+            var userName = Identity.Entity(user, EntityManager);
+            var targetName = Identity.Entity(ent.Owner, EntityManager);
+
+            var locName = $"surgery-popup-procedure-{args.Surgery}-step-{args.Step}";
+            var locResult = Loc.GetString(locName,
+                ("user", userName), ("target", targetName), ("part", part));
+
+            if (locResult == locName)
+                locResult = Loc.GetString($"surgery-popup-step-{args.Step}",
+                    ("user", userName), ("target", targetName), ("part", part));
+
+            _popup.PopupEntity(locResult, user);
+        }
+    }
+
+    private (Entity<SurgeryComponent> Surgery, int Step)? GetNextStep(EntityUid body, EntityUid part, Entity<SurgeryComponent?> surgery, List<EntityUid> requirements)
+    {
+        if (!Resolve(surgery, ref surgery.Comp))
+            return null;
+
+        if (requirements.Contains(surgery))
+            throw new ArgumentException($"Surgery {surgery} has a requirement loop: {string.Join(", ", requirements)}");
+
+        requirements.Add(surgery);
+
+        if (surgery.Comp.Requirement is { } requirementId &&
+            GetSingleton(requirementId) is { } requirement &&
+            GetNextStep(body, part, requirement, requirements) is { } requiredNext)
+        {
+            return requiredNext;
+        }
+
+        for (var i = 0; i < surgery.Comp.Steps.Count; i++)
+        {
+            var surgeryStep = surgery.Comp.Steps[i];
+            if (!IsStepComplete(body, part, surgeryStep, surgery))
+                return ((surgery, surgery.Comp), i);
+        }
+
+        return null;
+    }
+
+    public (Entity<SurgeryComponent> Surgery, int Step)? GetNextStep(EntityUid body, EntityUid part, EntityUid surgery)
+    {
+        return GetNextStep(body, part, surgery, new List<EntityUid>());
+    }
+
+    public bool PreviousStepsComplete(EntityUid body, EntityUid part, Entity<SurgeryComponent> surgery, EntProtoId step)
+    {
+        // TODO RMC14 use index instead of the prototype id
+        if (surgery.Comp.Requirement is { } requirement)
+        {
+            if (GetSingleton(requirement) is not { } requiredEnt ||
+                !TryComp(requiredEnt, out SurgeryComponent? requiredComp) ||
+                !PreviousStepsComplete(body, part, (requiredEnt, requiredComp), step))
+            {
+                return false;
+            }
+        }
+
+        foreach (var surgeryStep in surgery.Comp.Steps)
+        {
+            if (surgeryStep == step)
+                break;
+
+            if (!IsStepComplete(body, part, surgeryStep, surgery))
+                return false;
+        }
+
+        return true;
+    }
+
+    public bool CanPerformStep(EntityUid user, EntityUid body, EntityUid part,
+        EntityUid step, bool doPopup, out string? popup, out StepInvalidReason reason,
+        out HashSet<EntityUid>? validTools)
+    {
+        var type = BodyPartType.Other;
+        if (TryComp(part, out BodyPartComponent? partComp))
+        {
+            type = partComp.PartType;
+        }
+
+        var slot = type switch
+        {
+            BodyPartType.Head => SlotFlags.HEAD,
+            BodyPartType.Torso => SlotFlags.OUTERCLOTHING | SlotFlags.INNERCLOTHING,
+            BodyPartType.Arm => SlotFlags.OUTERCLOTHING | SlotFlags.INNERCLOTHING,
+            BodyPartType.Hand => SlotFlags.GLOVES,
+            BodyPartType.Leg => SlotFlags.OUTERCLOTHING | SlotFlags.LEGS,
+            BodyPartType.Foot => SlotFlags.FEET,
+            BodyPartType.Tail => SlotFlags.NONE,
+            BodyPartType.Other => SlotFlags.NONE,
+            _ => SlotFlags.NONE
+        };
+
+        var check = new SurgeryCanPerformStepEvent(user, body, GetTools(user), slot);
+        RaiseLocalEvent(step, ref check);
+        popup = check.Popup;
+        validTools = check.ValidTools;
+
+        if (check.Invalid != StepInvalidReason.None)
+        {
+            if (doPopup && check.Popup != null)
+                _popup.PopupEntity(check.Popup, user, user, PopupType.SmallCaution);
+
+            reason = check.Invalid;
+            return false;
+        }
+
+        reason = default;
+        return true;
+    }
+
+    public bool CanPerformStep(EntityUid user, EntityUid body, EntityUid part, EntityUid step, bool doPopup)
+    {
+        return CanPerformStep(user, body, part, step, doPopup, out _, out _, out _);
+    }
+
+    public bool IsStepComplete(EntityUid body, EntityUid part, EntProtoId step, EntityUid surgery)
+    {
+        if (GetSingleton(step) is not { } stepEnt)
+            return false;
+
+        var ev = new SurgeryStepCompleteCheckEvent(body, part, surgery);
+        RaiseLocalEvent(stepEnt, ref ev);
+        return !ev.Cancelled;
+    }
+
+    private bool AnyHaveComp(List<EntityUid> tools, IComponent component, out EntityUid withComp)
+    {
+        foreach (var tool in tools)
+        {
+            if (HasComp(tool, component.GetType()))
+            {
+                withComp = tool;
+                return true;
+            }
+        }
+
+        withComp = default;
+        return false;
+    }
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.cs b/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.cs
new file mode 100644
index 00000000000..b85066ba6ed
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.cs
@@ -0,0 +1,287 @@
+using System.Linq;
+using Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+using Content.Shared.Medical.Surgery.Conditions;
+using Content.Shared.Body.Systems;
+using Content.Shared.Medical.Surgery.Steps;
+using Content.Shared.Body.Part;
+using Content.Shared.Damage;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Body.Components;
+using Content.Shared.Buckle.Components;
+using Content.Shared.DoAfter;
+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;
+using Content.Shared.Standing;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+public abstract partial class SharedSurgerySystem : EntitySystem
+{
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly IComponentFactory _compFactory = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [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!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+    [Dependency] private readonly RotateToFaceSystem _rotateToFace = default!;
+    [Dependency] private readonly StandingStateSystem _standing = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    private readonly Dictionary<EntProtoId, EntityUid> _surgeries = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
+
+        SubscribeLocalEvent<SurgeryTargetComponent, SurgeryDoAfterEvent>(OnTargetDoAfter);
+        SubscribeLocalEvent<SurgeryCloseIncisionConditionComponent, SurgeryValidEvent>(OnCloseIncisionValid);
+        //SubscribeLocalEvent<SurgeryLarvaConditionComponent, SurgeryValidEvent>(OnLarvaValid);
+        SubscribeLocalEvent<SurgeryPartConditionComponent, SurgeryValidEvent>(OnPartConditionValid);
+        SubscribeLocalEvent<SurgeryOrganConditionComponent, SurgeryValidEvent>(OnOrganConditionValid);
+        SubscribeLocalEvent<SurgeryWoundedConditionComponent, SurgeryValidEvent>(OnWoundedValid);
+        SubscribeLocalEvent<SurgeryPartRemovedConditionComponent, SurgeryValidEvent>(OnPartRemovedConditionValid);
+        SubscribeLocalEvent<SurgeryPartPresentConditionComponent, SurgeryValidEvent>(OnPartPresentConditionValid);
+        SubscribeLocalEvent<SurgeryMarkingConditionComponent, SurgeryValidEvent>(OnMarkingPresentValid);
+        //SubscribeLocalEvent<SurgeryRemoveLarvaComponent, SurgeryCompletedEvent>(OnRemoveLarva);
+
+        InitializeSteps();
+    }
+
+    private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev)
+    {
+        _surgeries.Clear();
+    }
+
+    private void OnTargetDoAfter(Entity<SurgeryTargetComponent> ent, ref SurgeryDoAfterEvent args)
+    {
+        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))
+        {
+            Log.Warning($"{ToPrettyString(args.User)} tried to start invalid surgery.");
+            return;
+        }
+
+        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);
+    }
+
+    private void OnCloseIncisionValid(Entity<SurgeryCloseIncisionConditionComponent> ent, ref SurgeryValidEvent args)
+    {
+        if (!HasComp<IncisionOpenComponent>(args.Part) ||
+            !HasComp<BleedersClampedComponent>(args.Part) ||
+            !HasComp<SkinRetractedComponent>(args.Part) ||
+            !HasComp<BodyPartReattachedComponent>(args.Part) ||
+            !HasComp<InternalBleedersClampedComponent>(args.Part))
+        {
+            args.Cancelled = true;
+        }
+    }
+
+    private void OnWoundedValid(Entity<SurgeryWoundedConditionComponent> ent, ref SurgeryValidEvent args)
+    {
+        if (!TryComp(args.Body, out DamageableComponent? damageable)
+            || !TryComp(args.Part, out DamageableComponent? partDamageable)
+            || damageable.TotalDamage <= 0
+            && partDamageable.TotalDamage <= 0
+            && !HasComp<IncisionOpenComponent>(args.Part))
+            args.Cancelled = true;
+    }
+
+    /*private void OnLarvaValid(Entity<SurgeryLarvaConditionComponent> ent, ref SurgeryValidEvent args)
+    {
+        if (!TryComp(args.Body, out VictimInfectedComponent? infected))
+            args.Cancelled = true;
+
+        // The larva has fully developed and surgery is now impossible
+        if (infected != null && infected.SpawnedLarva != null)
+            args.Cancelled = true;
+    }*/
+    private void OnPartConditionValid(Entity<SurgeryPartConditionComponent> ent, ref SurgeryValidEvent args)
+    {
+        if (!TryComp<BodyPartComponent>(args.Part, out var part))
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        var typeMatch = part.PartType == ent.Comp.Part;
+        var symmetryMatch = ent.Comp.Symmetry == null || part.Symmetry == ent.Comp.Symmetry;
+        var valid = typeMatch && symmetryMatch;
+
+        if (ent.Comp.Inverse ? valid : !valid)
+            args.Cancelled = true;
+    }
+
+    private void OnOrganConditionValid(Entity<SurgeryOrganConditionComponent> ent, ref SurgeryValidEvent args)
+    {
+        if (!TryComp<BodyPartComponent>(args.Part, out var partComp)
+            || partComp.Body != args.Body
+            || ent.Comp.Organ == null)
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        foreach (var reg in ent.Comp.Organ.Values)
+        {
+            if (_body.TryGetBodyPartOrgans(args.Part, reg.Component.GetType(), out var organs)
+                && organs.Count > 0)
+            {
+                if (ent.Comp.Inverse
+                    && (!ent.Comp.Reattaching
+                    || ent.Comp.Reattaching
+                    && !organs.Any(organ => HasComp<OrganReattachedComponent>(organ.Id))))
+                    args.Cancelled = true;
+            }
+            else if (!ent.Comp.Inverse)
+                args.Cancelled = true;
+        }
+    }
+
+    private void OnPartRemovedConditionValid(Entity<SurgeryPartRemovedConditionComponent> ent, ref SurgeryValidEvent args)
+    {
+        if (!_body.CanAttachToSlot(args.Part, ent.Comp.Connection))
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        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;
+    }
+
+    private void OnPartPresentConditionValid(Entity<SurgeryPartPresentConditionComponent> ent, ref SurgeryValidEvent args)
+    {
+        if (args.Part == EntityUid.Invalid
+            || !HasComp<BodyPartComponent>(args.Part))
+            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);
+    }*/
+
+    protected bool IsSurgeryValid(EntityUid body, EntityUid targetPart, EntProtoId surgery, EntProtoId stepId,
+        EntityUid user, out Entity<SurgeryComponent> surgeryEnt, out EntityUid part, out EntityUid step)
+    {
+        surgeryEnt = default;
+        part = default;
+        step = default;
+
+        if (!HasComp<SurgeryTargetComponent>(body) ||
+            !IsLyingDown(body, user) ||
+            GetSingleton(surgery) is not { } surgeryEntId ||
+            !TryComp(surgeryEntId, out SurgeryComponent? surgeryComp) ||
+            !surgeryComp.Steps.Contains(stepId) ||
+            GetSingleton(stepId) is not { } stepEnt
+            || !HasComp<BodyPartComponent>(targetPart)
+            && !HasComp<BodyComponent>(targetPart))
+            return false;
+
+
+        var ev = new SurgeryValidEvent(body, targetPart);
+        if (_timing.IsFirstTimePredicted)
+        {
+            RaiseLocalEvent(stepEnt, ref ev);
+            RaiseLocalEvent(surgeryEntId, ref ev);
+        }
+
+        if (ev.Cancelled)
+            return false;
+
+        surgeryEnt = (surgeryEntId, surgeryComp);
+        part = targetPart;
+        step = stepEnt;
+        return true;
+    }
+
+    public EntityUid? GetSingleton(EntProtoId surgeryOrStep)
+    {
+        if (!_prototypes.HasIndex(surgeryOrStep))
+            return null;
+
+        // This (for now) assumes that surgery entity data remains unchanged between client
+        // and server
+        // if it does not you get the bullet
+        if (!_surgeries.TryGetValue(surgeryOrStep, out var ent) || TerminatingOrDeleted(ent))
+        {
+            ent = Spawn(surgeryOrStep, MapCoordinates.Nullspace);
+            _surgeries[surgeryOrStep] = ent;
+        }
+
+        return ent;
+    }
+
+    private List<EntityUid> GetTools(EntityUid surgeon)
+    {
+        return _hands.EnumerateHeld(surgeon).ToList();
+    }
+
+    public bool IsLyingDown(EntityUid entity, EntityUid user)
+    {
+        if (_standing.IsDown(entity))
+            return true;
+
+        if (TryComp(entity, out BuckleComponent? buckle) &&
+            TryComp(buckle.BuckledTo, out StrapComponent? strap))
+        {
+            var rotation = strap.Rotation;
+            if (rotation.GetCardinalDir() is Direction.West or Direction.East)
+                return true;
+        }
+
+        _popup.PopupEntity(Loc.GetString("surgery-error-laying"), user, user);
+
+        return false;
+    }
+
+    protected virtual void RefreshUI(EntityUid body)
+    {
+    }
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/StepInvalidReason.cs b/Content.Shared/_CorvaxNext/Surgery/StepInvalidReason.cs
new file mode 100644
index 00000000000..696ebd34b85
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/StepInvalidReason.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared._CorvaxNext.Surgery;
+
+public enum StepInvalidReason
+{
+    None,
+    MissingSkills,
+    NeedsOperatingTable,
+    Armor,
+    MissingTool,
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BleedersClampedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BleedersClampedComponent.cs
new file mode 100644
index 00000000000..5854fd5ed55
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BleedersClampedComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BleedersClampedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartReattachedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartReattachedComponent.cs
new file mode 100644
index 00000000000..870ad983b2a
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartReattachedComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BodyPartReattachedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartSawedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartSawedComponent.cs
new file mode 100644
index 00000000000..264acc1baa3
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/BodyPartSawedComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BodyPartSawedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/IncisionOpenComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/IncisionOpenComponent.cs
new file mode 100644
index 00000000000..02a18abaca7
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/IncisionOpenComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class IncisionOpenComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/InternalBleedersClampedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/InternalBleedersClampedComponent.cs
new file mode 100644
index 00000000000..d25a1084f1c
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/InternalBleedersClampedComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class InternalBleedersClampedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/OrganReattachedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/OrganReattachedComponent.cs
new file mode 100644
index 00000000000..30ada57bbf5
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/OrganReattachedComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class OrganReattachedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/PartRemovedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/PartRemovedComponent.cs
new file mode 100644
index 00000000000..f7b14628e9c
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/PartRemovedComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PartsRemovedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageOpenComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageOpenComponent.cs
new file mode 100644
index 00000000000..e32197c76a5
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageOpenComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class RibcageOpenComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageSawedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageSawedComponent.cs
new file mode 100644
index 00000000000..ff749649ce8
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/RibcageSawedComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class RibcageSawedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/SkinRetractedComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/SkinRetractedComponent.cs
new file mode 100644
index 00000000000..b7ee51a9b8e
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/Parts/SkinRetractedComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps.Parts;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SkinRetractedComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddMarkingStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
new file mode 100644
index 00000000000..a9e23567da0
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Humanoid;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CorvaxNext.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/_CorvaxNext/Surgery/Steps/SurgeryAddOrganStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddOrganStepComponent.cs
new file mode 100644
index 00000000000..773cc634fae
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddOrganStepComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryAddOrganStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddPartStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddPartStepComponent.cs
new file mode 100644
index 00000000000..0229552ae8a
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddPartStepComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryAddPartStepComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixOrganStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixOrganStepComponent.cs
new file mode 100644
index 00000000000..5f82cbe4251
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/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/_CorvaxNext/Surgery/Steps/SurgeryAffixPartStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixPartStepComponent.cs
new file mode 100644
index 00000000000..cc080e8be0b
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/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/_CorvaxNext/Surgery/Steps/SurgeryCanPerformStepEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCanPerformStepEvent.cs
new file mode 100644
index 00000000000..3c9d62cbfd2
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCanPerformStepEvent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Inventory;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps;
+
+[ByRefEvent]
+public record struct SurgeryCanPerformStepEvent(
+    EntityUid User,
+    EntityUid Body,
+    List<EntityUid> Tools,
+    SlotFlags TargetSlots,
+    string? Popup = null,
+    StepInvalidReason Invalid = StepInvalidReason.None,
+    HashSet<EntityUid>? ValidTools = null
+) : IInventoryRelayEvent;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCutLarvaRootsStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCutLarvaRootsStepComponent.cs
new file mode 100644
index 00000000000..55f3e568213
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryCutLarvaRootsStepComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryCutLarvaRootsStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
new file mode 100644
index 00000000000..47368a154c0
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/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/_CorvaxNext/Surgery/Steps/SurgeryRemoveOrganStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveOrganStepComponent.cs
new file mode 100644
index 00000000000..3efe15d710c
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveOrganStepComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryRemoveOrganStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemovePartStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemovePartStepComponent.cs
new file mode 100644
index 00000000000..7780f252000
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemovePartStepComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryRemovePartStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRepeatableStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRepeatableStepComponent.cs
new file mode 100644
index 00000000000..14010b7e962
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRepeatableStepComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryRepeatableStepComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepCompleteCheckEvent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepCompleteCheckEvent.cs
new file mode 100644
index 00000000000..13d1e4da6cc
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepCompleteCheckEvent.cs
@@ -0,0 +1,4 @@
+namespace Content.Shared._CorvaxNext.Surgery.Steps;
+
+[ByRefEvent]
+public record struct SurgeryStepCompleteCheckEvent(EntityUid Body, EntityUid Part, EntityUid Surgery, bool Cancelled = false);
diff --git a/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepComponent.cs
new file mode 100644
index 00000000000..65dcbd4d195
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryStepComponent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CorvaxNext.Surgery.Steps;
+
+[RegisterComponent, NetworkedComponent]
+[Prototype("SurgerySteps")]
+public sealed partial class SurgeryStepComponent : Component
+{
+
+    [DataField]
+    public ComponentRegistry? Tool;
+
+    [DataField]
+    public ComponentRegistry? Add;
+
+    [DataField]
+    public ComponentRegistry? Remove;
+
+    [DataField]
+    public ComponentRegistry? BodyRemove;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryComponent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryComponent.cs
new file mode 100644
index 00000000000..6f3c8d8e9c5
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SurgeryComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Prototype("Surgeries")]
+public sealed partial class SurgeryComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public int Priority;
+
+    [DataField, AutoNetworkedField]
+    public EntProtoId? Requirement;
+
+    [DataField(required: true), AutoNetworkedField]
+    public List<EntProtoId> Steps = new();
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryDoAfterEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryDoAfterEvent.cs
new file mode 100644
index 00000000000..e8d9ced1cca
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SurgeryDoAfterEvent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+[Serializable, NetSerializable]
+public sealed partial class SurgeryDoAfterEvent : SimpleDoAfterEvent
+{
+    public readonly EntProtoId Surgery;
+    public readonly EntProtoId Step;
+
+    public SurgeryDoAfterEvent(EntProtoId surgery, EntProtoId step)
+    {
+        Surgery = surgery;
+        Step = step;
+    }
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgerySpeedModifierComponent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgerySpeedModifierComponent.cs
new file mode 100644
index 00000000000..32ce00f2c38
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SurgerySpeedModifierComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgerySpeedModifierComponent : Component
+{
+    [DataField]
+    public float SpeedModifier = 1.5f;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageChangeEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageChangeEvent.cs
new file mode 100644
index 00000000000..e8f0a34cde3
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageChangeEvent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Damage;
+
+namespace Content.Shared.Medical.Surgery;
+
+/// <summary>
+///     Raised on the target entity.
+/// </summary>
+[ByRefEvent]
+public record struct SurgeryStepDamageChangeEvent(EntityUid User, EntityUid Body, EntityUid Part, EntityUid Step);
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageEvent.cs
new file mode 100644
index 00000000000..256ee460247
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageEvent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Damage;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+/// <summary>
+///     Raised on the target entity.
+/// </summary>
+[ByRefEvent]
+public record struct SurgeryStepDamageEvent(EntityUid User, EntityUid Body, EntityUid Part, EntityUid Surgery, DamageSpecifier Damage, float PartMultiplier);
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryStepEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryStepEvent.cs
new file mode 100644
index 00000000000..3979e975273
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SurgeryStepEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared._CorvaxNext.Surgery;
+
+/// <summary>
+///     Raised on the step entity.
+/// </summary>
+[ByRefEvent]
+public record struct SurgeryStepEvent(EntityUid User, EntityUid Body, EntityUid Part, List<EntityUid> Tools, EntityUid Surgery);
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryTargetComponent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryTargetComponent.cs
new file mode 100644
index 00000000000..446303fc7d9
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SurgeryTargetComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgeryTargetComponent : Component
+{
+    [DataField]
+    public bool CanOperate = true;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryUI.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryUI.cs
new file mode 100644
index 00000000000..d738482f240
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SurgeryUI.cs
@@ -0,0 +1,32 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+[Serializable, NetSerializable]
+public enum SurgeryUIKey
+{
+    Key
+}
+
+[Serializable, NetSerializable]
+public sealed class SurgeryBuiState(Dictionary<NetEntity, List<EntProtoId>> choices) : BoundUserInterfaceState
+{
+    public readonly Dictionary<NetEntity, List<EntProtoId>> Choices = choices;
+}
+
+[Serializable, NetSerializable]
+public sealed class SurgeryBuiRefreshMessage : BoundUserInterfaceMessage
+{
+}
+
+[Serializable, NetSerializable]
+public sealed class SurgeryStepChosenBuiMsg(NetEntity part, EntProtoId surgery, EntProtoId step, bool isBody) : BoundUserInterfaceMessage
+{
+    public readonly NetEntity Part = part;
+    public readonly EntProtoId Surgery = surgery;
+    public readonly EntProtoId Step = step;
+
+    // Used as a marker for whether or not we're hijacking surgery by applying it on the body itself.
+    public readonly bool IsBody = isBody;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/SurgeryUiRefreshEvent.cs b/Content.Shared/_CorvaxNext/Surgery/SurgeryUiRefreshEvent.cs
new file mode 100644
index 00000000000..701a69b93f1
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/SurgeryUiRefreshEvent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CorvaxNext.Surgery;
+
+[Serializable, NetSerializable]
+public sealed class SurgeryUiRefreshEvent : EntityEventArgs
+{
+    public NetEntity Uid { get; }
+
+    public SurgeryUiRefreshEvent(NetEntity uid)
+    {
+        Uid = uid;
+    }
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/BoneGelComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/BoneGelComponent.cs
new file mode 100644
index 00000000000..4f186113d3c
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/BoneGelComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BoneGelComponent : Component, ISurgeryToolComponent
+{
+    public string ToolName => "bone gel";
+
+    public bool? Used { get; set; } = null;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSawComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSawComponent.cs
new file mode 100644
index 00000000000..214058f1901
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSawComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BoneSawComponent : Component, ISurgeryToolComponent
+{
+    public string ToolName => "a bone saw";
+    public bool? Used { get; set; } = null;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSetterComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSetterComponent.cs
new file mode 100644
index 00000000000..262c6814896
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/BoneSetterComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BoneSetterComponent : Component;
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/CauteryComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/CauteryComponent.cs
new file mode 100644
index 00000000000..0fd34f31776
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/CauteryComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CauteryComponent : Component, ISurgeryToolComponent
+{
+    public string ToolName => "a cautery";
+    public bool? Used { get; set; } = null;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/HemostatComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/HemostatComponent.cs
new file mode 100644
index 00000000000..109133ca4fa
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/HemostatComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HemostatComponent : Component, ISurgeryToolComponent
+{
+    public string ToolName => "a hemostat";
+    public bool? Used { get; set; } = null;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/ISurgeryToolComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/ISurgeryToolComponent.cs
new file mode 100644
index 00000000000..9c536c24c65
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/ISurgeryToolComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+public interface ISurgeryToolComponent
+{
+    [DataField]
+    public string ToolName { get; }
+
+    // Mostly intended for discardable or non-reusable tools.
+    [DataField]
+    public bool? Used { get; set; }
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/RetractorComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/RetractorComponent.cs
new file mode 100644
index 00000000000..1f8493d26be
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/RetractorComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class RetractorComponent : Component, ISurgeryToolComponent
+{
+    public string ToolName => "a retractor";
+    public bool? Used { get; set; } = null;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/ScalpelComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/ScalpelComponent.cs
new file mode 100644
index 00000000000..4bf01726f6e
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/ScalpelComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ScalpelComponent : Component, ISurgeryToolComponent
+{
+    public string ToolName => "a scalpel";
+    public bool? Used { get; set; } = null;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolComponent.cs
new file mode 100644
index 00000000000..d02bddb803b
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/SurgeryToolComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SurgeryToolComponent : Component
+{
+
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? StartSound;
+
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? EndSound;
+}
diff --git a/Content.Shared/_CorvaxNext/Surgery/Tools/SurgicalDrillComponent.cs b/Content.Shared/_CorvaxNext/Surgery/Tools/SurgicalDrillComponent.cs
new file mode 100644
index 00000000000..0ae8ff57b95
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Surgery/Tools/SurgicalDrillComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Surgery.Tools;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SurgicalDrillComponent : Component, ISurgeryToolComponent
+{
+    public string ToolName => "a surgical drill";
+    public bool? Used { get; set; } = null;
+}
diff --git a/Content.Shared/_CorvaxNext/Targeting/Events.cs b/Content.Shared/_CorvaxNext/Targeting/Events.cs
new file mode 100644
index 00000000000..fb51962a260
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Targeting/Events.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CorvaxNext.Targeting;
+
+[Serializable, NetSerializable]
+public sealed class TargetChangeEvent : EntityEventArgs
+{
+    public NetEntity Uid { get; }
+    public TargetBodyPart BodyPart { get; }
+    public TargetChangeEvent(NetEntity uid, TargetBodyPart bodyPart)
+    {
+        Uid = uid;
+        BodyPart = bodyPart;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class TargetIntegrityChangeEvent : EntityEventArgs
+{
+    public NetEntity Uid { get; }
+    public bool RefreshUi { get; }
+    public TargetIntegrityChangeEvent(NetEntity uid, bool refreshUi = true)
+    {
+        Uid = uid;
+        RefreshUi = refreshUi;
+    }
+}
+
+public sealed class RefreshInventorySlotsEvent : EntityEventArgs
+{
+    public string SlotName { get; }
+
+    public RefreshInventorySlotsEvent(string slotName)
+    {
+        SlotName = slotName;
+    }
+}
diff --git a/Content.Shared/_CorvaxNext/Targeting/SharedTargetingSystem.cs b/Content.Shared/_CorvaxNext/Targeting/SharedTargetingSystem.cs
new file mode 100644
index 00000000000..9c5e7b77254
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Targeting/SharedTargetingSystem.cs
@@ -0,0 +1,27 @@
+namespace Content.Shared._CorvaxNext.Targeting;
+
+public abstract class SharedTargetingSystem : EntitySystem
+{
+    /// <summary>
+    /// Returns all Valid target body parts as an array.
+    /// </summary>
+    public static TargetBodyPart[] GetValidParts()
+    {
+        var parts = new[]
+        {
+            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/_CorvaxNext/Targeting/TargetBodyPart.cs b/Content.Shared/_CorvaxNext/Targeting/TargetBodyPart.cs
new file mode 100644
index 00000000000..0e49028069c
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Targeting/TargetBodyPart.cs
@@ -0,0 +1,30 @@
+namespace Content.Shared._CorvaxNext.Targeting;
+
+/// <summary>
+/// Represents and enum of possible target parts.
+/// </summary>
+/// <remarks>
+/// To get all body parts as an Array, use static
+/// method in SharedTargetingSystem GetValidParts.
+/// </remarks>
+[Flags]
+public enum TargetBodyPart : ushort
+{
+    Head = 1,
+    Torso = 1 << 1,
+    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,
+    Feet = LeftFoot | RightFoot,
+    All = Head | Torso | Groin | LeftArm | LeftHand | RightArm | RightHand | LeftLeg | LeftFoot | RightLeg | RightFoot,
+}
diff --git a/Content.Shared/_CorvaxNext/Targeting/TargetIntegrity.cs b/Content.Shared/_CorvaxNext/Targeting/TargetIntegrity.cs
new file mode 100644
index 00000000000..7ded5b0123f
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Targeting/TargetIntegrity.cs
@@ -0,0 +1,13 @@
+namespace Content.Shared._CorvaxNext.Targeting;
+public enum TargetIntegrity
+{
+    Healthy = 0,
+    LightlyWounded = 1,
+    SomewhatWounded = 2,
+    ModeratelyWounded = 3,
+    HeavilyWounded = 4,
+    CriticallyWounded = 5,
+    Severed = 6,
+    Dead = 7,
+    Disabled = 8,
+}
diff --git a/Content.Shared/_CorvaxNext/Targeting/TargetingComponent.cs b/Content.Shared/_CorvaxNext/Targeting/TargetingComponent.cs
new file mode 100644
index 00000000000..a558a09ecd2
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Targeting/TargetingComponent.cs
@@ -0,0 +1,57 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Targeting;
+
+/// <summary>
+/// Controls entity limb targeting for actions.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TargetingComponent : Component
+{
+    [ViewVariables, AutoNetworkedField]
+    public TargetBodyPart Target = TargetBodyPart.Torso;
+
+    /// <summary>
+    /// What odds does the entity have of targeting each body part?
+    /// </summary>
+    [DataField]
+    public Dictionary<TargetBodyPart, float> TargetOdds = new()
+    {
+        { TargetBodyPart.Head, 0.1f },
+        { 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>
+    /// What is the current integrity of each body part?
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public Dictionary<TargetBodyPart, TargetIntegrity> BodyStatus = new()
+    {
+        { 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.LeftFoot, TargetIntegrity.Healthy },
+        { TargetBodyPart.RightLeg, TargetIntegrity.Healthy },
+        { TargetBodyPart.RightFoot, TargetIntegrity.Healthy }
+    };
+
+    /// <summary>
+    /// What noise does the entity play when swapping targets?
+    /// </summary>
+    [DataField]
+    public string SwapSound = "/Audio/Effects/toggleoncombat.ogg";
+}
diff --git a/Resources/Audio/Medical/Surgery/attributions.yml b/Resources/Audio/Medical/Surgery/attributions.yml
new file mode 100644
index 00000000000..c88a3e0b70f
--- /dev/null
+++ b/Resources/Audio/Medical/Surgery/attributions.yml
@@ -0,0 +1,49 @@
+- files: ["cautery1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery1.ogg"
+
+- files: ["cautery2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/cautery2.ogg"
+
+- files: ["hemostat.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/hemostat.ogg"
+
+- files: ["organ1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ1.ogg"
+
+- files: ["organ2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/organ2.ogg"
+
+- files: ["retractor1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor1.ogg"
+
+- files: ["retractor2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/retractor2.ogg"
+
+- files: ["saw.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/saw.ogg"
+
+- files: ["scalpel1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel1.ogg"
+
+- files: ["scalpel2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from cmss13"
+  source: "https://github.com/cmss13-devs/cmss13/blob/fae73dfa5aedb0a253de04b60085ed8a178d3bf7/sound/surgery/scalpel2.ogg"
\ No newline at end of file
diff --git a/Resources/Audio/Medical/Surgery/cautery1.ogg b/Resources/Audio/Medical/Surgery/cautery1.ogg
new file mode 100644
index 00000000000..fbd9f2b4d86
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/cautery1.ogg differ
diff --git a/Resources/Audio/Medical/Surgery/cautery2.ogg b/Resources/Audio/Medical/Surgery/cautery2.ogg
new file mode 100644
index 00000000000..cc91e9f3ce6
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/cautery2.ogg differ
diff --git a/Resources/Audio/Medical/Surgery/hemostat1.ogg b/Resources/Audio/Medical/Surgery/hemostat1.ogg
new file mode 100644
index 00000000000..e624bafafbf
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/hemostat1.ogg differ
diff --git a/Resources/Audio/Medical/Surgery/organ1.ogg b/Resources/Audio/Medical/Surgery/organ1.ogg
new file mode 100644
index 00000000000..37eaffc1a34
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/organ1.ogg differ
diff --git a/Resources/Audio/Medical/Surgery/organ2.ogg b/Resources/Audio/Medical/Surgery/organ2.ogg
new file mode 100644
index 00000000000..43b22f8354c
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/organ2.ogg differ
diff --git a/Resources/Audio/Medical/Surgery/retractor1.ogg b/Resources/Audio/Medical/Surgery/retractor1.ogg
new file mode 100644
index 00000000000..70625c961cf
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/retractor1.ogg differ
diff --git a/Resources/Audio/Medical/Surgery/retractor2.ogg b/Resources/Audio/Medical/Surgery/retractor2.ogg
new file mode 100644
index 00000000000..94548ec2504
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/retractor2.ogg differ
diff --git a/Resources/Audio/Medical/Surgery/saw.ogg b/Resources/Audio/Medical/Surgery/saw.ogg
new file mode 100644
index 00000000000..62623f6aa3a
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/saw.ogg differ
diff --git a/Resources/Audio/Medical/Surgery/scalpel1.ogg b/Resources/Audio/Medical/Surgery/scalpel1.ogg
new file mode 100644
index 00000000000..f292d1024da
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/scalpel1.ogg differ
diff --git a/Resources/Audio/Medical/Surgery/scalpel2.ogg b/Resources/Audio/Medical/Surgery/scalpel2.ogg
new file mode 100644
index 00000000000..7335f3d9cef
Binary files /dev/null and b/Resources/Audio/Medical/Surgery/scalpel2.ogg differ
diff --git a/Resources/Locale/en-US/_corvaxnext/guidebook/guides.ftl b/Resources/Locale/en-US/_corvaxnext/guidebook/guides.ftl
new file mode 100644
index 00000000000..217d0bfacc7
--- /dev/null
+++ b/Resources/Locale/en-US/_corvaxnext/guidebook/guides.ftl
@@ -0,0 +1,4 @@
+guide-entry-surgery = Surgery
+guide-entry-partmanipulation = Part Manipulation
+guide-entry-organmanipulation = Organ Manipulation
+guide-entry-utilitysurgeries = Utility Surgeries
diff --git a/Resources/Locale/en-US/_corvaxnext/surgery/surgery-popup.ftl b/Resources/Locale/en-US/_corvaxnext/surgery/surgery-popup.ftl
new file mode 100644
index 00000000000..8ded2fcaec9
--- /dev/null
+++ b/Resources/Locale/en-US/_corvaxnext/surgery/surgery-popup.ftl
@@ -0,0 +1,52 @@
+surgery-popup-step-SurgeryStepOpenIncisionScalpel = {$user} is making an incision on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepClampBleeders = {$user} is clamping the bleeders on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepRetractSkin = {$user} is retracting the skin on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepSawBones = {$user} is sawing through the bones on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepPriseOpenBones = {$user} is prising the bones open on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepCloseBones = {$user} is closing the bones on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepMendRibcage = {$user} is mending the ribcage on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepCloseIncision = {$user} is closing the incision on {$target}'s {$part}.
+
+surgery-popup-step-SurgeryStepInsertFeature = {$user} is inserting something onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachHead-step-SurgeryStepInsertFeature = {$user} is attaching a head onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachLeftArm-step-SurgeryStepInsertFeature = {$user} is attaching a left arm onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachRightArm-step-SurgeryStepInsertFeature = {$user} is attaching a right arm onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachLeftLeg-step-SurgeryStepInsertFeature = {$user} is attaching a left leg onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachRightLeg-step-SurgeryStepInsertFeature = {$user} is attaching a right leg onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachLeftHand-step-SurgeryStepInsertFeature = {$user} is attaching a left hand onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachRightHand-step-SurgeryStepInsertFeature = {$user} is attaching a right hand onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachLeftFoot-step-SurgeryStepInsertFeature = {$user} is attaching a left foot onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachRightFoot-step-SurgeryStepInsertFeature = {$user} is attaching a right foot onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachLegs-step-SurgeryStepInsertFeature = {$user} is attaching legs onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachHands-step-SurgeryStepInsertFeature = {$user} is attaching hands onto {$target}'s {$part}!
+surgery-popup-procedure-SurgeryAttachFeet-step-SurgeryStepInsertFeature = {$user} is attaching feet onto {$target}'s {$part}!
+
+surgery-popup-step-SurgeryStepSealWounds = {$user} is sealing the wounds on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepSawFeature = {$user} is sawing through the bones on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepClampInternalBleeders = {$user} is clamping the internal bleeders on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepRemoveFeature = {$user} is amputating {$target}'s {$part}!
+surgery-popup-step-SurgeryStepCarefulIncisionScalpel = {$user} is carefully making an incision on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepRepairBruteTissue = {$user} is repairing the damaged tissues on {$target}'s {$part}!
+surgery-popup-step-SurgeryStepRepairBurnTissue = {$user} is repairing the burnt tissues on {$target}'s {$part}!
+surgery-popup-step-SurgeryStepSealTendWound = {$user} is sealing the wounds on {$target}'s {$part}.
+surgery-popup-step-SurgeryStepInsertItem = {$user} is inserting something into {$target}'s {$part}!
+surgery-popup-step-SurgeryStepRemoveItem = {$user} is removing something from {$target}'s {$part}!
+
+surgery-popup-step-SurgeryStepRemoveOrgan = {$user} is removing an organ from {$target}'s {$part}!
+surgery-popup-step-SurgeryStepInsertOrgan = {$user} is inserting an organ into {$target}'s {$part}!
+
+surgery-popup-procedure-SurgeryRemoveBrain-step-SurgeryStepRemoveOrgan = {$user} is removing the brain from {$target}'s {$part}!
+surgery-popup-procedure-SurgeryRemoveHeart-step-SurgeryStepRemoveOrgan = {$user} is removing the heart from {$target}'s {$part}!
+surgery-popup-procedure-SurgeryRemoveLiver-step-SurgeryStepRemoveOrgan = {$user} is removing the liver from {$target}'s {$part}!
+surgery-popup-procedure-SurgeryRemoveLungs-step-SurgeryStepRemoveOrgan = {$user} is removing the lungs from {$target}'s {$part}!
+surgery-popup-procedure-SurgeryRemoveEyes-step-SurgeryStepRemoveOrgan = {$user} is removing the eyes from {$target}'s {$part}!
+surgery-popup-procedure-SurgeryRemoveStomach-step-SurgeryStepRemoveOrgan = {$user} is removing the stomach from {$target}'s {$part}!
+
+surgery-popup-procedure-SurgeryInsertBrain-step-SurgeryStepInsertOrgan = {$user} is inserting a brain into {$target}'s {$part}!
+surgery-popup-step-SurgeryStepInsertLungs = {$user} is inserting lungs into {$target}'s {$part}!
+surgery-popup-step-SurgeryStepInsertLiver = {$user} is inserting a liver into {$target}'s {$part}!
+surgery-popup-step-SurgeryStepInsertEyes = {$user} is inserting eyes into {$target}'s {$part}!
+surgery-popup-step-SurgeryStepInsertHeart = {$user} is inserting a heart into {$target}'s {$part}!
+surgery-popup-step-SurgeryStepInsertStomach = {$user} is inserting a stomach into {$target}'s {$part}!
+
+surgery-popup-step-SurgeryStepSealOrganWound = {$user} is sealing the wounds on {$target}'s {$part}.
diff --git a/Resources/Locale/en-US/_corvaxnext/surgery/surgery-ui.ftl b/Resources/Locale/en-US/_corvaxnext/surgery/surgery-ui.ftl
new file mode 100644
index 00000000000..f09c9dc102a
--- /dev/null
+++ b/Resources/Locale/en-US/_corvaxnext/surgery/surgery-ui.ftl
@@ -0,0 +1,12 @@
+surgery-ui-window-title = Surgery
+surgery-ui-window-require = Requires
+surgery-ui-window-parts = < Parts
+surgery-ui-window-surgeries = < Surgeries
+surgery-ui-window-steps = < Steps
+surgery-ui-window-steps-error-skills = You have no surgical skills.
+surgery-ui-window-steps-error-table = You need an operating table for this.
+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/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index c5ac721e589..ed4ef4b05ef 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -113,6 +113,7 @@ ui-options-header-camera = Camera
 ui-options-header-interaction-basic = Basic Interaction
 ui-options-header-interaction-adv = Advanced Interaction
 ui-options-header-ui = User Interface
+ui-options-header-targeting = Targeting
 ui-options-header-misc = Miscellaneous
 ui-options-header-hotbar = Hotbar
 ui-options-header-shuttle = Shuttle
@@ -165,6 +166,13 @@ ui-options-function-rotate-object-clockwise = Rotate clockwise
 ui-options-function-rotate-object-counterclockwise = Rotate counterclockwise
 ui-options-function-flip-object = Flip
 
+ui-options-function-target-head = Target head
+ui-options-function-target-torso = Target torso
+ui-options-function-target-left-arm = Target left arm
+ui-options-function-target-right-arm = Target right arm
+ui-options-function-target-left-leg = Target left leg
+ui-options-function-target-right-leg = Target right leg
+
 ui-options-function-focus-chat-input-window = Focus chat
 ui-options-function-focus-local-chat-window = Focus chat (IC)
 ui-options-function-focus-emote = Focus chat (Emote)
diff --git a/Resources/Locale/ru-RU/_corvaxnext/guidebook/guides.ftl b/Resources/Locale/ru-RU/_corvaxnext/guidebook/guides.ftl
new file mode 100644
index 00000000000..f25aefc662f
--- /dev/null
+++ b/Resources/Locale/ru-RU/_corvaxnext/guidebook/guides.ftl
@@ -0,0 +1,4 @@
+guide-entry-surgery = Хирургия
+guide-entry-partmanipulation = Манипулирование конечностями
+guide-entry-organmanipulation = Манипулирование органами
+guide-entry-utilitysurgeries = Особые применения
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-items.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-items.ftl
new file mode 100644
index 00000000000..15cb777981e
--- /dev/null
+++ b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-items.ftl
@@ -0,0 +1,33 @@
+ent-MedicalBiofabricator = медицинский биофабрикатор
+    .desc = Производит искусственные органы, которые могут быть установлены пациентам. Потребляет биомассу.
+
+ent-BioSynthHeart = био-синтетическое сердце
+    .desc = Искуственное сердце, которое может устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthLiver = био-синтетическая печень
+    .desc = Искуственная печень, которая может устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthLungs = био-синтетические лёгкие
+    .desc = Искуственные лёгкие, которые могут устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthEyes = био-синтетические глаза
+    .desc = Искуственные глаза, которые могут устанавливаться и адаптироваться к любому живому организму.
+
+ent-BioSynthLeftArm = био-синтетическая левая рука
+    .desc = Искуственная рука, которая может устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthRightArm = био-синтетическая правая рука
+    .desc = Искуственная рука, которая может устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthLeftHand = био-синтетическая левая ладонь
+    .desc = Искуственная ладонь, которая может устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthRightHand = био-синтетическая правая ладонь
+    .desc = Искуственная ладонь, которая может устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthLeftLeg = био-синтетическая левая нога
+    .desc = Искуственная нога, которая может устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthRightLeg = био-синтетическая правая нога
+    .desc = Искуственная нога, которая может устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthLeftFoot = био-синтетическая левая стопа
+    .desc = Искуственная стопа, которая может устанавливаться и адаптироваться к любому живому организму.
+ent-BioSynthRightFoot = био-синтетическая правая стопа
+    .desc = Искуственная стопа, которая может устанавливаться и адаптироваться к любому живому организму.
+
+ent-MedicalBiofabMachineBoard = медицинский биофабрикатор (машинная плата)
+    .desc = Машинная плата, необходимая для создания медицинского биофабрикатора.
+ent-BoneGel = бутылка костяного геля
+    .desc = Контейнер для костяного геля, нужно время от времени пополнять в специальной машине.
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-operations.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-operations.ftl
new file mode 100644
index 00000000000..dd7bfaeee9b
--- /dev/null
+++ b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-operations.ftl
@@ -0,0 +1,61 @@
+ent-SurgeryStepOpenIncisionScalpel = Порезать при помощи скальпеля
+ent-SurgeryStepClampBleeders = Остановить внешнее кровотечение
+ent-SurgeryStepRetractSkin = Втянуть кожу
+ent-SurgeryStepSawBones = Пропилить кость
+ent-SurgeryStepPriseOpenBones = Вскрыть кость
+ent-SurgeryStepCloseBones = Закрыть кость
+ent-SurgeryStepMendRibcage = Восстановить кость
+ent-SurgeryStepCloseIncision = Закрыть разрез
+
+ent-SurgeryStepInsertFeature = Прикрепить часть тела
+ent-SurgeryStepSealWounds = Прижечь раны
+ent-SurgeryStepSawFeature = Пропилить через кость
+ent-SurgeryStepClampInternalBleeders = Остановить внутреннее кровотечение
+ent-SurgeryStepRemoveFeature = Ампутировать часть тела
+
+ent-SurgeryStepCarefulIncisionScalpel = Сделать аккуратный разрез
+ent-SurgeryStepRepairBruteTissue = Восстановить механически поврежденную ткань
+ent-SurgeryStepRepairBurnTissue = Восстановить термически поврежденную ткань
+ent-SurgeryStepSealTendWound = Прижечь кровотечение
+
+ent-SurgeryStepInsertItem = Вставить предмет в полость
+ent-SurgeryStepRemoveItem = Достать предмет из полости
+
+ent-SurgeryStepRemoveOrgan = Удалить орган
+ent-SurgeryStepInsertOrgan = Вставить орган
+ent-SurgeryStepInsertLungs = Вставить лёгкие
+ent-SurgeryStepInsertLiver = Вставить печень
+ent-SurgeryStepInsertEyes = Вставить глаза
+ent-SurgeryStepInsertHeart = Вставить сердце
+
+
+ent-SurgeryOpenIncision = Открыть разрез
+ent-SurgeryCloseIncision = Закрыть разрез
+ent-SurgeryOpenRibcage = Открыть грудную клетку
+ent-SurgeryRemovePart = Удалить часть тела
+
+ent-SurgeryAttachHead = Прикрепить голову
+ent-SurgeryAttachLeftArm = Прикрепить левую руку
+ent-SurgeryAttachRightArm = Прикрепить правую руку
+ent-SurgeryAttachLeftLeg = Прикрепить левую ногу
+ent-SurgeryAttachRightLeg = Прикрепить правую ногу
+ent-SurgeryAttachLeftHand = Прикрепить левую ладонь
+ent-SurgeryAttachRightHand = Прикрепить правую ладонь
+ent-SurgeryAttachLeftFoot = Прикрепить левую стопу
+ent-SurgeryAttachRightFoot = Прикрепить правую стопу
+
+ent-SurgeryTendWoundsBrute = Восстановить механические повреждения
+ent-SurgeryTendWoundsBurn = Восстановить термические повреждения
+
+ent-SurgeryInsertItem = Вставить предмет
+
+ent-SurgeryRemoveBrain = Удалить мозг
+ent-SurgeryInsertBrain = Вставить мозг
+ent-SurgeryRemoveHeart = Удалить сердце
+ent-SurgeryInsertHeart = Вставить сердце
+ent-SurgeryRemoveLiver = Удалить печень
+ent-SurgeryInsertLiver = Вставить печень
+ent-SurgeryRemoveLungs = Удалить лёгкие
+ent-SurgeryInsertLungs = Вставить лёгкие
+ent-SurgeryRemoveEyes = Удалить глаза
+ent-SurgeryInsertEyes = Вставить глаза
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-popup.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-popup.ftl
new file mode 100644
index 00000000000..82dd9ecc384
--- /dev/null
+++ b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-popup.ftl
@@ -0,0 +1,52 @@
+surgery-popup-step-SurgeryStepOpenIncisionScalpel = {$user} делает разрез на {$part} {$target}.
+surgery-popup-step-SurgeryStepClampBleeders = {$user} пережимает внутреннее кровотечение на {$part} {$target}.
+surgery-popup-step-SurgeryStepRetractSkin = {$user} втягивает кожу на {$part} {$target}.
+surgery-popup-step-SurgeryStepSawBones = {$user} пилит через кости на {$part} {$target}.
+surgery-popup-step-SurgeryStepPriseOpenBones = {$user} вскрывает кости на {$part} {$target}.
+surgery-popup-step-SurgeryStepCloseBones = {$user} закрывает кости на {$part} {$target}.
+surgery-popup-step-SurgeryStepMendRibcage = {$user} лечит грудную клетку на {$part} {$target}.
+surgery-popup-step-SurgeryStepCloseIncision = {$user} закрывает разрез на {$part} {$target}.
+
+surgery-popup-step-SurgeryStepInsertFeature = {$user} вставляет что-то в {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachHead-step-SurgeryStepInsertFeature = {$user} присоединяет голову к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachLeftArm-step-SurgeryStepInsertFeature = {$user} присоединяет левую руку к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachRightArm-step-SurgeryStepInsertFeature = {$user} присоединяет правую руку к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachLeftLeg-step-SurgeryStepInsertFeature = {$user} присоединяет левую ногу к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachRightLeg-step-SurgeryStepInsertFeature = {$user}присоединяет правую ногу к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachLeftHand-step-SurgeryStepInsertFeature = {$user} присоединяет левую ладонь к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachRightHand-step-SurgeryStepInsertFeature = {$user} присоединяет правую ногу к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachLeftFoot-step-SurgeryStepInsertFeature = {$user} присоединяет левую стопу к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachRightFoot-step-SurgeryStepInsertFeature = {$user} присоединяет правую стопу к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachLegs-step-SurgeryStepInsertFeature = {$user} присоединяет ноги к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachHands-step-SurgeryStepInsertFeature = {$user} присоединяет руки к {$part} {$target}!
+surgery-popup-procedure-SurgeryAttachFeet-step-SurgeryStepInsertFeature = {$user} присоединяет стопы к {$part} {$target}!
+
+surgery-popup-step-SurgeryStepSealWounds = {$user} лечит раны на {$part} {$target}.
+surgery-popup-step-SurgeryStepSawFeature = {$user} пилит через кости на {$part} {$target}.
+surgery-popup-step-SurgeryStepClampInternalBleeders = {$user} пережимает внутреннее кровотечение у {$part} {$target}.
+surgery-popup-step-SurgeryStepRemoveFeature = {$user} ампутирует {$part} {$target}!
+surgery-popup-step-SurgeryStepCarefulIncisionScalpel = {$user} аккуратно закрывает разрез на {$part} {$target}.
+surgery-popup-step-SurgeryStepRepairBruteTissue = {$user} лечит механические повреждения на {$part} {$target}!
+surgery-popup-step-SurgeryStepRepairBurnTissue = {$user} лечит физические повреждения на {$part} {$target}!
+surgery-popup-step-SurgeryStepSealTendWound = {$user} закрывает раны на {$part} {$target}.
+surgery-popup-step-SurgeryStepInsertItem = {$user} вставляет что-то в {$part} {$target}!
+surgery-popup-step-SurgeryStepRemoveItem = {$user} достаёт что-то из {$part} {$target}!
+
+surgery-popup-step-SurgeryStepRemoveOrgan = {$user} удаляет орган из {$part} {$target}!
+surgery-popup-step-SurgeryStepInsertOrgan = {$user} вставляет орган в {$part} {$target}!
+
+surgery-popup-procedure-SurgeryRemoveBrain-step-SurgeryStepRemoveOrgan = {$user} удаляет мозг из {$part} {$target}!
+surgery-popup-procedure-SurgeryRemoveHeart-step-SurgeryStepRemoveOrgan = {$user} удаляет сердце из {$part} {$target}!
+surgery-popup-procedure-SurgeryRemoveLiver-step-SurgeryStepRemoveOrgan = {$user} удаляет печень из {$part} {$target}!
+surgery-popup-procedure-SurgeryRemoveLungs-step-SurgeryStepRemoveOrgan = {$user} удаляет лёгкие из {$part} {$target}!
+surgery-popup-procedure-SurgeryRemoveEyes-step-SurgeryStepRemoveOrgan = {$user} удаляет глаза из {$part} {$target}!
+surgery-popup-procedure-SurgeryRemoveStomach-step-SurgeryStepRemoveOrgan = {$user} удаляет желудок из {$part} {$target}!
+
+surgery-popup-procedure-SurgeryInsertBrain-step-SurgeryStepInsertOrgan = {$user} вставляет мозг в {$part} {$target}!
+surgery-popup-step-SurgeryStepInsertLungs = {$user} вставляет лёгкие в {$part} {$target}!
+surgery-popup-step-SurgeryStepInsertLiver = {$user} вставляет печень в {$part} {$target}!
+surgery-popup-step-SurgeryStepInsertEyes = {$user} вставляет глаза в {$part} {$target}!
+surgery-popup-step-SurgeryStepInsertHeart = {$user} вставляет сердце в {$part} {$target}!
+surgery-popup-step-SurgeryStepInsertStomach = {$user} вставляет желудок в {$part} {$target}!
+
+surgery-popup-step-SurgeryStepSealOrganWound = {$user} лечит раны на {$part} {$target}.
diff --git a/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-ui.ftl b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-ui.ftl
new file mode 100644
index 00000000000..d1a9e6e9e95
--- /dev/null
+++ b/Resources/Locale/ru-RU/_corvaxnext/surgery/surgery-ui.ftl
@@ -0,0 +1,20 @@
+ui-options-function-target-head = Прицелиться на голову
+ui-options-function-target-torso = Прицелиться на тело
+ui-options-function-target-left-arm = Прицелиться на левую руку
+ui-options-function-target-right-arm = Прицелиться на правую руку
+ui-options-function-target-left-leg = Прицелиться на левую ногу
+ui-options-function-target-right-leg = Прицелиться на правую ногу
+ui-options-header-targeting = Прицеливание
+
+surgery-ui-window-title = Хирургия
+surgery-ui-window-require = Требуется
+surgery-ui-window-parts = Части
+surgery-ui-window-surgeries = Операции
+surgery-ui-window-steps = Шаги
+
+surgery-ui-window-steps-error-skills = Не хватает навыка для операции!
+surgery-ui-window-steps-error-table = Требуется операционный стол!
+surgery-ui-window-steps-error-armor = Нужно снять с этого броню!
+surgery-ui-window-steps-error-tools = Не хватает инструментов!
+surgery-error-laying = Оно должно быть в положении лёжа!
+surgery-error-self-surgery = Вы не можете оперировать самого себя!
diff --git a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl
index 170ad03e240..d3b8cbbcb05 100644
--- a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl
+++ b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl
@@ -12,7 +12,7 @@ health-analyzer-window-entity-damage-total-text = Общие поврежден
 health-analyzer-window-damage-group-text = { $damageGroup }: { $amount }
 health-analyzer-window-damage-type-text = { $damageType }: { $amount }
 health-analyzer-window-entity-unrevivable-text = [color=red]Обнаружено уникальное строение тела! Пациент не может быть реанимирован стандартными средствами![/color]
-health-analyzer-window-entity-bleeding-text = [color=red]У пациента кровотечение![/color]
+health-analyzer-window-entity-bleeding-text = У пациента кровотечение!
 health-analyzer-window-scan-mode-text = Режим сканирования:
 health-analyzer-window-scan-mode-active = АКТИВЕН
 health-analyzer-window-scan-mode-inactive = НЕАКТИВЕН
diff --git a/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl b/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl
index 9b69dd637e2..9d912048c32 100644
--- a/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl
+++ b/Resources/Locale/ru-RU/medical/components/medical-scanner-component.ftl
@@ -2,3 +2,4 @@
 
 medical-scanner-verb-enter = Залезть
 medical-scanner-verb-noun-occupant = пациента
+health-analyzer-window-return-button-text = < НАЗАД
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/operating_table.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/operating_table.ftl
index bc4fad5d91c..c6b9ca05fd1 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/operating_table.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/tables/operating_table.ftl
@@ -1,2 +1,2 @@
 ent-OperatingTable = операционный стол
-    .desc = Специальный медицинский стол для проведения операций. Впрочем, сейчас это просто бесполезный реквизит.
+    .desc = Специальный медицинский стол для проведения операций. Смотря на него у вас неожиданно возникает ощущение быстрого течения времени...
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index e59aad9da3f..6c20ded68e6 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -41,6 +41,7 @@
     - state: lung-l
     - state: lung-r
   - type: Organ
+    slotId: lungs
   - type: Lung
   - type: Metabolizer
     removeEmpty: true
@@ -73,6 +74,7 @@
   - type: Sprite
     state: stomach
   - type: Organ
+    slotId: stomach
   - type: SolutionContainerManager
     solutions:
       stomach:
@@ -116,6 +118,8 @@
   - type: Sprite
     state: liver
   - type: Organ
+    slotId: liver
+  - type: Liver
   - type: Metabolizer
     maxReagents: 1
     metabolizerTypes: [ Animal ]
@@ -135,6 +139,8 @@
   - type: Sprite
     state: heart-on
   - type: Organ
+    slotId: heart
+  - type: Heart
   - type: Metabolizer
     maxReagents: 2
     metabolizerTypes: [ Animal ]
@@ -157,6 +163,7 @@
     - state: kidney-l
     - state: kidney-r
   - type: Organ
+    slotId: kidneys
   - type: Metabolizer
     maxReagents: 5
     metabolizerTypes: [ Animal ]
diff --git a/Resources/Prototypes/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
index f1a3d47e667..baa6674a471 100644
--- a/Resources/Prototypes/Body/Organs/Animal/slimes.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
@@ -8,6 +8,8 @@
       sprite: Mobs/Species/Slime/organs.rsi
       state: brain-slime
     - type: Stomach
+    - type: Organ
+      slotId: core
     - type: Metabolizer
       maxReagents: 3
       metabolizerTypes: [ Slime ]
@@ -38,6 +40,8 @@
         - state: lung-r-slime
     - type: Lung
       alert: LowNitrogen
+    - type: Organ
+      slotId: lungs
     - type: Metabolizer
       removeEmpty: true
       solutionOnBody: false
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index c7542ae1118..18e5e925c45 100644
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -39,6 +39,8 @@
     heldPrefix: stomach
   - type: Stomach
     updateInterval: 1.5
+  - type: Organ
+    slotId: stomach
   - type: SolutionContainerManager
     solutions:
       stomach:
@@ -62,6 +64,8 @@
       - state: lung-l
       - state: lung-r
   - type: Lung
+  - type: Organ
+    slotId: lungs
   - type: Metabolizer
     updateInterval: 1.5
     removeEmpty: true
@@ -94,9 +98,9 @@
   components:
   - type: Sprite
     state: heart-on
-  - type: Item
-    size: Small
-    heldPrefix: heart
+  - type: Heart
+  - type: Organ
+    slotId: heart
   - type: Metabolizer
     updateInterval: 1.5
     maxReagents: 2
@@ -118,6 +122,9 @@
     heldPrefix: liver
   - type: Sprite
     state: liver
+  - type: Liver
+  - type: Organ
+    slotId: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
     updateInterval: 1.5
     maxReagents: 1
@@ -157,9 +164,9 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
-  - type: Item
-    size: Small
-    heldPrefix: eyeballs
+  - type: Eyes
+  - type: Organ
+    slotId: eyes
 
 - type: entity
   id: OrganArachnidTongue
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index bf865a07fd9..04b0dae1223 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -36,6 +36,9 @@
     heldPrefix: brain
   - type: Sprite
     state: brain
+  - type: Brain
+  - type: Organ
+    slotId: brain
   - type: SolutionContainerManager
     solutions:
       organ:
@@ -62,6 +65,8 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: Eyes
+  
 
 - type: entity
   id: OrganDionaStomach
@@ -71,6 +76,8 @@
   components:
   - type: Sprite
     state: stomach
+  - type: Organ
+    slotId: stomach
   - type: SolutionContainerManager
     solutions:
       stomach:
@@ -104,11 +111,13 @@
   description: "A spongy mess of slimy, leaf-like structures. Capable of breathing both carbon dioxide and oxygen."
   components:
   - type: Sprite
-    state: lungs
-  - type: Item
-    size: Small
-    heldPrefix: lungs
-  - type: Lung 
+    sprite: Mobs/Species/Human/organs.rsi
+    layers:
+      - state: lung-l
+      - state: lung-r
+  - type: Lung
+  - type: Organ
+    slotId: lungs
   - type: Metabolizer
     removeEmpty: true
     solutionOnBody: false
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index cb1492b8a6a..3166ef0baba 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -3,36 +3,36 @@
   parent: BaseItem
   abstract: true
   components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/organs.rsi
-  - type: Organ
-  - type: Food
-  - type: Extractable
-    grindableSolutionName: organ
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: FlavorProfile
-    flavors:
-      - people
-  - type: Tag
-    tags:
-      - Meat
+    - type: Sprite
+      sprite: Mobs/Species/Human/organs.rsi
+    - type: Organ
+    - type: Food
+    - type: Extractable
+      grindableSolutionName: organ
+    - type: SolutionContainerManager
+      solutions:
+        organ:
+          reagents:
+            - ReagentId: Nutriment
+              Quantity: 10
+        food:
+          maxVol: 5
+          reagents:
+            - ReagentId: UncookedAnimalProteins
+              Quantity: 5
+    - type: FlavorProfile
+      flavors:
+        - people
+    - type: Tag
+      tags:
+        - Meat
 
 - type: entity
   id: BaseHumanOrgan
   parent: BaseHumanOrganUnGibbable
   abstract: true
   components:
-  - type: Gibbable
+    - type: Gibbable
 
 - type: entity
   id: OrganHumanBrain
@@ -40,54 +40,60 @@
   name: brain
   description: "The source of incredible, unending intelligence. Honk."
   components:
-  - type: Sprite
-    state: brain
-  - type: Organ
-  - type: Input
-    context: "ghost"
-  - type: Brain
-  - type: InputMover
-  - type: Examiner
-  - type: BlockMovement
-  - type: BadFood
-  - type: Tag
-    tags:
-      - Meat
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: GreyMatter
-          Quantity: 5
-  - type: FlavorProfile
-    flavors:
-      - people
-  - type: FoodSequenceElement
-    entries:
-      Burger: Brain
-      Taco: Brain
-  - type: Item
-    size: Small
-    heldPrefix: brain
-  
+    - type: Sprite
+      state: brain
+    - type: Organ
+      slotId: brain # _CorvaxNext: surgery
+    - type: Input
+      context: "ghost"
+    - type: Brain
+    - type: InputMover
+    - type: Examiner
+    - type: BlockMovement
+    - type: BadFood
+    - type: Tag
+      tags:
+        - Meat
+    - type: SolutionContainerManager
+      solutions:
+        organ:
+          reagents:
+            - ReagentId: Nutriment
+              Quantity: 10
+        food:
+          maxVol: 5
+          reagents:
+            - ReagentId: GreyMatter
+              Quantity: 5
+    - type: FlavorProfile
+      flavors:
+        - people
+    - type: FoodSequenceElement
+      entries:
+        Burger: Brain
+        Taco: Brain
+    - type: Item
+      size: Small
+      heldPrefix: brain
+
 - type: entity
   id: OrganHumanEyes
   parent: BaseHumanOrgan
   name: eyes
   description: "I see you!"
   components:
-  - type: Sprite
-    layers:
-      - state: eyeball-l
-      - state: eyeball-r
-  - type: Item
-    size: Small
-    heldPrefix: eyeballs
+    # start-_CorvaxNext: surgery
+    - type: Organ
+      slotId: eyes
+    - type: Eyes
+    # end-_CorvaxNext: surgery
+    - type: Sprite
+      layers:
+        - state: eyeball-l
+        - state: eyeball-r
+    - type: Item
+      size: Small
+      heldPrefix: eyeballs
 
 - type: entity
   id: OrganHumanTongue
@@ -95,19 +101,19 @@
   name: tongue
   description: "A fleshy muscle mostly used for lying."
   components:
-  - type: Sprite
-    state: tongue
+    - type: Sprite
+      state: tongue
 
 - type: entity
   id: OrganHumanAppendix
   parent: BaseHumanOrgan
   name: appendix
   components:
-  - type: Sprite
-    layers:
-    - state: appendix
-    - state: appendix-inflamed
-      visible: false
+    - type: Sprite
+      layers:
+        - state: appendix
+        - state: appendix-inflamed
+          visible: false
 
 - type: entity
   id: OrganHumanEars
@@ -117,6 +123,7 @@
   components:
   - type: Sprite
     state: ears
+  - type: Ears # _CorvaxNext: surgery
 
 - type: entity
   id: OrganHumanLungs
@@ -124,36 +131,38 @@
   name: lungs
   description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
   components:
-  - type: Sprite
-    layers:
-      - state: lung-l
-      - state: lung-r
-  - type: Item
-    size: Small
-    heldPrefix: lungs
-  - type: Lung
-  - type: Metabolizer
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Human ]
-    groups:
-    - id: Gas
-      rateModifier: 100.0
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-      Lung:
-        maxVol: 100.0
-        canReact: false
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
+    - type: Sprite
+      layers:
+        - state: lung-l
+        - state: lung-r
+    - type: Item
+      size: Small
+      heldPrefix: lungs
+    - type: Lung
+    - type: Organ # _CorvaxNext: surgery
+      slotId: lungs
+    - type: Metabolizer
+      removeEmpty: true
+      solutionOnBody: false
+      solution: "Lung"
+      metabolizerTypes: [Human]
+      groups:
+        - id: Gas
+          rateModifier: 100.0
+    - type: SolutionContainerManager
+      solutions:
+        organ:
+          reagents:
+            - ReagentId: Nutriment
+              Quantity: 10
+        Lung:
+          maxVol: 100.0
+          canReact: false
+        food:
+          maxVol: 5
+          reagents:
+            - ReagentId: UncookedAnimalProteins
+              Quantity: 5
 
 - type: entity
   id: OrganHumanHeart
@@ -161,21 +170,26 @@
   name: heart
   description: "I feel bad for the heartless bastard who lost this."
   components:
-  - type: Sprite
-    state: heart-on
-  # The heart 'metabolizes' medicines and poisons that aren't filtered out by other organs.
-  # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body.
-  # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
-  - type: Metabolizer
-    maxReagents: 2
-    metabolizerTypes: [Human]
-    groups:
-    - id: Medicine
-    - id: Poison
-    - id: Narcotic
-  - type: Item
-    size: Small
-    heldPrefix: heart
+    # start-_CorvaxNext: surgery
+    - type: Heart
+    - type: Organ
+      slotId: heart
+    # end-_CorvaxNext: surgery
+    - type: Sprite
+      state: heart-on
+    # The heart 'metabolizes' medicines and poisons that aren't filtered out by other organs.
+    # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body.
+    # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
+    - type: Metabolizer
+      maxReagents: 2
+      metabolizerTypes: [Human]
+      groups:
+        - id: Medicine
+        - id: Poison
+        - id: Narcotic
+    - type: Item
+      size: Small
+      heldPrefix: heart
 
 - type: entity
   id: OrganHumanStomach
@@ -183,31 +197,33 @@
   name: stomach
   description: "Gross. This is hard to stomach."
   components:
-  - type: Sprite
-    state: stomach
-  - type: Item
-    size: Small
-    heldPrefix: stomach
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 50
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Stomach
-  # The stomach metabolizes stuff like foods and drinks.
-  # TODO: Have it work off of the ent's solution container, and move this
-  # to intestines instead.
-  - type: Metabolizer
-    # mm yummy
-    maxReagents: 3
-    metabolizerTypes: [Human]
-    groups:
-    - id: Food
-    - id: Drink
+    - type: Sprite
+      state: stomach
+    - type: Item
+      size: Small
+      heldPrefix: stomach
+    - type: SolutionContainerManager
+      solutions:
+        stomach:
+          maxVol: 50
+        food:
+          maxVol: 5
+          reagents:
+            - ReagentId: UncookedAnimalProteins
+              Quantity: 5
+    - type: Stomach
+    - type: Organ # _CorvaxNext: surgery
+      slotId: stomach
+    # The stomach metabolizes stuff like foods and drinks.
+    # TODO: Have it work off of the ent's solution container, and move this
+    # to intestines instead.
+    - type: Metabolizer
+      # mm yummy
+      maxReagents: 3
+      metabolizerTypes: [Human]
+      groups:
+        - id: Food
+        - id: Drink
 
 - type: entity
   id: OrganHumanLiver
@@ -215,17 +231,22 @@
   name: liver
   description: "Pairing suggestion: chianti and fava beans."
   components:
-  - type: Sprite
-    state: liver
-  - type: Item
-    size: Small
-    heldPrefix: liver
-  - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
-    maxReagents: 1
-    metabolizerTypes: [Human]
-    groups:
-    - id: Alcohol
-      rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
+    # start-_CorvaxNext: surgery
+    - type: Liver
+    - type: Organ
+      slotId: liver
+    # end-_CorvaxNext: surgery
+    - type: Sprite
+      state: liver
+    - type: Item
+      size: Small
+      heldPrefix: liver
+    - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
+      maxReagents: 1
+      metabolizerTypes: [Human]
+      groups:
+        - id: Alcohol
+          rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
 
 - type: entity
   id: OrganHumanKidneys
@@ -233,15 +254,15 @@
   name: kidneys
   description: "Filters toxins from the bloodstream."
   components:
-  - type: Sprite
-    layers:
-      - state: kidney-l
-      - state: kidney-r
-  - type: Item
-    size: Small
-    heldPrefix: kidneys
-  # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
-  - type: Metabolizer
-    maxReagents: 5
-    metabolizerTypes: [Human]
-    removeEmpty: true
+    - type: Sprite
+      layers:
+        - state: kidney-l
+        - state: kidney-r
+    - type: Item
+      size: Small
+      heldPrefix: kidneys
+    # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
+    - type: Metabolizer
+      maxReagents: 5
+      metabolizerTypes: [Human]
+      removeEmpty: true
diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml
index 535c25c9d3f..2316a65eb35 100644
--- a/Resources/Prototypes/Body/Organs/moth.yml
+++ b/Resources/Prototypes/Body/Organs/moth.yml
@@ -1,5 +1,6 @@
 - type: entity
   id: OrganMothStomach
+  name: moth stomach
   parent: [OrganAnimalStomach, OrganHumanStomach]
   categories: [ HideSpawnMenu ]
   components:
diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml
index ca22d25423c..f07b734b39c 100644
--- a/Resources/Prototypes/Body/Organs/slime.yml
+++ b/Resources/Prototypes/Body/Organs/slime.yml
@@ -8,6 +8,8 @@
       sprite: Mobs/Species/Slime/organs.rsi
       state: brain-slime
     - type: Stomach
+    - type: Organ
+      slotId: core
     - type: Metabolizer
       maxReagents: 6
       metabolizerTypes: [ Slime ]
@@ -49,6 +51,8 @@
     layers:
       - state: lung-l-slime
       - state: lung-r-slime
+  - type: Organ
+    slotId: lungs
   - type: Lung
     alert: LowNitrogen
   - type: Metabolizer
diff --git a/Resources/Prototypes/Body/Organs/vox.yml b/Resources/Prototypes/Body/Organs/vox.yml
index 70e07832712..0e071571e10 100644
--- a/Resources/Prototypes/Body/Organs/vox.yml
+++ b/Resources/Prototypes/Body/Organs/vox.yml
@@ -1,5 +1,6 @@
 - type: entity
   id: OrganVoxLungs
+  name: vox lungs
   parent: OrganHumanLungs
   description: "The blue, anaerobic lungs of a vox, they intake nitrogen to breathe. Any form of gaseous oxygen is lethally toxic if breathed in."
   suffix: "vox"
diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml
index 347b052c8bc..e9e529ad3a8 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 # _CorvaxNext: surgery Shitmed
   - type: BodyPart
   - type: ContainerContainer
     containers:
@@ -94,3 +94,13 @@
       - ReagentId: Blood
         Quantity: 20
 
+# Monkey head for borging/transplanting pun pun
+- type: entity
+  parent: [PartAnimal, BaseHead]
+  id: HeadAnimal
+  name: animal head
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - state: head_m
diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml
index 836d0f140af..8c1577924d6 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,9 +5,15 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: Biological
+    damageContainer: OrganicPart # _CorvaxNext: surgery
   - type: BodyPart
-  - type: Gibbable
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTool
+    startSound:
+      path: /Audio/Medical/Surgery/organ1.ogg
+    endSound:
+      path: /Audio/Medical/Surgery/organ2.ogg
+  # end-_CorvaxNext: surgery
   - type: ContainerContainer
     containers:
       bodypart: !type:Container
@@ -19,6 +23,38 @@
   - type: Tag
     tags:
       - Trash
+  # start-_CorvaxNext: surgery
+  - type: Gibbable # _CorvaxNext: surgery
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 150 # was 75 . TODO gettin dissapear if lower than dettach health
+      behaviors:
+      - !type:GibPartBehavior { }
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Slash
+        damage: 200 # was 100 . TODO gettin dissapear if lower than dettach health
+      behaviors:
+      - !type:GibPartBehavior { }
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 400 # was 200 . TODO gettin dissapear if lower than dettach health
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawnInContainer: true
+        spawn:
+          Ash:
+            min: 1
+            max: 1
+      - !type:BurnBodyBehavior { }
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MeatLaserImpact
+  # end-_CorvaxNext: surgery
 
 - type: entity
   id: BaseTorso
@@ -28,6 +64,13 @@
   components:
   - type: BodyPart
     partType: Torso
+  # start-_CorvaxNext: surgery
+    toolName: "a torso"
+    containerName: "torso_slot"
+  - type: ContainerContainer
+    containers:
+      torso_slot: !type:ContainerSlot {}
+  # end-_CorvaxNext: surgery
 
 - type: entity
   id: BaseHead
@@ -37,6 +80,7 @@
   components:
   - type: BodyPart
     partType: Head
+    toolName: "a head" # _CorvaxNext: surgery
     vital: true
   - type: Input
     context: "ghost"
@@ -53,6 +97,7 @@
   - type: BodyPart
     partType: Arm
     symmetry: Left
+    toolName: "a left arm" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseRightArm
@@ -63,6 +108,7 @@
   - type: BodyPart
     partType: Arm
     symmetry: Right
+    toolName: "a right arm" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseLeftHand
@@ -73,6 +119,7 @@
   - type: BodyPart
     partType: Hand
     symmetry: Left
+    toolName: "a left hand" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseRightHand
@@ -83,6 +130,7 @@
   - type: BodyPart
     partType: Hand
     symmetry: Right
+    toolName: "a right hand" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseLeftLeg
@@ -93,6 +141,7 @@
   - type: BodyPart
     partType: Leg
     symmetry: Left
+    toolName: "a left leg" # _CorvaxNext: surgery
   - type: MovementBodyPart
 
 - type: entity
@@ -104,6 +153,7 @@
   - type: BodyPart
     partType: Leg
     symmetry: Right
+    toolName: "a right leg" # _CorvaxNext: surgery
   - type: MovementBodyPart
 
 - type: entity
@@ -115,6 +165,7 @@
   - type: BodyPart
     partType: Foot
     symmetry: Left
+    toolName: "a left foot" # _CorvaxNext: surgery
 
 - type: entity
   id: BaseRightFoot
@@ -125,3 +176,4 @@
   - type: BodyPart
     partType: Foot
     symmetry: Right
+    toolName: "a right foot" # _CorvaxNext: surgery
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
index 6b2b3f57d26..213a20b15be 100644
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -25,7 +25,12 @@
   - type: GuideHelp
     guides:
     - Cyborgs
-    - Robotics
+  - type: SurgeryTool
+    startSound:
+      path: /Audio/Medical/Surgery/organ1.ogg
+    endSound:
+      path: /Audio/Medical/Surgery/organ2.ogg
+  - type: Gibbable
 
 - type: entity
   id: BaseBorgArmLeft
@@ -34,7 +39,7 @@
   abstract: true
   components:
   - type: BodyPart
-    partType: Hand
+    partType: Arm
     symmetry: Left
   - type: Tag
     tags:
@@ -48,7 +53,7 @@
   abstract: true
   components:
   - type: BodyPart
-    partType: Hand
+    partType: Arm
     symmetry: Right
   - type: Tag
     tags:
@@ -68,6 +73,7 @@
     tags:
     - Trash
     - BorgLeg
+  - type: MovementBodyPart
 
 - type: entity
   id: BaseBorgLegRight
@@ -82,6 +88,7 @@
     tags:
     - Trash
     - BorgLeg
+  - type: MovementBodyPart
 
 - type: entity
   id: BaseBorgHead
diff --git a/Resources/Prototypes/Body/Parts/skeleton.yml b/Resources/Prototypes/Body/Parts/skeleton.yml
index 1b378c62332..4ffd35c3107 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 # _CorvaxNext: surgery
   - type: BodyPart
   - type: ContainerContainer
     containers:
@@ -14,10 +13,41 @@
         ents: []
   - type: StaticPrice
     price: 20
-  - type: Gibbable
   - type: Tag
     tags:
       - Trash
+  # start-_CorvaxNext: surgery
+  - type: Gibbable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 75
+      behaviors:
+      - !type:GibPartBehavior { }
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Slash
+        damage: 100
+      behaviors:
+      - !type:GibPartBehavior { }
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 200
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawnInContainer: true
+        spawn:
+          Ash:
+            min: 1
+            max: 1
+      - !type:BurnBodyBehavior { }
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MeatLaserImpact
+  # end-_CorvaxNext: surgery
 
 - type: entity
   id: TorsoSkeleton
diff --git a/Resources/Prototypes/Body/Parts/vox.yml b/Resources/Prototypes/Body/Parts/vox.yml
index 9f89a0c583d..37481a87e27 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 # _CorvaxNext: surgery Shitmed
   - type: BodyPart
   - type: ContainerContainer
     containers:
diff --git a/Resources/Prototypes/Body/Prototypes/a_ghost.yml b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
index 7d358a57622..a2eaef3dd58 100644
--- a/Resources/Prototypes/Body/Prototypes/a_ghost.yml
+++ b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
@@ -6,17 +6,17 @@
     torso:
       part: TorsoHuman
       connections:
-      - right_arm
-      - left_arm
-    right_arm:
+      - right arm
+      - left arm
+    right arm:
       part: RightArmHuman
       connections:
-      - right_hand
-    left_arm:
+      - right hand
+    left arm:
       part: LeftArmHuman
       connections:
-      - left_hand
-    right_hand:
+      - left hand
+    right hand:
       part: RightHandHuman
-    left_hand:
+    left hand:
       part: LeftHandHuman
diff --git a/Resources/Prototypes/Body/Prototypes/arachnid.yml b/Resources/Prototypes/Body/Prototypes/arachnid.yml
index a3caa42a6eb..c2175076b14 100644
--- a/Resources/Prototypes/Body/Prototypes/arachnid.yml
+++ b/Resources/Prototypes/Body/Prototypes/arachnid.yml
@@ -23,6 +23,7 @@
       - left arm
       - right leg
       - left leg
+      - head
     right arm:
       part: RightArmArachnid
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/diona.yml b/Resources/Prototypes/Body/Prototypes/diona.yml
index 12ca203988c..33a65bdc5c3 100644
--- a/Resources/Prototypes/Body/Prototypes/diona.yml
+++ b/Resources/Prototypes/Body/Prototypes/diona.yml
@@ -16,6 +16,7 @@
       - left arm
       - right leg
       - left leg
+      - head
       organs:
         stomach: OrganDionaStomachNymph
         lungs: OrganDionaLungsNymph
diff --git a/Resources/Prototypes/Body/Prototypes/dwarf.yml b/Resources/Prototypes/Body/Prototypes/dwarf.yml
index 592492688b7..fb5a1753ae4 100644
--- a/Resources/Prototypes/Body/Prototypes/dwarf.yml
+++ b/Resources/Prototypes/Body/Prototypes/dwarf.yml
@@ -17,6 +17,7 @@
       - left arm
       - right leg
       - left leg
+      - head
       organs:
         heart: OrganDwarfHeart
         lungs: OrganHumanLungs
diff --git a/Resources/Prototypes/Body/Prototypes/gingerbread.yml b/Resources/Prototypes/Body/Prototypes/gingerbread.yml
index d5355be6412..d7a5d7bc1c4 100644
--- a/Resources/Prototypes/Body/Prototypes/gingerbread.yml
+++ b/Resources/Prototypes/Body/Prototypes/gingerbread.yml
@@ -17,6 +17,7 @@
       - left arm
       - right leg
       - left leg
+      - head
       organs:
         heart: OrganHumanHeart
         lungs: OrganHumanLungs
diff --git a/Resources/Prototypes/Body/Prototypes/human.yml b/Resources/Prototypes/Body/Prototypes/human.yml
index 94c77a27d73..b46e5049bbd 100644
--- a/Resources/Prototypes/Body/Prototypes/human.yml
+++ b/Resources/Prototypes/Body/Prototypes/human.yml
@@ -13,37 +13,38 @@
     torso:
       part: TorsoHuman
       connections:
-      - right_arm
-      - left_arm
-      - right_leg
-      - left_leg
+      - right arm
+      - left arm
+      - right leg
+      - left leg
+      - head
       organs:
         heart: OrganHumanHeart
         lungs: OrganHumanLungs
         stomach: OrganHumanStomach
         liver: OrganHumanLiver
         kidneys: OrganHumanKidneys
-    right_arm:
+    right arm:
       part: RightArmHuman
       connections:
-      - right_hand
-    left_arm:
+      - right hand
+    left arm:
       part: LeftArmHuman
       connections:
-      - left_hand
-    right_hand:
+      - left hand
+    right hand:
       part: RightHandHuman
-    left_hand:
+    left hand:
       part: LeftHandHuman
-    right_leg:
+    right leg:
       part: RightLegHuman
       connections:
-      - right_foot
-    left_leg:
+      - right foot
+    left leg:
       part: LeftLegHuman
       connections:
-      - left_foot
-    right_foot:
+      - left foot
+    right foot:
       part: RightFootHuman
-    left_foot:
+    left foot:
       part: LeftFootHuman
diff --git a/Resources/Prototypes/Body/Prototypes/moth.yml b/Resources/Prototypes/Body/Prototypes/moth.yml
index b3271834417..4d80ebf803a 100644
--- a/Resources/Prototypes/Body/Prototypes/moth.yml
+++ b/Resources/Prototypes/Body/Prototypes/moth.yml
@@ -23,6 +23,7 @@
       - left arm
       - right leg
       - left leg
+      - head
     right arm:
       part: RightArmMoth
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/primate.yml b/Resources/Prototypes/Body/Prototypes/primate.yml
index 2af9273be4c..4e73003b672 100644
--- a/Resources/Prototypes/Body/Prototypes/primate.yml
+++ b/Resources/Prototypes/Body/Prototypes/primate.yml
@@ -3,11 +3,19 @@
   name: "primate"
   root: torso
   slots:
+    head: # Put pun pun into a humans body
+      part: HeadAnimal
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
     torso:
       part: TorsoAnimal
       connections:
       - hands
       - legs
+      - head
       organs:
         lungs: OrganAnimalLungs
         stomach: OrganAnimalStomach
diff --git a/Resources/Prototypes/Body/Prototypes/reptilian.yml b/Resources/Prototypes/Body/Prototypes/reptilian.yml
index 1e9ebd54a48..97f9956b770 100644
--- a/Resources/Prototypes/Body/Prototypes/reptilian.yml
+++ b/Resources/Prototypes/Body/Prototypes/reptilian.yml
@@ -23,6 +23,7 @@
       - left arm
       - right leg
       - left leg
+      - head
     right arm:
       part: RightArmReptilian
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/skeleton.yml b/Resources/Prototypes/Body/Prototypes/skeleton.yml
index 16d08365610..998d01cc499 100644
--- a/Resources/Prototypes/Body/Prototypes/skeleton.yml
+++ b/Resources/Prototypes/Body/Prototypes/skeleton.yml
@@ -14,6 +14,7 @@
       - left arm
       - right leg
       - left leg
+      - head
     right arm:
       part: RightArmSkeleton
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/slime.yml b/Resources/Prototypes/Body/Prototypes/slime.yml
index b57c5eceb44..df246bb0d23 100644
--- a/Resources/Prototypes/Body/Prototypes/slime.yml
+++ b/Resources/Prototypes/Body/Prototypes/slime.yml
@@ -14,6 +14,7 @@
       - left arm
       - right leg
       - left leg
+      - head
       organs:
         core: SentientSlimeCore
         lungs: OrganSlimeLungs
diff --git a/Resources/Prototypes/Body/Prototypes/vox.yml b/Resources/Prototypes/Body/Prototypes/vox.yml
index 2a1f6d9dca7..42cbb7e0855 100644
--- a/Resources/Prototypes/Body/Prototypes/vox.yml
+++ b/Resources/Prototypes/Body/Prototypes/vox.yml
@@ -17,6 +17,7 @@
       - left arm
       - right leg
       - left leg
+      - head
       organs:
         heart: OrganHumanHeart
         lungs: OrganVoxLungs
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 75b3a290659..3b914cf822e 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -12,6 +12,7 @@
       - id: Cautery
       - id: Retractor
       - id: Scalpel
+      - id: BoneGel # _CorvaxNext: surgery
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
@@ -29,6 +30,7 @@
       - id: ScalpelAdvanced
       - id: ClothingHandsGlovesNitrile
       - id: EmergencyRollerBedSpawnFolded
+      - id: BoneGel # _CorvaxNext: surgery
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
index fe04f72899a..fafadc983fd 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -67,7 +67,11 @@
       - id: Drill
       - id: Saw
       - id: Hemostat
-      - id: ClothingMaskSterile
+      # start-_CorvaxNext: surgery
+      - id: BoneGel
+      - id: BoxLatexGloves
+      - id: BoxSterileMask
+      # end-_CorvaxNext: surgery
 
 - type: entity
   id: CrateMedicalScrubs
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index c1631537022..9e54ea81a1c 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -268,9 +268,9 @@
         - PillCanister
         - Radio
         - DiscreteHealthAnalyzer
-        - SurgeryTool
         - Dropper
       components:
+        - SurgeryTool
         - Hypospray
         - Injector
         - Pill
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 2280c3fecb8..c50ee23de60 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -385,7 +385,8 @@
         damageType: Blunt
         damage: 10
       behaviors:
-      - !type:GibBehavior { }
+      - !type:GibBehavior
+        gibContents: Skip
   - type: NonSpreaderZombie
   - type: SentienceTarget
     flavorKind: station-event-random-sentience-flavor-organic
@@ -562,6 +563,8 @@
     interfaces:
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui # _CorvaxNext: surgery
   - type: InventorySlots
   - type: Inventory
     speciesId: hamster
@@ -592,7 +595,7 @@
           32:
             sprite: Mobs/Animals/mothroach/displacement.rsi
             state: neck
-
+  - type: SurgeryTarget # _CorvaxNext: surgery
 
 # Note that the mallard duck is actually a male drake mallard, with the brown duck being the female variant of the same species, however ss14 lacks sex specific textures
 # The white duck is more akin to a pekin or call duck.
@@ -668,6 +671,13 @@
   - type: NpcFactionMember
     factions:
     - Passive
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTarget
+  - type: UserInterface
+    interfaces:
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui
+  # end-_CorvaxNext: surgery
 
 - type: entity
   name: white duck #Quack
@@ -923,6 +933,13 @@
       task: RuminantCompound
   - type: Body
     prototype: AnimalHemocyanin
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTarget
+  - type: UserInterface
+    interfaces:
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui
+  # end-_CorvaxNext: surgery
 
 - type: entity
   name: goat
@@ -1016,6 +1033,11 @@
   - type: HTN
     rootTask:
       task: RuminantHostileCompound
+  - type: SurgeryTarget
+  - type: UserInterface
+    interfaces:
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui
 
 # Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked.
 - type: entity
@@ -1227,6 +1249,8 @@
   abstract: true
   components:
   - type: CombatMode
+  - type: SurgeryTarget
+  - type: Targeting
   - type: Inventory
     templateId: monkey
     speciesId: monkey
@@ -1248,6 +1272,13 @@
         layer:
         - MobLayer
   - type: Stripping
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui
   - type: Sprite
     drawdepth: Mobs
     layers:
@@ -1757,6 +1788,13 @@
       Taco: RatTaco
       Burger: RatBurger
       Skewer: RatSkewer
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTarget
+  - type: UserInterface
+    interfaces:
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui
+  # end-_CorvaxNext: surgery
 
 - type: entity
   parent: MobMouse
@@ -2401,6 +2439,13 @@
       groups:
         Brute: -0.07
         Burn: -0.07
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTarget
+  - type: UserInterface
+    interfaces:
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui
+  # end-_CorvaxNext: surgery
 
 - type: entity
   name: tarantula
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 233b2f90308..eb52d04aaa0 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -248,6 +248,11 @@
         types:
           Slash: 10
           Bloodloss: 5
+    - type: SurgeryTarget
+    - type: UserInterface
+      interfaces:
+        enum.SurgeryUIKey.Key:
+          type: SurgeryBui
 
 - type: entity
   id: MobSharkSalvage
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 9b3c9c9ad4e..2dcdddd06ac 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -124,6 +124,13 @@
   - type: Sharp
   - type: TTS # Corvax-TTS
     voice: Rat
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTarget
+  - type: UserInterface
+    interfaces:
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui
+  # end-_CorvaxNext: surgery
 
 - type: entity
   id: MobRatKingBuff
@@ -201,7 +208,11 @@
     - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
       state: eyes
       shader: unshaded
-
+  - type: SurgeryTarget
+  - type: UserInterface
+    interfaces:
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui
   - type: SpriteMovement
     movementLayers:
       movement:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 54705bf40d1..38125b92de9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -112,6 +112,13 @@
     speechSounds: Slime
   - type: TypingIndicator
     proto: slime
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTarget
+  - type: UserInterface
+    interfaces:
+      enum.SurgeryUIKey.Key:
+        type: SurgeryBui
+  # end-_CorvaxNext: surgery
 
 - type: entity
   name: basic slime
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 9e8a070559d..c82e206738c 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -187,6 +187,8 @@
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
+      enum.SurgeryUIKey.Key: # _CorvaxNext: surgery
+        type: SurgeryBui
   - type: Puller
   - type: Speech
     speechSounds: Alto
@@ -211,6 +213,8 @@
     - FootstepSound
     - DoorBumpOpener
     - AnomalyHost
+  - type: Targeting # _CorvaxNext: surgery
+  - type: SurgeryTarget # _CorvaxNext: surgery
 
 - type: entity
   save: false
@@ -223,6 +227,7 @@
   id: BaseMobSpeciesOrganic
   abstract: true
   components:
+  - type: Targeting # _CorvaxNext: surgery
   - type: OfferItem # Corvax-Next-Offer
   - type: Barotrauma
     damage:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index 1185d61c4b4..5434f8de086 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -39,7 +39,8 @@
         !type:DamageTrigger
         damage: 150
       behaviors:
-      - !type:GibBehavior { }
+      - !type:GibBehavior
+        gibContents: Skip
   - type: SlowOnDamage #modified speeds because they're so weak
     speedModifierThresholds:
       60: 0.9
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 4287d6ba56d..abd5f5308af 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: # _CorvaxNext: surgery
+        type: SurgeryBui
   # to prevent bag open/honk spam
   - type: UseDelay
     delay: 0.5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 5b0c97dc837..5940027defe 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -8,9 +8,10 @@
   - type: Sprite
   - type: StaticPrice
     price: 20
-  - type: Tag
-    tags:
-    - SurgeryTool
+#  - type: Tag
+#    tags:
+#    - SurgeryTool
+  - type: SurgeryTool # _CorvaxNext: surgery
 
 # Cautery
 
@@ -32,6 +33,14 @@
         Heat: 5
     soundHit:
       path: /Audio/Effects/lightburn.ogg
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTool
+    startSound:
+      path: /Audio/Medical/Surgery/cautery1.ogg
+    endSound:
+      path: /Audio/Medical/Surgery/cautery2.ogg
+  - type: Cautery
+  # end-_CorvaxNext: surgery
 
 # Drill
 
@@ -57,6 +66,12 @@
       path: /Audio/Items/drill_hit.ogg
   - type: StaticPrice
     price: 40
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTool
+    startSound:
+      path: /Audio/Medical/Surgery/saw.ogg
+  - type: SurgicalDrill
+  # end-_CorvaxNext: surgery
 
 # Scalpel
 
@@ -90,6 +105,15 @@
         Slash: 8
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTool
+    startSound:
+      path: /Audio/Medical/Surgery/scalpel1.ogg
+    endSound:
+      path: /Audio/Medical/Surgery/scalpel2.ogg
+  - type: Scalpel
+  # end-_CorvaxNext: surgery
+
 
 - type: entity
   name: shiv
@@ -142,25 +166,63 @@
   - type: Item
     sprite: Objects/Specific/Medical/Surgery/scissors.rsi
     storedRotation: 90
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTool
+    startSound:
+      path: /Audio/Medical/Surgery/retractor1.ogg
+    endSound:
+      path: /Audio/Medical/Surgery/retractor2.ogg
+  - type: Retractor
+  # end-_CorvaxNext: surgery
 
 - type: entity
   name: hemostat
   id: Hemostat
-  parent: Retractor
+  parent: BaseToolSurgery # _CorvaxNext
   description: A surgical tool used to compress blood vessels to prevent bleeding.
   components:
   - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
     state: hemostat
   - type: Item
     heldPrefix: hemostat
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
     storedRotation: 90
+  # start-_CorvaxNext: surgery
+  - type: SurgeryTool
+    startSound:
+      path: /Audio/Medical/Surgery/retractor1.ogg
+    endSound:
+      path: /Audio/Medical/Surgery/hemostat1.ogg
+  - type: Hemostat
+  # end-_CorvaxNext: surgery
+
+# Bone setter
+- type: entity
+  parent: BaseToolSurgery
+  id: Bonesetter
+  name: bone setter
+  description: Used for setting bones back into place.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/bonesetter.rsi
+    state: bonesetter
+  - type: Item
+    sprite: Objects/Specific/Medical/Surgery/bonesetter.rsi
+  - type: BoneSetter
+
+# Bone Gel
+- type: entity
+  parent: BaseToolSurgery
+  id: BoneGel
+  name: bottle of bone gel
+  description: A container for bone gel that often needs to be refilled from a specialized machine.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/bone_gel.rsi
+    state: bone-gel
+  - type: BoneGel
 
-  # - type: entity
-  #   name: bone setter
-  #   id: BoneSetter
-  #   parent: Retractor
-  #   description: A surgical tool used for setting bones.
-  #   components:
 # Saws
 
 - type: entity
@@ -183,7 +245,20 @@
   - type: Tool
     qualities:
       - Sawing
-# No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.
+    speedModifier: 1.0
+  # start-_CorvaxNext: surgery
+  - type: MeleeWeapon
+    attackRate: 0.75
+    range: 1.35
+    damage:
+      types:
+        Blunt: 2.5
+        Slash: 6.5
+    angle: 20
+  - type: BoneSaw
+  # end-_CorvaxNext: surgery
+# --No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.--
+# No, I'm going to saw through your bones.
 
 - type: entity
   name: choppa
@@ -202,8 +277,13 @@
         Brute: 10
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
+  # start-_CorvaxNext: surgery
   - type: Tool
+    qualities:
+      - Sawing
     speedModifier: 0.5
+  - type: BoneSaw
+  # end-_CorvaxNext: surgery
 
 - type: entity
   name: circular saw
@@ -221,8 +301,16 @@
         Brute: 15
     soundHit:
       path: /Audio/Items/drill_hit.ogg
+  # start-_CorvaxNext: surgery
   - type: Tool
+    qualities:
+      - Sawing
     speedModifier: 1.5
+  - type: SurgeryTool
+    startSound:
+      path: /Audio/Medical/Surgery/saw.ogg
+  - type: BoneSaw
+  # end-_CorvaxNext: surgery
 
 - type: entity
   name: advanced circular saw
@@ -236,5 +324,10 @@
     heldPrefix: advanced
   - type: MeleeWeapon
     attackRate: 1.5
+  # start-_CorvaxNext: surgery
   - type: Tool
+    qualities:
+      - Sawing
     speedModifier: 2.0
+  - type: BoneSaw
+  # end-_CorvaxNext: surgery
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
index 75cffd91f54..6d8437934c2 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
@@ -11,3 +11,4 @@
   - type: Icon
     sprite: Structures/Furniture/Tables/optable.rsi
     state: operating_table
+  - type: OperatingTable # _CorvaxNext
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 3dffc98d961..0361401c4a5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -934,6 +934,7 @@
       - MedkitRadiation
       - MedkitCombat
       - Scalpel
+      - BoneGel # _CorvaxNext
       - Retractor
       - Cautery
       - Drill
diff --git a/Resources/Prototypes/EntityLists/Tools/surgery.yml b/Resources/Prototypes/EntityLists/Tools/surgery.yml
index 20f689d272d..072a754c501 100644
--- a/Resources/Prototypes/EntityLists/Tools/surgery.yml
+++ b/Resources/Prototypes/EntityLists/Tools/surgery.yml
@@ -1,10 +1,14 @@
 - type: entityList
   id: surgerytools
   entities:
+  - Scalpel
   - Cautery
   - Drill
   - ScalpelLaser
   - Retractor
   - Hemostat
-  - SawAdvanced
-# - Drapes
+  - SawElectric
+  - Bonesetter
+  - BoneGel
+  - Saw
+# - Drapes
\ No newline at end of file
diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml
index 0c7b1c781e4..422d7d6faab 100644
--- a/Resources/Prototypes/Guidebook/medical.yml
+++ b/Resources/Prototypes/Guidebook/medical.yml
@@ -7,6 +7,7 @@
   - Chemist
   - Cloning
   - Cryogenics
+  - Surgery
 
 - type: guideEntry
   id: Medical Doctor
@@ -50,3 +51,31 @@
   id: AdvancedBrute
   name: guide-entry-brute
   text: "/ServerInfo/Guidebook/Medical/AdvancedBrute.xml"
+
+- type: guideEntry
+  id: Surgery
+  name: guide-entry-surgery
+  text: "/ServerInfo/Corvax/Guidebook/Medical/Surgery.xml"
+  children:
+  - Part Manipulation
+  - Organ Manipulation
+  - Utility Surgeries
+
+- type: guideEntry
+  id: Part Manipulation
+  name: guide-entry-partmanipulation
+  text: "/ServerInfo/Corvax/Guidebook/Medical/PartManipulation.xml"
+  filterEnabled: true
+
+- type: guideEntry
+  id: Organ Manipulation
+  name: guide-entry-organmanipulation
+  text: "/ServerInfo/Corvax/Guidebook/Medical/OrganManipulation.xml"
+  filterEnabled: true
+
+- type: guideEntry
+  id: Utility Surgeries
+  name: guide-entry-utilitysurgeries
+  text: "/ServerInfo/Corvax/Guidebook/Medical/UtilitySurgeries.xml"
+  filterEnabled: true
+
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 9ef508feead..7af730061e1 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -243,23 +243,13 @@
         - !type:ReagentThreshold
           reagent: NitrousOxide
           min: 0.2
+          max: 0.5
         - !type:OrganType
           type: Slime
           shouldHave: false
         emote: Laugh
         showInChat: true
         probability: 0.1
-      - !type:Emote
-        conditions:
-        - !type:ReagentThreshold
-          reagent: NitrousOxide
-          min: 0.2
-        - !type:OrganType
-          type: Slime
-          shouldHave: false
-        emote: Scream
-        showInChat: true
-        probability: 0.01
       - !type:PopupMessage
         conditions:
         - !type:ReagentThreshold
@@ -286,13 +276,13 @@
         conditions:
         - !type:ReagentThreshold
           reagent: NitrousOxide
-          min: 1.8
+          min: 1
         - !type:OrganType
           type: Slime
           shouldHave: false
         key: ForcedSleep
         component: ForcedSleeping
-        time: 3
+        time: 6 # This reeks, but I guess it works LMAO
         type: Add
       - !type:HealthChange
         conditions:
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index cf9a10cd23c..50901af3763 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -14,6 +14,14 @@
   - Medical
   - Chemistry
   - Maintenance
+  special:
+    #start-_CorvaxNext: surgery
+  - !type:AddComponentSpecial
+    components:
+    #- type: CPRTraining
+    - type: SurgerySpeedModifier
+      SpeedModifier: 1.75
+    #end-_CorvaxNext: surgery
 
 - type: startingGear
   id: ChemistGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index fa6ddec09c2..4b1a3113915 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -36,7 +36,12 @@
     implants: [ MindShieldImplant ]
   - !type:AddComponentSpecial
     components:
-      - type: CommandStaff
+    - type: CommandStaff
+    #start-_CorvaxNext: surgery
+    #- type: CPRTraining
+    - type: SurgerySpeedModifier
+      SpeedModifier: 2.5
+    #end-_CorvaxNext: surgery
 
 - type: startingGear
   id: CMOGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index 42c388f9b74..13ffa053658 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -15,6 +15,14 @@
   - Maintenance
   extendedAccess:
   - Chemistry
+  special:
+  - !type:AddComponentSpecial
+    components:
+    #start-_CorvaxNext: surgery
+    #- type: CPRTraining
+    - type: SurgerySpeedModifier
+      SpeedModifier: 1.75
+    #end-_CorvaxNext: surgery
 
 - type: startingGear
   id: DoctorGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index 75496e43f42..77ccbaabea5 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -15,6 +15,14 @@
   access:
   - Medical
   - Maintenance
+  special:
+  - !type:AddComponentSpecial
+    components:
+    #start-_CorvaxNext: surgery
+    #- type: CPRTraining
+    - type: SurgerySpeedModifier
+      SpeedModifier: 1.5
+    #end-_CorvaxNext: surgery
 
 - type: startingGear
   id: MedicalInternGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 166f9ac42b7..79c50097dd9 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -17,6 +17,14 @@
   - Maintenance
   extendedAccess:
   - Chemistry
+  special:
+  - !type:AddComponentSpecial
+    components:
+    #start-_CorvaxNext: surgery
+    #- type: CPRTraining
+    - type: SurgerySpeedModifier
+      SpeedModifier: 1.75
+    #end-_CorvaxNext: surgery
 
 - type: startingGear
   id: ParamedicGear
diff --git a/Resources/Prototypes/_CorvaxNext/Damage/containers.yml b/Resources/Prototypes/_CorvaxNext/Damage/containers.yml
new file mode 100644
index 00000000000..d0b21f5ad7b
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Damage/containers.yml
@@ -0,0 +1,5 @@
+- type: damageContainer
+  id: OrganicPart # _CorvaxNext: surgery
+  supportedGroups:
+  - Brute
+  - Burn
diff --git a/Resources/Prototypes/_CorvaxNext/Damage/modifier_sets.yml b/Resources/Prototypes/_CorvaxNext/Damage/modifier_sets.yml
new file mode 100644
index 00000000000..1f257af3349
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Damage/modifier_sets.yml
@@ -0,0 +1,11 @@
+# _CorvaxNext: 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/_CorvaxNext/Entities/Machines/lathe.yml b/Resources/Prototypes/_CorvaxNext/Entities/Machines/lathe.yml
new file mode 100644
index 00000000000..f6e944a67b6
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Entities/Machines/lathe.yml
@@ -0,0 +1,42 @@
+- type: entity
+  id: MedicalBiofabricator
+  parent: BaseLathe
+  name: medical biofabricator
+  description: Produces organs and other organic matter that can be surgically grafted onto patients with biomass.
+  components:
+  - type: Sprite
+    sprite: Structures/Machines/limbgrower.rsi
+    snapCardinals: true
+    layers:
+    - state: limbgrower_idleoff
+      map: ["enum.LatheVisualLayers.IsRunning"]
+#    - state: limbgrower_idleoff
+#      shader: unshaded
+#      map: ["enum.PowerDeviceVisualLayers.Powered"]
+#    - state: inserting
+#      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+#    - state: panel
+#      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: MedicalBiofabMachineBoard
+  - type: MaterialStorage
+    whitelist:
+      tags:
+        - Sheet
+        - RawMaterial
+  - type: Lathe
+    idleState: limbgrower_idleoff
+    runningState: limbgrower_idleon
+    staticRecipes:
+    - SynthLiver
+    - SynthHeart
+    - SynthLungs
+    - SynthEyes
+    - SynthLeftLeg
+    - SynthRightLeg
+    - SynthLeftFoot
+    - SynthRightFoot
+    - SynthLeftArm
+    - SynthRightArm
+    - SynthLeftHand
+    - SynthRightHand
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Circuitboards/production.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Circuitboards/production.yml
new file mode 100644
index 00000000000..547eaa54001
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Circuitboards/production.yml
@@ -0,0 +1,13 @@
+- type: entity
+  id: MedicalBiofabMachineBoard
+  parent: BaseMachineCircuitboard
+  name: medical biofab machine board
+  description: A machine printed circuit board for a medical biofab.
+  components:
+    - type: Sprite
+      state: medical
+    - type: MachineBoard
+      prototype: MedicalBiofabricator
+#      requirements:
+#        MatterBin: 2
+#        Manipulator: 2
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Medical/surgery.yml
new file mode 100644
index 00000000000..002de50e50a
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Specific/Medical/surgery.yml
@@ -0,0 +1,76 @@
+# ORGANS
+
+- type: entity
+  parent: OrganHumanHeart
+  id: BioSynthHeart
+  name: bio-synthetic heart
+  description: This heart can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: OrganHumanLiver
+  id: BioSynthLiver
+  name: bio-synthetic liver
+  description: This liver can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: OrganHumanLungs
+  id: BioSynthLungs
+  name: bio-synthetic lungs
+  description: These lungs can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: OrganHumanEyes
+  id: BioSynthEyes
+  name: bio-synthetic eyes
+  description: These eyes can be transplanted into any living organism and it will adapt to its recipient.
+
+
+# PARTS
+
+- type: entity
+  parent: LeftArmHuman
+  id: BioSynthLeftArm
+  name: bio-synthetic left arm
+  description: This left arm can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: RightArmHuman
+  id: BioSynthRightArm
+  name: bio-synthetic right arm
+  description: This right arm can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: LeftHandHuman
+  id: BioSynthLeftHand
+  name: bio-synthetic left hand
+  description: This left hand can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: RightHandHuman
+  id: BioSynthRightHand
+  name: bio-synthetic right hand
+  description: This right hand can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: LeftLegHuman
+  id: BioSynthLeftLeg
+  name: bio-synthetic left leg
+  description: This left leg can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: RightLegHuman
+  id: BioSynthRightLeg
+  name: bio-synthetic right leg
+  description: This right leg can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: LeftFootHuman
+  id: BioSynthLeftFoot
+  name: bio-synthetic left foot
+  description: This left foot can be transplanted into any living organism and it will adapt to its recipient.
+
+- type: entity
+  parent: RightFootHuman
+  id: BioSynthRightFoot
+  name: bio-synthetic right foot
+  description: This right foot can be transplanted into any living organism and it will adapt to its recipient.
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgeries.yml b/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgeries.yml
new file mode 100644
index 00000000000..43d8adfd6ed
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgeries.yml
@@ -0,0 +1,642 @@
+- type: entity
+  id: SurgeryBase
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryOpenIncision
+  name: Open Incision
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    steps:
+    - SurgeryStepOpenIncisionScalpel
+    - SurgeryStepRetractSkin
+    - SurgeryStepClampBleeders
+  - type: SurgeryPartPresentCondition
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryCloseIncision
+  name: Close Incision
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    priority: 1
+    steps:
+    - SurgeryStepCloseBones
+    - SurgeryStepMendRibcage
+    - SurgeryStepCloseIncision
+  - type: SurgeryPartPresentCondition
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryOpenRibcage
+  name: Open Ribcage
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepPriseOpenBones
+  - type: SurgeryPartCondition
+    part: Torso
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryRemovePart
+  name: Remove Part
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepSawFeature
+    - SurgeryStepClampInternalBleeders
+    - SurgeryStepRemoveFeature
+  - type: SurgeryPartCondition
+    part: Torso
+    inverse: true
+
+# I fucking hate hardcoding all of this shit to accomodate for surgery BUI.
+# If anyone can give me pointers on how to make it better I'd be incredibly grateful.
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachHead
+  name: Attach Head
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryPartRemovedCondition
+    connection: head
+    part: Head
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachLeftArm
+  name: Attach Left Arm
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryPartRemovedCondition
+    connection: left arm
+    part: Arm
+    symmetry: Left
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachRightArm
+  name: Attach Right Arm
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryPartRemovedCondition
+    connection: right arm
+    part: Arm
+    symmetry: Right
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachLeftLeg
+  name: Attach Left Leg
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryPartRemovedCondition
+    connection: left leg
+    part: Leg
+    symmetry: Left
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachRightLeg
+  name: Attach Right Leg
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryPartRemovedCondition
+    connection: right leg
+    part: Leg
+    symmetry: Right
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachLeftHand
+  name: Attach Left Hand
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Arm
+    symmetry: Left
+  - type: SurgeryPartRemovedCondition
+    connection: left hand
+    part: Hand
+    symmetry: Left
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachRightHand
+  name: Attach Right Hand
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Arm
+    symmetry: Right
+  - type: SurgeryPartRemovedCondition
+    connection: right hand
+    part: Hand
+    symmetry: Right
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachLeftFoot
+  name: Attach Left Foot
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Leg
+    symmetry: Left
+  - type: SurgeryPartRemovedCondition
+    connection: left foot
+    part: Foot
+    symmetry: Left
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachRightFoot
+  name: Attach Right Foot
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Leg
+    symmetry: Right
+  - type: SurgeryPartRemovedCondition
+    connection: right foot
+    part: Foot
+    symmetry: Right
+
+# Surgery for animals - They have a single legs/hands entity.
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachLegs
+  name: Attach Legs
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryPartRemovedCondition
+    connection: legs
+    part: Leg
+    symmetry: None
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachHands
+  name: Attach Hands
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryPartRemovedCondition
+    connection: hands
+    part: Hand
+    symmetry: Left # shitcode i guess because of ui icons
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryAttachFeet
+  name: Attach Feet
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepInsertFeature
+    - SurgeryStepSealWounds
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryPartRemovedCondition
+    connection: feet
+    part: Foot
+    symmetry: None
+
+#- type: entity
+#  parent: SurgeryBase
+#  id: SurgeryAlienEmbryoRemoval
+#  name: Alien Embryo Removal
+#  description: Removal of an alien embryo from the body.
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: Surgery
+#    priority: -1
+#    requirement: SurgeryOpenRibcage
+#    steps:
+#    - SurgeryStepCutLarvaRoots
+#    - SurgeryStepRemoveLarva
+#  - type: SurgeryLarvaCondition
+#  - type: SurgeryPartCondition
+#    part: Torso
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryTendWoundsBrute
+  name: Tend Bruise Wounds
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    steps:
+    - SurgeryStepCarefulIncisionScalpel
+    - SurgeryStepRepairBruteTissue
+    - SurgeryStepSealTendWound
+  - type: SurgeryWoundedCondition
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryTendWoundsBurn
+  name: Tend Burn Wounds
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    steps:
+    - SurgeryStepCarefulIncisionScalpel
+    - SurgeryStepRepairBurnTissue
+    - SurgeryStepSealTendWound
+  - type: SurgeryWoundedCondition
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryInsertItem
+  name: Cavity Implant
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenRibcage
+    steps:
+    - SurgeryStepInsertItem
+    - SurgeryStepRemoveItem
+  - type: SurgeryPartCondition
+    part: Torso
+
+# Note for any Organ manipulation surgeries. Most of the organs are only defined on the server.
+# I added some of them to the client too, but we should probably move them to a shared
+# prototype at some point.
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryRemoveBrain
+  name: Remove Brain
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepClampInternalBleeders
+    - SurgeryStepRemoveOrgan
+  - type: SurgeryPartCondition
+    part: Head
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Brain
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryInsertBrain
+  name: Insert Brain
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepInsertOrgan
+    - SurgeryStepSealOrganWound
+  - type: SurgeryPartCondition
+    part: Head
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Brain
+    inverse: true
+    reattaching: true
+
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryRemoveHeart
+  name: Remove Heart
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenRibcage
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepClampInternalBleeders
+    - SurgeryStepRemoveOrgan
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Heart
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryInsertHeart
+  name: Insert Heart
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenRibcage
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepInsertHeart
+    - SurgeryStepSealOrganWound
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Heart
+    inverse: true
+    reattaching: true
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryRemoveLiver
+  name: Remove Liver
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenRibcage
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepClampInternalBleeders
+    - SurgeryStepRemoveOrgan
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Liver
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryInsertLiver
+  name: Insert Liver
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenRibcage
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepInsertLiver
+    - SurgeryStepSealOrganWound
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Liver
+    inverse: true
+    reattaching: true
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryRemoveLungs
+  name: Remove Lungs
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenRibcage
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepClampInternalBleeders
+    - SurgeryStepRemoveOrgan
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Lung
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryInsertLungs
+  name: Insert Lungs
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenRibcage
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepInsertLungs
+    - SurgeryStepSealOrganWound
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Lung
+    inverse: true
+    reattaching: true
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryRemoveStomach
+  name: Remove Stomach
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenRibcage
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepClampInternalBleeders
+    - SurgeryStepRemoveOrgan
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Stomach
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryInsertStomach
+  name: Insert Stomach
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenRibcage
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepInsertStomach
+    - SurgeryStepSealOrganWound
+  - type: SurgeryPartCondition
+    part: Torso
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Stomach
+    inverse: true
+    reattaching: true
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryRemoveEyes
+  name: Remove Eyes
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepClampInternalBleeders
+    - SurgeryStepRemoveOrgan
+  - type: SurgeryPartCondition
+    part: Head
+  - type: SurgeryOrganCondition
+    organ:
+    - type: Eyes
+
+- type: entity
+  parent: SurgeryBase
+  id: SurgeryInsertEyes
+  name: Insert Eyes
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Surgery
+    requirement: SurgeryOpenIncision
+    steps:
+    - SurgeryStepSawBones
+    - SurgeryStepInsertEyes
+    - SurgeryStepSealOrganWound
+  - type: SurgeryPartCondition
+    part: Head
+  - type: SurgeryOrganCondition
+    organ:
+    - 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/_CorvaxNext/Entities/Surgery/surgery_steps.yml b/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgery_steps.yml
new file mode 100644
index 00000000000..b157e6425d5
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Entities/Surgery/surgery_steps.yml
@@ -0,0 +1,570 @@
+- type: entity
+  id: SurgeryStepBase
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepOpenIncisionScalpel
+  name: Cut with a scalpel
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Scalpel
+    add:
+    - type: IncisionOpen
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
+    state: scalpel
+  - type: SurgeryDamageChangeEffect
+    damage:
+      types:
+        Bloodloss: 10
+    sleepModifier: 0.5
+  - type: SurgeryStepEmoteEffect
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepClampBleeders
+  name: Clamp the bleeders
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Hemostat
+    add:
+    - type: BleedersClamped
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+    state: hemostat
+  - type: SurgeryDamageChangeEffect
+    damage:
+      types:
+        Bloodloss: -5
+    sleepModifier: 2
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepRetractSkin
+  name: Retract the skin
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Retractor
+    add:
+    - type: SkinRetracted
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+    state: retractor
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepSawBones
+  name: Saw through bones
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: BoneSaw
+    add:
+    - type: RibcageSawed
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/saw.rsi
+    state: saw
+  - type: SurgeryStepEmoteEffect
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepPriseOpenBones
+  name: Prise the bones open
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Retractor
+    add:
+    - type: RibcageOpen
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+    state: retractor
+
+#- type: entity
+#  parent: SurgeryStepBase
+#  id: SurgeryStepCutLarvaRoots
+#  name: Cut larva roots
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: SurgeryStep
+#    skill: 2
+#    tool:
+#    - type: Scalpel
+#  - type: SurgeryCutLarvaRootsStep
+#  - type: Sprite
+#    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
+#    state: scalpel
+#  - type: SurgeryOperatingTableCondition
+
+#- type: entity
+#  parent: SurgeryStepBase
+#  id: SurgeryStepRemoveLarva
+#  name: Remove larva
+#  categories: [ HideSpawnMenu ]
+#  components:
+#  - type: SurgeryStep
+#    skill: 2
+#    tool:
+#    - type: Hemostat
+#    bodyRemove:
+#    - type: VictimInfected
+#  - type: Sprite
+#    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+#    state: hemostat
+#  - type: SurgeryOperatingTableCondition
+#  - type: SurgeryStepSpawnEffect
+#    entity: XenoEmbryo
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepCloseBones
+  name: Close bones
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Retractor
+    remove:
+    - type: RibcageOpen
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+    state: retractor
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepMendRibcage
+  name: Mend ribcage
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: BoneGel
+    remove:
+    - type: RibcageSawed
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/bone_gel.rsi
+    state: bone-gel
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepCloseIncision
+  name: Close incision
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Cautery
+    remove:
+    # This surgery removes a bunch of components that might be leftover from other surgeries in unintended cases.
+    # Essentially a bit of a fallback for endusers :)
+    - type: SkinRetracted
+    - type: BleedersClamped
+    - type: IncisionOpen
+    - type: BodyPartReattached
+    - type: InternalBleedersClamped
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
+    state: cautery
+  - type: SurgeryDamageChangeEffect
+    damage:
+      types:
+        Heat: -5
+    sleepModifier: 2
+  - type: SurgeryStepEmoteEffect
+
+# Feature Insertion
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepInsertFeature
+  name: Insert part
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: BodyPart
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
+    state: insertion
+  - type: SurgeryAddPartStep
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepSealWounds
+  name: Seal wounds
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Cautery
+    remove:
+    - type: SkinRetracted
+    - type: BleedersClamped
+    - type: IncisionOpen
+    - type: InternalBleedersClamped
+  - type: SurgeryAffixPartStep
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
+    state: cautery
+  - type: SurgeryStepEmoteEffect
+  - type: SurgeryDamageChangeEffect
+    damage:
+      types:
+        Heat: -5
+    sleepModifier: 2
+
+# Feature Removal
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepSawFeature
+  name: Saw through bones
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: BoneSaw
+    add:
+    - type: BodyPartSawed
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/saw.rsi
+    state: saw
+  - type: SurgeryStepEmoteEffect
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepClampInternalBleeders
+  name: Clamp internal bleeders
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Hemostat
+    add:
+    - type: InternalBleedersClamped
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+    state: hemostat
+  - type: SurgeryDamageChangeEffect
+    damage:
+      types:
+        Bloodloss: -5
+    sleepModifier: 2
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepRemoveFeature
+  name: Amputate part
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    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
+    - type: IncisionOpen
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/saw.rsi
+    state: saw
+  - type: SurgeryRemovePartStep
+  - type: SurgeryStepEmoteEffect
+
+# Tend Wounds
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepCarefulIncisionScalpel
+  name: Make a careful incision
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Scalpel
+    add:
+    - type: IncisionOpen
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
+    state: scalpel
+  - type: SurgeryStepEmoteEffect
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepRepairBruteTissue
+  name: Repair damaged tissue
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Hemostat
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+    state: hemostat
+  - type: SurgeryTendWoundsEffect
+    damage:
+      groups:
+        Brute: -5
+  - type: SurgeryRepeatableStep
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepRepairBurnTissue
+  name: Repair burnt tissue
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Hemostat
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+    state: hemostat
+  - type: SurgeryTendWoundsEffect
+    mainGroup: Burn
+    damage:
+      groups:
+        Burn: -5
+  - type: SurgeryRepeatableStep
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepSealTendWound
+  name: Seal the wound
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Cautery
+    remove:
+    - type: IncisionOpen
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
+    state: cautery
+  - type: SurgeryDamageChangeEffect
+    damage:
+      types:
+        Heat: -5
+    sleepModifier: 2
+  - type: SurgeryStepEmoteEffect
+
+# Cavity Implanting
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepInsertItem
+  name: Insert item into cavity
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
+    state: insertion
+  - type: SurgeryStepCavityEffect
+    action: Insert
+  - type: SurgeryStepEmoteEffect
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepRemoveItem
+  name: Remove item from cavity
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
+    state: insertion
+  - type: SurgeryStepCavityEffect
+    action: Remove
+  - type: SurgeryStepEmoteEffect
+
+# Organ Manipulation
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepRemoveOrgan
+  name: Remove organ
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Hemostat
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+    state: hemostat
+  - type: SurgeryRemoveOrganStep
+  - type: SurgeryStepEmoteEffect
+
+- type: entity
+  parent: SurgeryStepBase
+  id: SurgeryStepInsertOrgan
+  name: Add organ
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryStep
+    tool:
+    - type: Organ
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/manipulation.rsi
+    state: insertion
+  - type: SurgeryAddOrganStep
+  - type: SurgeryStepEmoteEffect
+
+- type: entity
+  parent: SurgeryStepInsertOrgan
+  id: SurgeryStepInsertLungs
+  name: Add lungs
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryDamageChangeEffect
+    damage:
+      types:
+        Asphyxiation: -2147483648 # Literally the max 32 bit value, if your patient has gone higher than this, maybe it's time to restart the round.
+    sleepModifier: 1
+    isConsumable: true
+
+- type: entity
+  parent: SurgeryStepInsertOrgan
+  id: SurgeryStepInsertLiver
+  name: Add liver
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgeryDamageChangeEffect
+    damage:
+      types:
+        Poison: -2147483648 # Literally the max 32 bit value, if your patient has gone higher than this, maybe it's time to restart the round.
+    sleepModifier: 1
+    isConsumable: true
+
+- type: entity
+  parent: SurgeryStepInsertOrgan
+  id: SurgeryStepInsertEyes
+  name: Add eyes
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgerySpecialDamageChangeEffect
+    damageType: Eye
+    isConsumable: true
+
+- type: entity
+  parent: SurgeryStepInsertOrgan
+  id: SurgeryStepInsertHeart
+  name: Add heart
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SurgerySpecialDamageChangeEffect
+    damageType: Rot
+    isConsumable: true
+
+# Doesn't serve much of a purpose right now. Just here for completeness-sake.
+- type: entity
+  parent: SurgeryStepInsertOrgan
+  id: SurgeryStepInsertStomach
+  name: Add stomach
+  categories: [ HideSpawnMenu ]
+
+- 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/Prototypes/_CorvaxNext/Recipes/Lathes/surgery.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/surgery.yml
new file mode 100644
index 00000000000..3195e494ede
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/surgery.yml
@@ -0,0 +1,91 @@
+- type: latheRecipe
+  id: BoneGel
+  result: BoneGel
+  completetime: 10
+  materials:
+    Plastic: 200
+    Plasma: 200
+
+- type: latheRecipe
+  id: SynthHeart
+  result: BioSynthHeart
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthLungs
+  result: BioSynthLungs
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthLiver
+  result: BioSynthLiver
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthEyes
+  result: BioSynthEyes
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthLeftArm
+  result: BioSynthLeftArm
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthLeftHand
+  result: BioSynthLeftHand
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthRightArm
+  result: BioSynthRightArm
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthRightHand
+  result: BioSynthRightHand
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthLeftLeg
+  result: BioSynthLeftLeg
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthRightLeg
+  result: BioSynthRightLeg
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthLeftFoot
+  result: BioSynthLeftFoot
+  completetime: 30
+  materials:
+    Biomass: 10
+
+- type: latheRecipe
+  id: SynthRightFoot
+  result: BioSynthRightFoot
+  completetime: 30
+  materials:
+    Biomass: 10
diff --git a/Resources/ServerInfo/Corvax/Guidebook/Medical/OrganManipulation.xml b/Resources/ServerInfo/Corvax/Guidebook/Medical/OrganManipulation.xml
new file mode 100644
index 00000000000..7c98372b1c6
--- /dev/null
+++ b/Resources/ServerInfo/Corvax/Guidebook/Medical/OrganManipulation.xml
@@ -0,0 +1,50 @@
+<Document>
+# Манипуляция органами
+Хирургия позволяет вам заменять органы у пациентов на здоровые, что позволит вам лечить некоторые виды хронических болезней.
+
+## Анатомия
+Обычно в теле присутствуют следующие органы:
+
+<Box>
+<GuideEntityEmbed Entity="OrganHumanBrain" Caption="мозг (думалка)"/>
+<GuideEntityEmbed Entity="OrganHumanEyes" Caption="глаза"/>
+<GuideEntityEmbed Entity="OrganHumanHeart" Caption="сердце"/>
+</Box>
+<Box>
+<GuideEntityEmbed Entity="OrganHumanKidneys" Caption="почки"/>
+<GuideEntityEmbed Entity="OrganHumanLiver" Caption="печень"/>
+<GuideEntityEmbed Entity="OrganHumanLungs" Caption="лёгкие"/>
+<GuideEntityEmbed Entity="OrganHumanStomach" Caption="желудок"/>
+</Box>
+
+Некоторые виды имеют больше или меньше органов, например у Дион функции множества из этих органов объединены в одном универсальном, но в целом это общее представление о том, что вы можете встретить.
+Для удаления органа, вам необходимо провести соответствующую операцию Удалить Орган на части тела, в которой этот орган находится. С помощью этой процедуры вы сможете извлечь любой орган без вреда для пациента.
+
+Соответственно для трансплантации органа вам нужно использовать процедуру Добавления Органа на той части тела где он был раньше.
+
+## Что делает каждая из трансплантаций?
+- Трансплантация [color=#a4885c]мозга[/color] Позволит пациенту контролировать другое тело. Идеальная альтернатива клонированию если у вас есть свободное тело.
+- Трансплантация [color=#a4885c]печени[/color] излечит пациента от нанесённого ему урона ядами.
+- Трансплантация [color=#a4885c]лёгких[/color] излечит пациента от огромного количества урона удушьем.
+- Трансплантация [color=#a4885c]сердца[/color] излечит пациента от гниения и генетического урона.
+- Трансплантация [color=#a4885c]глаз[/color] позволит пациенту снова видеть, и излечит любой урон от глаз.
+
+## Где мне достать новые органы?
+
+Обычно когда к вам приходит пациент с целью трансплантации нового органа, им понадобится новый, поскольку старый будет либо отсутствовать, либо будет повреждён без возможности восстановления.
+Используйте для этого Медицинский Биофабрикатор, который производит био-синтетические органы для всех рас за биомассу.
+
+<Box>
+<GuideEntityEmbed Entity="MedicalBiofabricator" Caption="медицинский биофабрикатор"/>
+<GuideEntityEmbed Entity="MedicalBiofabMachineBoard" Caption="машинная плата"/>
+<GuideEntityEmbed Entity="MaterialBiomass" Caption="биомасса"/>
+</Box>
+
+Плата медицинского биофабрикатора есть у Главного Врача в его шкафчике.
+
+## Почему трансплантация органа
+## не произвела никакого эффекта?
+
+Тело вашего пациента отвергла орган, поскольку он в плохом состоянии, попробуйте использовать свежий орган от донора, либо же создайте новый при помощи Медицинского Биофабрикатора.
+
+</Document>
diff --git a/Resources/ServerInfo/Corvax/Guidebook/Medical/PartManipulation.xml b/Resources/ServerInfo/Corvax/Guidebook/Medical/PartManipulation.xml
new file mode 100644
index 00000000000..284fa0fe230
--- /dev/null
+++ b/Resources/ServerInfo/Corvax/Guidebook/Medical/PartManipulation.xml
@@ -0,0 +1,51 @@
+<Document>
+# Манипуляция частями тела
+С этим руководством вы сможете превращать феленидов в людей, либо же наоборот если вы особенно жестоки.
+
+## Анатомия
+Обычно тело имеет 10 основных частей. Среди них:
+
+<Box>
+<GuideEntityEmbed Entity="HeadHuman" Caption="голова"/>
+</Box>
+<Box>
+<GuideEntityEmbed Entity="RightHandHuman" Caption="правая рука"/>
+<GuideEntityEmbed Entity="RightArmHuman" Caption="левая ладонь"/>
+<GuideEntityEmbed Entity="TorsoHuman" Caption="туловище"/>
+<GuideEntityEmbed Entity="LeftArmHuman" Caption="левая рука"/>
+<GuideEntityEmbed Entity="LeftHandHuman" Caption="левая ладонь"/>
+</Box>
+<Box>
+<GuideEntityEmbed Entity="RightFootHuman" Caption="правая стопа"/>
+<GuideEntityEmbed Entity="RightLegHuman" Caption="правая нога"/>
+<GuideEntityEmbed Entity="LeftLegHuman" Caption="левая нога"/>
+<GuideEntityEmbed Entity="LeftFootHuman" Caption="левая стопа"/>
+</Box>
+
+Некоторые расы могут иметь больше или меньше частей тела, такие как хвосты, крылья или дополнительные конечностей, но в целом это приближённая модель того что вы увидите.
+Для удаления конечности, вам необходимо провести на ней хирурхическую операцию Удаления Конечности, которая удалит её без вреда для пациента.
+
+Однако если вы хотите присоединить конечность, вам необходимо провести операцию Присоединения Конечности на части тела к которой вы хотите её присоединить.
+Ладони прикреплены к рукам, стопы прикреплены к ногам, всё остальное прикреплено к туловищу.
+
+## Где мне взять больше частей тела?
+
+Обычно когда к вам приходит пациент с целью установки новой конечности, им понадобится новая, поскольку старая будет либо отсутствовать, либо повреждена без возможности восстановления.
+Для этого используйте Медицинский Биофабрикатор и немного биомассы. Затем произведите любую био-синтетическую часть тела, которая подойдёт любым расам.
+
+<Box>
+<GuideEntityEmbed Entity="MedicalBiofabricator" Caption="медицинский биофабрикатор"/>
+<GuideEntityEmbed Entity="MedicalBiofabMachineBoard" Caption="машинная плата"/>
+<GuideEntityEmbed Entity="MaterialBiomass" Caption="биомасса"/>
+</Box>
+
+Плата медицинского биофабрикатора есть у Главного Врача в его шкафчике.
+
+## Я присоединил часть тела к пациенту,
+## но почему она не работает?
+
+После прикрепления части тела к пациенту ей необходимо приживиться, для этого вам необходимо вылечить только что присоединённую часть тела.
+Неповреждённая часть потребует небольших затрат для этого, но с серьёзно повреждённой конечностью могут возникнуть трудности.
+Используйте хирургическую операцию для Лечения Ран, или же потратьте медикаменты для лечения нужной конечности.
+
+</Document>
diff --git a/Resources/ServerInfo/Corvax/Guidebook/Medical/Surgery.xml b/Resources/ServerInfo/Corvax/Guidebook/Medical/Surgery.xml
new file mode 100644
index 00000000000..c746bb64b03
--- /dev/null
+++ b/Resources/ServerInfo/Corvax/Guidebook/Medical/Surgery.xml
@@ -0,0 +1,40 @@
+<Document>
+# Хирургия
+Ваша еженедельная активность. С помощью проведения хирургических операций на пациентах вы можее лечить повреждения, добавлять новые части тела и органы, и так далее.
+
+## Основы
+Для начала хирургии пациент должен быть в положении лёжа, и в идеале без сознания.
+
+Если пациент всё ещё в сознании, он будет чувствовать огромную боль и могут получать гораздо более серьёзные травмы из-за болевого шока.
+
+<Box>
+<GuideEntityEmbed Entity="NitrousOxideTank" Caption="оксид азота"/>
+<GuideEntityEmbed Entity="ClothingMaskBreathMedical" Caption="любая маска для дыхания"/>
+</Box>
+
+Вам также потребуется надеть Перчатки и Маску для предотвращения попадания инфекции в тело пациента.
+
+<Box>
+<GuideEntityEmbed Entity="ClothingMaskSterile" Caption="любая маска"/>
+<GuideEntityEmbed Entity="ClothingHandsGlovesNitrile" Caption="любые перчатки"/>
+</Box>
+
+## Начало
+
+Для хирургического вмешательства, вам потребуется следующий набор инструментов.
+
+<Box>
+<GuideEntityEmbed Entity="Scalpel" Caption="скальпель"/>
+<GuideEntityEmbed Entity="Retractor" Caption="ретрактор"/>
+<GuideEntityEmbed Entity="Hemostat" Caption="гемостат"/>
+<GuideEntityEmbed Entity="Drill" Caption="дрель"/>
+</Box>
+<Box>
+<GuideEntityEmbed Entity="Saw" Caption="пила"/>
+<GuideEntityEmbed Entity="Cautery" Caption="прибор для прижигания"/>
+<GuideEntityEmbed Entity="BoneGel" Caption="костяной гель"/>
+</Box>
+
+Как только любой хирургический инструмент есть у вас в руке, провзаимодействуйте с телом пациента для начала операции. Вы можете выбрать части тела на которых хотите провести хирургию.
+
+</Document>
diff --git a/Resources/ServerInfo/Corvax/Guidebook/Medical/UtilitySurgeries.xml b/Resources/ServerInfo/Corvax/Guidebook/Medical/UtilitySurgeries.xml
new file mode 100644
index 00000000000..16d26b4d224
--- /dev/null
+++ b/Resources/ServerInfo/Corvax/Guidebook/Medical/UtilitySurgeries.xml
@@ -0,0 +1,24 @@
+<Document>
+# Особые применения хирургии
+
+## Лечение ран
+
+Залечить Раны - это хирургическая операция, которая позволяет лечить Механический урон или урон от Ожогов без медикаментов.
+Для начала вам потребуется открыть разрез на теле пациента, а затем применять гемостат до тех пор, пока конечность не будет полностью восстановлена.
+Далее закройте разрез при помощи прибора для прижигания.
+
+<Box>
+<GuideEntityEmbed Entity="Scalpel" Caption="scalpel"/>
+<GuideEntityEmbed Entity="Hemostat" Caption="hemostat"/>
+<GuideEntityEmbed Entity="Cautery" Caption="cautery"/>
+</Box>
+
+Эта процедура работает тем лучше, чем больше у вашего пациента повреждений, особенно если он всё ещё жив. Это позволяет вам воскрешать пациентов
+с огромным количеством урона, например тупого Технического Ассистента который вошёл в горящую тритьеварку.
+
+## Имплантирование в полость
+
+Эта процедура позволяет вам имплантировать любой крошечный или маленький предмет в туловище пациента. Для начала вам необходимо открыть разрез, а затем открыть грудную клетку.
+Пациент не сможет никак взаимодействовать с имплантированным предметом, однако для этого могут быть особые способы использования, например это даёт возможность ещё эффективнее спрятать диск ядерной аунтетификации.
+
+</Document>
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/head.rsi/head_0.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_0.png
new file mode 100644
index 00000000000..f547b0bc961
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_0.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_1.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_1.png
new file mode 100644
index 00000000000..0ba1a77dfd9
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_1.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_2.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_2.png
new file mode 100644
index 00000000000..1cb55b4fe97
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_2.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_3.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_3.png
new file mode 100644
index 00000000000..d797b40a161
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_3.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_4.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_4.png
new file mode 100644
index 00000000000..fbc1678ce5d
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_4.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_5.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_5.png
new file mode 100644
index 00000000000..f6caf62d405
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_5.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_6.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_6.png
new file mode 100644
index 00000000000..74b58c642bb
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_6.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_7.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_7.png
new file mode 100644
index 00000000000..74b58c642bb
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_7.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/head_8.png b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_8.png
new file mode 100644
index 00000000000..4d024c61f7f
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/head.rsi/head_8.png differ
diff --git a/Resources/Textures/Interface/Targeting/Status/head.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/head.rsi/meta.json
new file mode 100644
index 00000000000..2c34f86c28e
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/head.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "head_0"
+        },
+        {
+        "name": "head_1"
+        },
+        {
+        "name": "head_2"
+        },
+        {
+        "name": "head_3"
+        },
+        {
+        "name": "head_4"
+        },
+        {
+        "name": "head_5"
+        },
+        {
+        "name": "head_6"
+        },
+        {
+        "name": "head_7"
+        },
+        {
+        "name": "head_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
new file mode 100644
index 00000000000..22c7982489b
Binary files /dev/null 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
new file mode 100644
index 00000000000..cd3b5d4c1c8
Binary files /dev/null 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
new file mode 100644
index 00000000000..e4db1961679
Binary files /dev/null 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
new file mode 100644
index 00000000000..d6a204a18a9
Binary files /dev/null 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
new file mode 100644
index 00000000000..2c9e81508b3
Binary files /dev/null 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
new file mode 100644
index 00000000000..930a7b52ed1
Binary files /dev/null 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
new file mode 100644
index 00000000000..efc7380c270
Binary files /dev/null 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
new file mode 100644
index 00000000000..efc7380c270
Binary files /dev/null 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
new file mode 100644
index 00000000000..a00a6b1822e
Binary files /dev/null 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
new file mode 100644
index 00000000000..dab3ed611da
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/leftarm.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": "leftarm_0"
+        },
+        {
+        "name": "leftarm_1"
+        },
+        {
+        "name": "leftarm_2"
+        },
+        {
+        "name": "leftarm_3"
+        },
+        {
+        "name": "leftarm_4"
+        },
+        {
+        "name": "leftarm_5"
+        },
+        {
+        "name": "leftarm_6"
+        },
+        {
+        "name": "leftarm_7"
+        },
+        {
+        "name": "leftarm_8"
+        }
+    ]
+}
\ No newline at end of file
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
new file mode 100644
index 00000000000..9f8193be960
Binary files /dev/null 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
new file mode 100644
index 00000000000..ab0c3e410da
Binary files /dev/null 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
new file mode 100644
index 00000000000..6390bbf7ab6
Binary files /dev/null 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
new file mode 100644
index 00000000000..9159aebd456
Binary files /dev/null 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
new file mode 100644
index 00000000000..9dcd84fffdf
Binary files /dev/null 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
new file mode 100644
index 00000000000..4e302cda649
Binary files /dev/null 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
new file mode 100644
index 00000000000..d36a43c441d
Binary files /dev/null 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
new file mode 100644
index 00000000000..d36a43c441d
Binary files /dev/null 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
new file mode 100644
index 00000000000..75bd581d69b
Binary files /dev/null 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
new file mode 100644
index 00000000000..887c60f37cc
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/leftleg.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": "leftleg_0"
+        },
+        {
+        "name": "leftleg_1"
+        },
+        {
+        "name": "leftleg_2"
+        },
+        {
+        "name": "leftleg_3"
+        },
+        {
+        "name": "leftleg_4"
+        },
+        {
+        "name": "leftleg_5"
+        },
+        {
+        "name": "leftleg_6"
+        },
+        {
+        "name": "leftleg_7"
+        },
+        {
+        "name": "leftleg_8"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/meta.json b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/meta.json
new file mode 100644
index 00000000000..eb19b5d4c47
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/rightarm.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": "rightarm_0"
+        },
+        {
+        "name": "rightarm_1"
+        },
+        {
+        "name": "rightarm_2"
+        },
+        {
+        "name": "rightarm_3"
+        },
+        {
+        "name": "rightarm_4"
+        },
+        {
+        "name": "rightarm_5"
+        },
+        {
+        "name": "rightarm_6"
+        },
+        {
+        "name": "rightarm_7"
+        },
+        {
+        "name": "rightarm_8"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png b/Resources/Textures/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png
new file mode 100644
index 00000000000..44c8aca6329
Binary files /dev/null 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
new file mode 100644
index 00000000000..035e0ae12e9
Binary files /dev/null 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
new file mode 100644
index 00000000000..f6db2e12a9b
Binary files /dev/null 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
new file mode 100644
index 00000000000..cd974fdeea6
Binary files /dev/null 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
new file mode 100644
index 00000000000..0a5977cfaf8
Binary files /dev/null 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
new file mode 100644
index 00000000000..1eb5f0eadd4
Binary files /dev/null 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
new file mode 100644
index 00000000000..35eec2905a5
Binary files /dev/null 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
new file mode 100644
index 00000000000..35eec2905a5
Binary files /dev/null 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
new file mode 100644
index 00000000000..9f894b1bfb3
Binary files /dev/null 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
new file mode 100644
index 00000000000..7dded85e45f
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/rightleg.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": "rightleg_0"
+        },
+        {
+        "name": "rightleg_1"
+        },
+        {
+        "name": "rightleg_2"
+        },
+        {
+        "name": "rightleg_3"
+        },
+        {
+        "name": "rightleg_4"
+        },
+        {
+        "name": "rightleg_5"
+        },
+        {
+        "name": "rightleg_6"
+        },
+        {
+        "name": "rightleg_7"
+        },
+        {
+        "name": "rightleg_8"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png b/Resources/Textures/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png
new file mode 100644
index 00000000000..f773330b026
Binary files /dev/null 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
new file mode 100644
index 00000000000..786b0777c38
Binary files /dev/null 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
new file mode 100644
index 00000000000..2ac7cbafa6d
Binary files /dev/null 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
new file mode 100644
index 00000000000..2f9690690d7
Binary files /dev/null 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
new file mode 100644
index 00000000000..ec62ccb0627
Binary files /dev/null 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
new file mode 100644
index 00000000000..d30e124e64d
Binary files /dev/null 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
new file mode 100644
index 00000000000..9c4ee1f9038
Binary files /dev/null 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
new file mode 100644
index 00000000000..9c4ee1f9038
Binary files /dev/null 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
new file mode 100644
index 00000000000..70ccb309add
Binary files /dev/null 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
new file mode 100644
index 00000000000..7baeebd0801
--- /dev/null
+++ b/Resources/Textures/Interface/Targeting/Status/torso.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": "torso_0"
+        },
+        {
+        "name": "torso_1"
+        },
+        {
+        "name": "torso_2"
+        },
+        {
+        "name": "torso_3"
+        },
+        {
+        "name": "torso_4"
+        },
+        {
+        "name": "torso_5"
+        },
+        {
+        "name": "torso_6"
+        },
+        {
+        "name": "torso_7"
+        },
+        {
+        "name": "torso_8"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_0.png b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_0.png
new file mode 100644
index 00000000000..b20ce001ba6
Binary files /dev/null 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
new file mode 100644
index 00000000000..591b6a5bab5
Binary files /dev/null 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
new file mode 100644
index 00000000000..71f09fc7f6b
Binary files /dev/null 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
new file mode 100644
index 00000000000..fa9f954321c
Binary files /dev/null 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
new file mode 100644
index 00000000000..ada865a05fe
Binary files /dev/null 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
new file mode 100644
index 00000000000..8f3a6ad7d0e
Binary files /dev/null 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
new file mode 100644
index 00000000000..c289a454bdb
Binary files /dev/null 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
new file mode 100644
index 00000000000..c289a454bdb
Binary files /dev/null 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
new file mode 100644
index 00000000000..eefec17cf60
Binary files /dev/null and b/Resources/Textures/Interface/Targeting/Status/torso.rsi/torso_8.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel.png
new file mode 100644
index 00000000000..f66bf6cdf9e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_0.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_0.png
new file mode 100644
index 00000000000..4399c73304b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_0.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_25.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_25.png
new file mode 100644
index 00000000000..3d47302afd5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_25.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_50.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_50.png
new file mode 100644
index 00000000000..744b46f1ef8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_50.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_75.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_75.png
new file mode 100644
index 00000000000..4fbd689bb4c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/bone-gel_75.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json
new file mode 100644
index 00000000000..61ab52970b1
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/7917d83bac9cddd14c0ca0b457256b2683cc047f/icons/obj/items/surgery_tools.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bone-gel"
+    },
+    {
+      "name": "predator_bone-gel"
+    },
+    {
+      "name": "bone-gel_75"
+    },
+    {
+      "name": "bone-gel_50"
+    },
+    {
+      "name": "bone-gel_25"
+    },
+    {
+      "name": "bone-gel_0"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/predator_bone-gel.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/predator_bone-gel.png
new file mode 100644
index 00000000000..4eb66f5843a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/predator_bone-gel.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/bonesetter.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/bonesetter.png
new file mode 100644
index 00000000000..b876de0d28e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/bonesetter.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/meta.json
new file mode 100644
index 00000000000..227b276eda4
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/7917d83bac9cddd14c0ca0b457256b2683cc047f/icons/obj/items/surgery_tools.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bonesetter"
+    },
+    {
+      "name": "predator_bonesetter"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/predator_bonesetter.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/predator_bonesetter.png
new file mode 100644
index 00000000000..c77903ff77a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/bonesetter.rsi/predator_bonesetter.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/insertion.png b/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/insertion.png
new file mode 100644
index 00000000000..961c3c641a7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/insertion.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/meta.json
new file mode 100644
index 00000000000..af2b78c1ea8
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Medical/Surgery/manipulation.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Aurorastation at https://github.com/Aurorastation/Aurora.3/commit/ac435b98e2d0a455ad319dca3bb9bfdc0cd8b051",
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"states": [
+		{
+			"name": "insertion"
+		}
+	]
+}
diff --git a/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_fill.png b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_fill.png
new file mode 100644
index 00000000000..1e45b366221
Binary files /dev/null and b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_fill.png differ
diff --git a/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_idleoff.png b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_idleoff.png
new file mode 100644
index 00000000000..73bab51916c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_idleoff.png differ
diff --git a/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_idleon.png b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_idleon.png
new file mode 100644
index 00000000000..f47f93eb86a
Binary files /dev/null and b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_idleon.png differ
diff --git a/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_openpanel.png b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_openpanel.png
new file mode 100644
index 00000000000..cc174c7d8b9
Binary files /dev/null and b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_openpanel.png differ
diff --git a/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_panelopen.png b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_panelopen.png
new file mode 100644
index 00000000000..d4c4de1f8c4
Binary files /dev/null and b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_panelopen.png differ
diff --git a/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_unfill.png b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_unfill.png
new file mode 100644
index 00000000000..6aa57f247e2
Binary files /dev/null and b/Resources/Textures/Structures/Machines/limbgrower.rsi/limbgrower_unfill.png differ
diff --git a/Resources/Textures/Structures/Machines/limbgrower.rsi/meta.json b/Resources/Textures/Structures/Machines/limbgrower.rsi/meta.json
new file mode 100644
index 00000000000..f940fe8c6c0
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/limbgrower.rsi/meta.json
@@ -0,0 +1,85 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from /tg/station at commit 85c26c1, all icons under CC-BY-SA-3.0, unless otherwise indicated.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "limbgrower_fill",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "limbgrower_unfill",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "limbgrower_openpanel",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "limbgrower_idleoff",
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    },
+    {
+      "name": "limbgrower_idleon",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "limbgrower_panelopen"
+    }
+  ]
+}
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 153d7c35b61..f6bde4eb498 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -70,21 +70,27 @@ binds:
 - function: CameraRotateLeft
   type: State
   key: NumpadNum7
+  mod1: Control
 - function: CameraRotateRight
   type: State
   key: NumpadNum9
+  mod1: Control
 - function: CameraReset
   type: State
   key: NumpadNum8
+  mod1: Control
 - function: ZoomOut
   type: State
   key: NumpadNum4
+  mod1: Control
 - function: ZoomIn
   type: State
   key: NumpadNum6
+  mod1: Control
 - function: ResetZoom
   type: State
   key: NumpadNum5
+  mod1: Control
 # Misc
 - function: ShowEscapeMenu
   type: State
@@ -584,6 +590,25 @@ binds:
   type: State
   key: MouseRight
   canFocus: true
+# _CorvaxNext: surgery Targeting
+- function: TargetHead
+  type: State
+  key: NumpadNum8
+- function: TargetTorso
+  type: State
+  key: NumpadNum5
+- function: TargetLeftArm
+  type: State
+  key: NumpadNum6
+- function: TargetRightArm
+  type: State
+  key: NumpadNum4
+- function: TargetLeftLeg
+  type: State
+  key: NumpadNum3
+- function: TargetRightLeg
+  type: State
+  key: NumpadNum1
 - function: OfferItem # Corvax-Next-Offer
   type: State
   key: F